Update new TOSCA recipes
Change-Id: I02b903c65ba2c79c8b42aaf49b4f1c834b44db44
diff --git a/roles/cord-profile/templates/mcord-services.yml.j2 b/roles/cord-profile/templates/mcord-services.yml.j2
index 63f8bcb..a5730d0 100644
--- a/roles/cord-profile/templates/mcord-services.yml.j2
+++ b/roles/cord-profile/templates/mcord-services.yml.j2
@@ -82,7 +82,7 @@
type: tosca.nodes.Network
properties:
must-exist: true
- name: management
+ name: management_hosts
{% endif %}
# s1u_network is for connectivity between VMs, fully created in s1u-net.yaml
@@ -115,6 +115,12 @@
properties:
must-exist: true
name: sgi_network
+# s1mme_network is for connectivity between VMs, fully created in s1mme-net.yaml
+ s1mme_network:
+ type: tosca.nodes.Network
+ properties:
+ must-exist: true
+ name: s1mme_network
@@ -174,6 +180,7 @@
properties:
name: {{ site_name }}_vmme
default_isolation: vm
+ network: noauto
requirements:
- site:
node: mysite
@@ -188,13 +195,32 @@
node: m1.small
relationship: tosca.relationships.BelongsToOne
-# will enable this part after sapan fix the obj issue
-# mme_slice_s11_network:
-# type: tosca.nodes.NetworkSlice
-# requirements:
-# - network:
-# node: s11_network
-# relationship: tosca.relationships.BelongsToOne
-# - slice:
-# node: {{ site_name }}_vmme
-# relationship: tosca.relationships.BelongsToOne
+ mme_slice_management_network:
+ type: tosca.nodes.NetworkSlice
+ requirements:
+ - network:
+ node: management
+ relationship: tosca.relationships.BelongsToOne
+ - slice:
+ node: {{ site_name }}_vmme
+ relationship: tosca.relationships.BelongsToOne
+
+ mme_slice_s11_network:
+ type: tosca.nodes.NetworkSlice
+ requirements:
+ - network:
+ node: s11_network
+ relationship: tosca.relationships.BelongsToOne
+ - slice:
+ node: {{ site_name }}_vmme
+ relationship: tosca.relationships.BelongsToOne
+
+ mme_slice_s1mme_network:
+ type: tosca.nodes.NetworkSlice
+ requirements:
+ - network:
+ node: s1mme_network
+ relationship: tosca.relationships.BelongsToOne
+ - slice:
+ node: {{ site_name }}_vmme
+ relationship: tosca.relationships.BelongsToOne