CORD-2420 M-CORD 5.0 profile
Change-Id: Iae6cbfbbce2ee72fa17a1592e88e087193b3ab4d
diff --git a/mcord-cavium.yml b/mcord-cavium.yml
index f1ea30d..fdd6bb0 100644
--- a/mcord-cavium.yml
+++ b/mcord-cavium.yml
@@ -36,14 +36,6 @@
- vtn-service.yaml
- fabric-service.yaml
- management-net.yaml
- - shared-net.yaml
- - wan-net.yaml
- - vsg-net.yaml
- - s11-net.yaml
- - flat-net-s1u.yaml
- - flat-net-s1mme.yaml
- - spgw-net.yaml
- - sgi-net.yaml
- mcord-cavium-services.yml
- xos-gui-extensions.yml
- service-graph-constraints.yaml
@@ -80,6 +72,12 @@
- name: vspgwu
path: orchestration/xos_services/vspgwu
keypair: mcord_rsa
+ - name: vhss
+ path: orchestration/xos_services/vhss
+ keypair: mcord_rsa
+ - name: sdncontroller
+ path: orchestration/xos_services/sdn-controller
+ keypair: mcord_rsa
- name: vepc
path: orchestration/xos_services/epc-service
keypair: mcord_rsa
@@ -105,7 +103,7 @@
nagios: "cs:trusty/nagios-10"
neutron-api: "cs:~cordteam/trusty/neutron-api-6"
nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
- nova-compute: "cs:~cordteam/trusty/nova-compute-3"
+ nova-compute: "cs:~cordteam/trusty/nova-compute-4"
nrpe: "cs:trusty/nrpe-4"
ntp: "cs:trusty/ntp-14"
openstack-dashboard: "cs:trusty/openstack-dashboard-19"
diff --git a/mcord-ng40.yml b/mcord-ng40.yml
index 7892c27..5241f81 100644
--- a/mcord-ng40.yml
+++ b/mcord-ng40.yml
@@ -36,16 +36,6 @@
- vtn-service.yaml
- fabric-service.yaml
- management-net.yaml
- - shared-net.yaml
- - wan-net.yaml
- - vsg-net.yaml
- - s11-net.yaml
- - s1u-net.yaml
- - nbi-net.yaml
- - sbi-net.yaml
- - spgw-net.yaml
- - sgi-net.yaml
- - flat-net.yaml
- mcord-ng40-services.yml
- xos-gui-extensions.yml
- service-graph-constraints.yaml
@@ -107,7 +97,7 @@
nagios: "cs:trusty/nagios-10"
neutron-api: "cs:~cordteam/trusty/neutron-api-6"
nova-cloud-controller: "cs:trusty/nova-cloud-controller-64"
- nova-compute: "cs:~cordteam/trusty/nova-compute-3"
+ nova-compute: "cs:~cordteam/trusty/nova-compute-4"
nrpe: "cs:trusty/nrpe-4"
ntp: "cs:trusty/ntp-14"
openstack-dashboard: "cs:trusty/openstack-dashboard-19"
diff --git a/templates/flat-net-s1mme.yaml.j2 b/templates/flat-net-s1mme.yaml.j2
deleted file mode 100644
index b4c5c93..0000000
--- a/templates/flat-net-s1mme.yaml.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
- - custom_types/site.yaml
- - custom_types/slice.yaml
- - custom_types/flavor.yaml
- - custom_types/network.yaml
- - custom_types/networktemplate.yaml
-
-description: flat network for S1MME interface
-
-topology_template:
- node_templates:
-
-# site, fully created in deployment.yaml
- {{ site_name }}:
- type: tosca.nodes.Site
- properties:
- name: {{ site_name }}
-
-# flat network for s1mme
- flat_template_s1mme:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: flat_template_s1mme
- visibility: private
- translation: none
- vtn_kind: FLAT
-
- flat_network_s1mme:
- type: tosca.nodes.Network
- properties:
- name: flat_network_s1mme
- subnet: 118.0.0.0/24
- permit_all_slices: true
- requirements:
- - template:
- node: flat_template_s1mme
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_flat_s1mme
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_flat_s1mme:
- description: This slice exists solely to own the Flat network
- type: tosca.nodes.Slice
- properties:
- name: {{ site_name }}_flat_s1mme
- default_isolation: vm
- network: noauto
- requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/templates/flat-net-s1u.yaml.j2 b/templates/flat-net-s1u.yaml.j2
deleted file mode 100644
index 01ca850..0000000
--- a/templates/flat-net-s1u.yaml.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
- - custom_types/site.yaml
- - custom_types/slice.yaml
- - custom_types/flavor.yaml
- - custom_types/network.yaml
- - custom_types/networktemplate.yaml
-
-description: flat network for S1U interface
-
-topology_template:
- node_templates:
-
-# site, fully created in deployment.yaml
- {{ site_name }}:
- type: tosca.nodes.Site
- properties:
- name: {{ site_name }}
-
-# flat network for s1u
- flat_template_s1u:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: flat_template_s1u
- visibility: private
- translation: none
- vtn_kind: FLAT
-
- flat_network_s1u:
- type: tosca.nodes.Network
- properties:
- name: flat_network_s1u
- subnet: 119.0.0.0/24
- permit_all_slices: true
- requirements:
- - template:
- node: flat_template_s1u
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_flat_s1u
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_flat_s1u:
- description: This slice exists solely to own the Flat network
- type: tosca.nodes.Slice
- properties:
- name: {{ site_name }}_flat_s1u
- default_isolation: vm
- network: noauto
- requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/templates/mcord-cavium-services.yml.j2 b/templates/mcord-cavium-services.yml.j2
index 99fab61..b031ab8 100644
--- a/templates/mcord-cavium-services.yml.j2
+++ b/templates/mcord-cavium-services.yml.j2
@@ -27,6 +27,7 @@
- custom_types/image.yaml
- custom_types/flavor.yaml
- custom_types/network.yaml
+ - custom_types/networktemplate.yaml
- custom_types/onosservice.yaml
- custom_types/networkslice.yaml
- custom_types/vspgwcservice.yaml
@@ -35,6 +36,10 @@
- custom_types/vspgwuvendor.yaml
- custom_types/vmmeservice.yaml
- custom_types/vmmevendor.yaml
+ - custom_types/vhssservice.yaml
+ - custom_types/vhssvendor.yaml
+ - custom_types/sdncontrollerservice.yaml
+ - custom_types/sdncontrollervendor.yaml
- custom_types/vepcservice.yaml
- custom_types/servicedependency.yaml
- custom_types/mcordsubscriberservice.yaml
@@ -49,6 +54,7 @@
must-exist: true
name: {{ site_name }}
+# flavors
m1.small:
type: tosca.nodes.Flavor
properties:
@@ -70,6 +76,7 @@
name: m1.xlarge
must-exist: true
+# images
image-test:
type: tosca.nodes.Image
properties:
@@ -85,6 +92,23 @@
properties:
name: image-spgwu
+# network templates
+ private_template:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: private_template
+ visibility: private
+ translation: none
+ vtn_kind: PRIVATE
+
+ flat_template:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: flat_template
+ visibility: private
+ translation: none
+ vtn_kind: FLAT
+
# management networks, fully created in management-net.yaml
management:
type: tosca.nodes.Network
@@ -100,36 +124,7 @@
name: management_hosts
{% endif %}
-# flat_network_s1mme is for connectivity between VMs, fully created in flat-net-s1mme.yaml
- flat_network_s1mme:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: flat_network_s1mme
-# flat_network_s1u is for connectivity between VMs, fully created in flat-net-s1u.yaml
- flat_network_s1u:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: flat_network_s1u
-# s11_network is for connectivity between VMs, fully created in s11-net.yaml
- s11_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: s11_network
-# sgi_network is for connectivity between VMs, fully created in sgi-net.yaml
- sgi_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: sgi_network
-# spgw_network is for connectivity between VMs, fully created in spgw-net.yaml
- spgw_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: spgw_network
+# Other networks are created by vEPC service
# ONOS_CORD, fully created in vtn.yaml
service#ONOS_CORD:
@@ -199,7 +194,7 @@
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
{{ site_name }}_vspgwc:
- description: SDN controller slice
+ description: vSPGW-C slice
type: tosca.nodes.Slice
properties:
name: {{ site_name }}_vspgwc
@@ -243,7 +238,7 @@
pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
{{ site_name }}_vspgwu:
- description: SDN controller slice
+ description: vSPGW-U slice
type: tosca.nodes.Slice
properties:
name: {{ site_name }}_vspgwu
@@ -275,6 +270,93 @@
node: m1.xlarge
relationship: tosca.relationships.BelongsToOne
+# vHSS service
+ service#vhss:
+ type: tosca.nodes.VHSSService
+ properties:
+ name: vhss
+ kind: vEPC
+ public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
+ private_key_fn: /opt/xos/services/vhss/keys/mcord_rsa
+ artifacts:
+ pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
+
+ {{ site_name }}_vhss:
+ description: vHSS Service Slice
+ type: tosca.nodes.Slice
+ properties:
+ name: {{ site_name }}_vhss
+ default_isolation: vm
+ network: noauto
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.BelongsToOne
+ - service:
+ node: service#vhss
+ relationship: tosca.relationships.BelongsToOne
+ - default_image:
+ node: image-test
+ relationship: tosca.relationships.BelongsToOne
+ - default_flavor:
+ node: m1.small
+ relationship: tosca.relationships.BelongsToOne
+
+ sprint_hss:
+ type: tosca.nodes.VHSSVendor
+ properties:
+ name: sprint_hss
+ requirements:
+ - image:
+ node: image-test
+ relationship: tosca.relationships.BelongsToOne
+ - flavor:
+ node: m1.small
+ relationship: tosca.relationships.BelongsToOne
+
+#SDN Controller Service
+ service#sdncontroller:
+ type: tosca.nodes.SDNControllerService
+ properties:
+ name: sdncontroller
+ public_key: {{ lookup('file', config_cord_profile_dir + '/key_import/mcord_rsa.pub') }}
+ private_key_fn: /opt/xos/services/vspgwu/keys/mcord_rsa
+ artifacts:
+ pubkey: /opt/cord_profile/key_import/mcord_rsa.pub
+
+ {{ site_name }}_sdncontroller:
+ description: SDN controller slice
+ type: tosca.nodes.Slice
+ properties:
+ name: {{ site_name }}_sdncontroller
+ default_isolation: vm
+ network: noauto
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.BelongsToOne
+ - service:
+ node: service#sdncontroller
+ relationship: tosca.relationships.BelongsToOne
+ - default_image:
+ node: image-test
+ relationship: tosca.relationships.BelongsToOne
+ - default_flavor:
+ node: m1.small
+ relationship: tosca.relationships.BelongsToOne
+
+ intel_sdncontroller:
+ type: tosca.nodes.SDNControllerVendor
+ properties:
+ name: intel_sdncontroller
+ requirements:
+ - image:
+ node: image-test
+ relationship: tosca.relationships.BelongsToOne
+ - flavor:
+ node: m1.small
+ relationship: tosca.relationships.BelongsToOne
+
# vEPC Service
service#vepc:
type: tosca.nodes.VEPCService
@@ -322,13 +404,25 @@
node: service#vspgwu
relationship: tosca.relationships.BelongsToOne
+ vmme_vhss:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: None
+ requirements:
+ - subscriber_service:
+ node: service#vmme
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#vhss
+ relationship: tosca.relationships.BelongsToOne
+
# M-CORD Subscriber
service#mcord:
type: tosca.nodes.MCordSubscriberService
properties:
name: mcord
- # ServiceDependency M-CORD to vENB
+ # ServiceDependency M-CORD to vMME
mcord_vmme:
type: tosca.nodes.ServiceDependency
properties:
diff --git a/templates/mcord-ng40-services.yml.j2 b/templates/mcord-ng40-services.yml.j2
index 4cd0fc2..7106eb4 100644
--- a/templates/mcord-ng40-services.yml.j2
+++ b/templates/mcord-ng40-services.yml.j2
@@ -27,6 +27,7 @@
- custom_types/image.yaml
- custom_types/flavor.yaml
- custom_types/network.yaml
+ - custom_types/networktemplate.yaml
- custom_types/onosservice.yaml
- custom_types/networkslice.yaml
- custom_types/venbservice.yaml
@@ -48,6 +49,8 @@
must-exist: true
name: {{ site_name }}
+# flavors
+
m1.small:
type: tosca.nodes.Flavor
properties:
@@ -69,6 +72,7 @@
name: m1.xlarge
must-exist: true
+# images
image-venb:
type: tosca.nodes.Image
properties:
@@ -84,6 +88,23 @@
properties:
name: image-spgwu
+# network templates
+ private_template:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: private_template
+ visibility: private
+ translation: none
+ vtn_kind: PRIVATE
+
+ flat_template:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: flat_template
+ visibility: private
+ translation: none
+ vtn_kind: FLAT
+
# management networks, fully created in management-net.yaml
management:
type: tosca.nodes.Network
@@ -99,48 +120,7 @@
name: management_hosts
{% endif %}
-# s1u_network is for connectivity between VMs, fully created in s1u-net.yaml
- s1u_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: s1u_network
-# s11_network is for connectivity between VMs, fully created in s11-net.yaml
- s11_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: s11_network
-# nbi_network is for connectivity between VMs, fully created in nbi-net.yaml
- nbi_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: nbi_network
-# sbi_network is for connectivity between VMs, fully created in sbi-net.yaml
- sbi_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: sbi_network
-# sgi_network is for connectivity between VMs, fully created in sgi-net.yaml
- sgi_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: sgi_network
-# spgw_network is for connectivity between VMs, fully created in spgw-net.yaml
- spgw_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: spgw_network
-# flat_network is for connectivity between VM inside cord and server outside, fully created in flat-net.yaml
- flat_network:
- type: tosca.nodes.Network
- properties:
- must-exist: true
- name: flat_network
+# Other networks are created by vEPC service
# ONOS_CORD, fully created in vtn.yaml
service#ONOS_CORD:
diff --git a/templates/nbi-net.yaml.j2 b/templates/nbi-net.yaml.j2
deleted file mode 100644
index edc649a..0000000
--- a/templates/nbi-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
- - custom_types/site.yaml
- - custom_types/slice.yaml
- - custom_types/flavor.yaml
- - custom_types/network.yaml
- - custom_types/networktemplate.yaml
-
-description: network for north bound interface (nbi)
-
-topology_template:
- node_templates:
-
-# site, fully created in deployment.yaml
- {{ site_name }}:
- type: tosca.nodes.Site
- properties:
- name: {{ site_name }}
-
-# nbi network
- nbi_template:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: nbi_template
- visibility: private
- translation: none
- vtn_kind: PRIVATE
-
- nbi_network:
- type: tosca.nodes.Network
- properties:
- name: nbi_network
- subnet: 113.0.0.0/24
- permit_all_slices: true
- requirements:
- - template:
- node: nbi_template
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_nbi
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_nbi:
- description: This slice exists solely to own the private network
- type: tosca.nodes.Slice
- properties:
- name: {{ site_name }}_nbi
- default_isolation: vm
- network: noauto
- requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/s11-net.yaml.j2 b/templates/s11-net.yaml.j2
deleted file mode 100644
index f44b0fd..0000000
--- a/templates/s11-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
- - custom_types/site.yaml
- - custom_types/slice.yaml
- - custom_types/flavor.yaml
- - custom_types/network.yaml
- - custom_types/networktemplate.yaml
-
-description: network for S11 interface
-
-topology_template:
- node_templates:
-
-# site, fully created in deployment.yaml
- {{ site_name }}:
- type: tosca.nodes.Site
- properties:
- name: {{ site_name }}
-
-# s11 network
- s11_template:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: s11_template
- visibility: private
- translation: none
- vtn_kind: PRIVATE
-
- s11_network:
- type: tosca.nodes.Network
- properties:
- name: s11_network
- subnet: 112.0.0.0/24
- permit_all_slices: true
- requirements:
- - template:
- node: s11_template
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_s11
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_s11:
- description: This slice exists solely to own the private network
- type: tosca.nodes.Slice
- properties:
- name: {{ site_name }}_s11
- default_isolation: vm
- network: noauto
- requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/s1u-net.yaml.j2 b/templates/s1u-net.yaml.j2
deleted file mode 100644
index e2bb51c..0000000
--- a/templates/s1u-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
- - custom_types/site.yaml
- - custom_types/slice.yaml
- - custom_types/flavor.yaml
- - custom_types/network.yaml
- - custom_types/networktemplate.yaml
-
-description: network for S1U interface
-
-topology_template:
- node_templates:
-
-# site, fully created in deployment.yaml
- {{ site_name }}:
- type: tosca.nodes.Site
- properties:
- name: {{ site_name }}
-
-# s1u network
- s1u_template:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: s1u_template
- visibility: private
- translation: none
- vtn_kind: PRIVATE
-
- s1u_network:
- type: tosca.nodes.Network
- properties:
- name: s1u_network
- subnet: 111.0.0.0/24
- permit_all_slices: true
- requirements:
- - template:
- node: s1u_template
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_s1u
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_s1u:
- description: This slice exists solely to own the private network
- type: tosca.nodes.Slice
- properties:
- name: {{ site_name }}_s1u
- default_isolation: vm
- network: noauto
- requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/sbi-net.yaml.j2 b/templates/sbi-net.yaml.j2
deleted file mode 100644
index fe56d4c..0000000
--- a/templates/sbi-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
- - custom_types/site.yaml
- - custom_types/slice.yaml
- - custom_types/flavor.yaml
- - custom_types/network.yaml
- - custom_types/networktemplate.yaml
-
-description: network for south bound interface (sbi)
-
-topology_template:
- node_templates:
-
-# site, fully created in deployment.yaml
- {{ site_name }}:
- type: tosca.nodes.Site
- properties:
- name: {{ site_name }}
-
-# sbi network
- sbi_template:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: sbi_template
- visibility: private
- translation: none
- vtn_kind: PRIVATE
-
- sbi_network:
- type: tosca.nodes.Network
- properties:
- name: sbi_network
- subnet: 114.0.0.0/24
- permit_all_slices: true
- requirements:
- - template:
- node: sbi_template
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_sbi
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_sbi:
- description: This slice exists solely to own the private network
- type: tosca.nodes.Slice
- properties:
- name: {{ site_name }}_sbi
- default_isolation: vm
- network: noauto
- requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/sgi-net.yaml.j2 b/templates/sgi-net.yaml.j2
deleted file mode 100644
index db2779e..0000000
--- a/templates/sgi-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
- - custom_types/site.yaml
- - custom_types/slice.yaml
- - custom_types/flavor.yaml
- - custom_types/network.yaml
- - custom_types/networktemplate.yaml
-
-description: network for SGI interface
-
-topology_template:
- node_templates:
-
-# site, fully created in deployment.yaml
- {{ site_name }}:
- type: tosca.nodes.Site
- properties:
- name: {{ site_name }}
-
-# sgi network
- sgi_template:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: sgi_template
- visibility: private
- translation: none
- vtn_kind: PRIVATE
-
- sgi_network:
- type: tosca.nodes.Network
- properties:
- name: sgi_network
- subnet: 115.0.0.0/24
- permit_all_slices: true
- requirements:
- - template:
- node: sgi_template
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_sgi
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_sgi:
- description: This slice exists solely to own the private network
- type: tosca.nodes.Slice
- properties:
- name: {{ site_name }}_sgi
- default_isolation: vm
- network: noauto
- requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
-
diff --git a/templates/spgw-net.yaml.j2 b/templates/spgw-net.yaml.j2
deleted file mode 100644
index 0f4739a..0000000
--- a/templates/spgw-net.yaml.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-imports:
- - custom_types/xos.yaml
- - custom_types/site.yaml
- - custom_types/slice.yaml
- - custom_types/flavor.yaml
- - custom_types/network.yaml
- - custom_types/networktemplate.yaml
-
-description: network for direct communication between SPGW-C and SPGW-U
-
-topology_template:
- node_templates:
-
-# site, fully created in deployment.yaml
- {{ site_name }}:
- type: tosca.nodes.Site
- properties:
- name: {{ site_name }}
-
-# spgw network
- spgw_template:
- type: tosca.nodes.NetworkTemplate
- properties:
- name: spgw_template
- visibility: private
- translation: none
- vtn_kind: PRIVATE
-
- spgw_network:
- type: tosca.nodes.Network
- properties:
- name: spgw_network
- subnet: 117.0.0.0/24
- permit_all_slices: true
- requirements:
- - template:
- node: spgw_template
- relationship: tosca.relationships.BelongsToOne
- - owner:
- node: {{ site_name }}_spgw
- relationship: tosca.relationships.BelongsToOne
-
- {{ site_name }}_spgw:
- description: This slice exists solely to own the private network
- type: tosca.nodes.Slice
- properties:
- name: {{ site_name }}_spgw
- default_isolation: vm
- network: noauto
- requirements:
- - site:
- node: {{ site_name }}
- relationship: tosca.relationships.BelongsToOne
-