[CORD-1650]
Update TOSCA/variables to work with bridge/bond refactor
Change-Id: Ifdbdeee1b6281bed94eac26d4e7f89371768b5e4
diff --git a/templates/ecord-services.yaml.j2 b/templates/ecord-services.yaml.j2
index cbdc2bf..fad4bde 100644
--- a/templates/ecord-services.yaml.j2
+++ b/templates/ecord-services.yaml.j2
@@ -1,3 +1,4 @@
+---
{#
Copyright 2017-present Open Networking Foundation
@@ -16,7 +17,7 @@
tosca_definitions_version: tosca_simple_yaml_1_0
-description: Just enough Tosca to get the vEG slice running on the CORD POD, created by platform-install
+description: Just enough Tosca to get the vEG slice running on the CORD POD, created by ecord profile
imports:
- custom_types/addressmanagerservice.yaml
@@ -55,13 +56,14 @@
management:
type: tosca.nodes.Network
properties:
- name: management
must-exist: true
+ name: management
-{% if use_management_hosts %}
- management_hosts:
+{% if use_vtn_net_management_host %}
+ management_host:
type: tosca.nodes.Network
properties:
+ name: management_host
must-exist: true
{% endif %}
@@ -80,13 +82,15 @@
must-exist: true
# CORD Services
+
+# Using same addresses as the r-cord VSG
addresses_veg:
type: tosca.nodes.AddressPool
properties:
name: addresses_veg
- addresses: 10.7.1.0/24
- gateway_ip: 10.7.1.1
- gateway_mac: a4:23:05:06:01:01
+ addresses: {{ addresspool_vsg_cidr }}
+ gateway_ip: {{ addresspool_vsg_cidr | ipaddr('1') | ipaddr('address') }}
+ gateway_mac: {{ fabric_gateway_hwaddr }}
requirements:
- service:
node: service#addressmanager
@@ -96,9 +100,9 @@
type: tosca.nodes.AddressPool
properties:
name: addresses_public
- addresses: 10.8.1.0/24
- gateway_ip: 10.8.1.1
- gateway_mac: a4:23:05:06:01:01
+ addresses: {{ addresspool_public_cidr }}
+ gateway_ip: {{ addresspool_public_cidr | ipaddr('1') | ipaddr('address') }}
+ gateway_mac: {{ fabric_gateway_hwaddr }}
requirements:
- service:
node: service#addressmanager
@@ -194,10 +198,10 @@
node: service#vrouter
relationship: tosca.relationships.BelongsToOne
- template#veg:
+ veg_template:
type: tosca.nodes.NetworkTemplate
properties:
- name: veg
+ name: veg_template
visibility: private
translation: none
vtn_kind: VSG
@@ -210,7 +214,7 @@
# ip_version: 4
requirements:
- template:
- node: template#veg
+ node: veg_template
relationship: tosca.relationships.BelongsToOne
- owner:
node: {{ site_name }}_veg
@@ -254,12 +258,12 @@
node: {{ site_name }}_veg
relationship: tosca.relationships.BelongsToOne
-{% if use_management_hosts %}
- networkslice#management_hosts_to_{{ site_name }}_veg:
+{% if use_vtn_net_management_host %}
+ networkslice#management_host_to_{{ site_name }}_veg:
type: tosca.nodes.NetworkSlice
requirements:
- network:
- node: management_hosts
+ node: management_host
relationship: tosca.relationships.BelongsToOne
- slice:
node: {{ site_name }}_veg