move to new tosca engine
Change-Id: Id5bb3d6f7916a77c001a21de231682e57d1dca1f
diff --git a/roles/cord-profile/templates/s11-net.yaml.j2 b/roles/cord-profile/templates/s11-net.yaml.j2
index 3e0ac53..ce5ee43 100644
--- a/roles/cord-profile/templates/s11-net.yaml.j2
+++ b/roles/cord-profile/templates/s11-net.yaml.j2
@@ -2,6 +2,12 @@
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
@@ -11,36 +17,49 @@
# site, fully created in deployment.yaml
{{ site_name }}:
type: tosca.nodes.Site
+ properties:
+ name: {{ site_name }}
+
+# mysite_vMME_slice:
+# type: tosca.nodes.Slice
+# properties:
+# must-exist: true
+# name: mysite_vMME_slice
# 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.Network
+ type: tosca.nodes.Network
properties:
- ip_version: 4
- cidr: 112.0.0.0/24
+ name: s11_network
+ subnet: 112.0.0.0/24
requirements:
- - network_template:
+ - template:
node: s11_template
- relationship: tosca.relationships.UsesNetworkTemplate
+ relationship: tosca.relationships.BelongsToOne
- owner:
node: {{ site_name }}_s11
- relationship: tosca.relationships.MemberOfSlice
+ relationship: tosca.relationships.BelongsToOne
+ # - slices:
+ # node: mysite_vMME_slice
+ # relationship: tosca.relationships.BelongsToMany
+
{{ site_name }}_s11:
description: This slice exists solely to own the private network
type: tosca.nodes.Slice
properties:
- network: noauto
+ name: {{ site_name }}_s11
+ default_isolation: vm
requirements:
- site:
node: {{ site_name }}
- relationship: tosca.relationships.MemberOfSite
-
+ relationship: tosca.relationships.BelongsToOne