[CORD-1650]
Update TOSCA/variables to work with bridge/bond refactor
Change-Id: Ifdbdeee1b6281bed94eac26d4e7f89371768b5e4
diff --git a/templates/public-net.yaml.j2 b/templates/public-net.yaml.j2
index 610c58b..0c2aeaa 100644
--- a/templates/public-net.yaml.j2
+++ b/templates/public-net.yaml.j2
@@ -1,4 +1,4 @@
-
+---
{#
Copyright 2017-present Open Networking Foundation
@@ -15,7 +15,6 @@
limitations under the License.
#}
-
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
@@ -29,21 +28,30 @@
- custom_types/site.yaml
- custom_types/slice.yaml
-description: public network config, generated by platform-install
+description: public network config, generated by ecord profile
topology_template:
node_templates:
-# site, fully created in deployment.yaml
+# site, fully created in deployment.yaml.j2
{{ site_name }}:
type: tosca.nodes.Site
properties:
name: {{ site_name }}
must-exist: true
+ {{ site_name }}_public:
+ description: This slice exists solely to own the public network
+ type: tosca.nodes.Slice
+ properties:
+ network: noauto
+ name: {{ site_name }}_public
+ requirements:
+ - site:
+ node: {{ site_name }}
+ relationship: tosca.relationships.BelongsToOne
-
-# Address Manager service, fully created in cord-service.yaml
+# Address Manager service, fully created in cord-services.yaml.j2
service#addressmanager:
type: tosca.nodes.AddressManagerService
properties:
@@ -51,31 +59,30 @@
must-exist: true
# public network
-
public_template:
type: tosca.nodes.NetworkTemplate
properties:
- name: public_template
- visibility: public
- translation: none
- vtn_kind: PUBLIC
+ name: public_template
+ visibility: public
+ translation: none
+ vtn_kind: PUBLIC
public:
type: tosca.nodes.Network
properties:
- name: public
- permit_all_slices: true
- subnet: 10.8.1.0/24 # NOTE same as AddressPool#addresses_public
- # ip_version: 4
+ name: public
+ permit_all_slices: true
+ subnet: {{ addresspool_public_cidr }}
+ # ip_version: 4
requirements:
- - template:
- node: public_template
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_public
- relationship: tosca.relationships.BelongsToOne
+ - template:
+ node: public_template
+ relationship: tosca.relationships.BelongsToOne
+ - owner:
+ node: {{ site_name }}_public
+ relationship: tosca.relationships.BelongsToOne
- # Created in cord-services.yaml.j2
+# Created in cord-services.yaml.j2
addresses_public:
type: tosca.nodes.AddressPool
properties:
@@ -85,33 +92,22 @@
AddressManagerServiceInstancePublicNetwork:
type: tosca.nodes.AddressManagerServiceInstance
requirements:
- - owner:
- node: service#addressmanager
- relationship: tosca.relationships.BelongsToOne
- - address_pool:
- node: addresses_public
- relationship: tosca.relationships.BelongsToOne
+ - owner:
+ node: service#addressmanager
+ relationship: tosca.relationships.BelongsToOne
+ - address_pool:
+ node: addresses_public
+ relationship: tosca.relationships.BelongsToOne
properties:
- name: AM_public_net
+ name: AM_public_net
public_to_address_manager:
- type: tosca.nodes.ServiceInstanceLink
- requirements:
- - provider_service_instance:
- node: AddressManagerServiceInstancePublicNetwork
- relationship: tosca.relationships.BelongsToOne
- - subscriber_network:
- node: public
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_public:
- description: This slice exists solely to own the public network
- type: tosca.nodes.Slice
- properties:
- network: noauto
- name: {{ site_name }}_public
+ type: tosca.nodes.ServiceInstanceLink
requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
+ - provider_service_instance:
+ node: AddressManagerServiceInstancePublicNetwork
+ relationship: tosca.relationships.BelongsToOne
+ - subscriber_network:
+ node: public
+ relationship: tosca.relationships.BelongsToOne