move all the networks to new tosca engine
Change-Id: Id7b42ee34ae8a0c4fbcbaaee291fec8c37d6056a
diff --git a/roles/cord-profile/templates/s1u-net.yaml.j2 b/roles/cord-profile/templates/s1u-net.yaml.j2
index dfa5e68..90d2962 100644
--- a/roles/cord-profile/templates/s1u-net.yaml.j2
+++ b/roles/cord-profile/templates/s1u-net.yaml.j2
@@ -2,6 +2,11 @@
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
@@ -11,36 +16,39 @@
# 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.Network
+ type: tosca.nodes.Network
properties:
- ip_version: 4
- cidr: 111.0.0.0/24
+ name: s1u_network
+ subnet: 111.0.0.0/24
requirements:
- - network_template:
+ - template:
node: s1u_template
- relationship: tosca.relationships.UsesNetworkTemplate
+ relationship: tosca.relationships.BelongsToOne
- owner:
node: {{ site_name }}_s1u
- relationship: tosca.relationships.MemberOfSlice
+ relationship: tosca.relationships.BelongsToOne
{{ site_name }}_s1u:
description: This slice exists solely to own the private network
type: tosca.nodes.Slice
properties:
- network: noauto
+ name: {{ site_name }}_s1u
+ default_isolation: vm
requirements:
- site:
node: {{ site_name }}
- relationship: tosca.relationships.MemberOfSite
-
+ relationship: tosca.relationships.BelongsToOne