[CORD-2349] Migrating REM-CORD
Change-Id: Iae573428e3bee89026262055263f24a32dd12183
diff --git a/roles/cord-profile/templates/management-net.yaml.j2 b/roles/cord-profile/templates/management-net.yaml.j2
index 2b3b41d..9c7b03c 100644
--- a/roles/cord-profile/templates/management-net.yaml.j2
+++ b/roles/cord-profile/templates/management-net.yaml.j2
@@ -19,7 +19,10 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - custom_types/xos.yaml
+ - custom_types/networktemplate.yaml
+ - custom_types/network.yaml
+ - custom_types/slice.yaml
+ - custom_types/site.yaml
description: management network config, generated by platform-install
@@ -29,59 +32,66 @@
# site, fully created in deployment.yaml
{{ site_name }}:
type: tosca.nodes.Site
+ properties:
+ name: {{ site_name }}
# management network
management_template:
type: tosca.nodes.NetworkTemplate
properties:
+ name: management_template
visibility: private
translation: none
vtn_kind: MANAGEMENT_LOCAL
management:
- type: tosca.nodes.network.Network
+ type: tosca.nodes.Network
properties:
- ip_version: 4
- cidr: {{ management_network_cidr }}
+ name: management
+ # ip_version: 4
+ subnet: {{ management_network_cidr }}
+ permit_all_slices: true
requirements:
- - network_template:
+ - template:
node: management_template
- relationship: tosca.relationships.UsesNetworkTemplate
+ relationship: tosca.relationships.BelongsToOne
- owner:
- node: {{ site_name }}_management
- relationship: tosca.relationships.MemberOfSlice
+ node: slice#{{ site_name }}_management
+ relationship: tosca.relationships.BelongsToOne
{% if use_management_hosts %}
management_hosts_template:
type: tosca.nodes.NetworkTemplate
properties:
+ name: management_hosts_template
visibility: private
translation: none
vtn_kind: MANAGEMENT_HOST
management_hosts:
- type: tosca.nodes.network.Network
+ type: tosca.nodes.Network
properties:
- ip_version: 4
- cidr: {{ management_hosts_net_cidr }}
+ # ip_version: 4
+ subnet: {{ management_hosts_net_cidr }}
start_ip: {{ management_hosts_net_range_xos_low }}
end_ip: {{ management_hosts_net_range_xos_high }}
requirements:
- - network_template:
+ - template:
node: management_hosts_template
- relationship: tosca.relationships.UsesNetworkTemplate
+ relationship: tosca.relationships.BelongsToOne
- owner:
- node: {{ site_name }}_management
- relationship: tosca.relationships.MemberOfSlice
+ node: slice#{{ site_name }}_management
+ relationship: tosca.relationships.BelongsToOne
{% endif %}
- {{ site_name }}_management:
+ slice#{{ site_name }}_management:
description: This slice exists solely to own the management network
type: tosca.nodes.Slice
properties:
network: noauto
+ name: {{ site_name }}_management
requirements:
- site:
node: {{ site_name }}
- relationship: tosca.relationships.MemberOfSite
+ relationship: tosca.relationships.BelongsToOne