rename cord services
diff --git a/xos/configurations/cord-pod/cord-vtn-vsg.yaml b/xos/configurations/cord-pod/cord-vtn-vsg.yaml
index e3f73c6..a315e41 100644
--- a/xos/configurations/cord-pod/cord-vtn-vsg.yaml
+++ b/xos/configurations/cord-pod/cord-vtn-vsg.yaml
@@ -8,21 +8,23 @@
topology_template:
node_templates:
# CORD Services
- service_vtr:
+ service#vtr:
type: tosca.nodes.Service
properties:
view_url: /admin/vtr/vtrservice/$id$/
kind: vTR
+ replaces: service_vtr
- service_volt:
+ service#volt:
type: tosca.nodes.Service
requirements:
- vsg_tenant:
- node: service_vsg
+ node: service#vsg
relationship: tosca.relationships.TenantOfService
properties:
view_url: /admin/cord/voltservice/$id$/
kind: vOLT
+ replaces: service_volt
addresses_vsg:
type: tosca.nodes.AddressPool
@@ -38,11 +40,11 @@
gateway_ip: 10.168.1.1
gateway_mac: 02:42:0a:a8:00:01
- service_vsg:
+ service#vsg:
type: tosca.nodes.VSGService
requirements:
- vrouter_tenant:
- node: service_vrouter
+ node: service#vrouter
relationship: tosca.relationships.TenantOfService
properties:
view_url: /admin/cord/vsgservice/$id$/
@@ -50,13 +52,15 @@
public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
private_key_fn: /opt/xos/synchronizers/vcpe/vcpe_private_key
# node_label: label_vsg
+ replaces: service_vsg
artifacts:
pubkey: /opt/xos/synchronizers/vcpe/vcpe_public_key
- service_vrouter:
+ service#vrouter:
type: tosca.nodes.VRouterService
properties:
view_url: /admin/vrouter/vrouterservice/$id$/
+ replaces: service_vrouter
requirements:
- addresses_vsg:
node: addresses_vsg
@@ -65,10 +69,11 @@
node: addresses_exampleservice-public
relationship: tosca.relationships.ProvidesAddresses
- service_fabric:
+ service#fabric:
type: tosca.nodes.FabricService
properties:
view_url: /admin/fabric/fabricservice/$id$/
+ replaces: service_fabric
Private:
type: tosca.nodes.NetworkTemplate
@@ -110,7 +115,7 @@
network: noauto
requirements:
- vsg_service:
- node: service_vsg
+ node: service#vsg
relationship: tosca.relationships.MemberOfService
- site:
node: mysite
@@ -193,7 +198,7 @@
c_tag: 111
requirements:
- provider_service:
- node: service_volt
+ node: service#volt
relationship: tosca.relationships.MemberOfService
- subscriber:
node: My House
diff --git a/xos/configurations/cord-pod/make-vtn-external-yaml.sh b/xos/configurations/cord-pod/make-vtn-external-yaml.sh
index 4c9e0ee..8d0885d 100644
--- a/xos/configurations/cord-pod/make-vtn-external-yaml.sh
+++ b/xos/configurations/cord-pod/make-vtn-external-yaml.sh
@@ -13,7 +13,7 @@
topology_template:
node_templates:
- service_ONOS_CORD:
+ service#ONOS_CORD:
type: tosca.nodes.ONOSService
requirements:
properties:
@@ -21,8 +21,9 @@
view_url: /admin/onos/onosservice/\$id$/
no_container: true
rest_hostname: onos-cord
+ replaces: service_ONOS_CORD
- service_vtn:
+ service#vtn:
type: tosca.nodes.VTNService
properties:
view_url: /admin/vtn/vtnservice/\$id$/
@@ -35,6 +36,7 @@
xosEndpoint: http://xos/
xosUser: padmin@vicci.org
xosPassword: letmein
+ replaces: service_vtn
EOF
@@ -57,7 +59,7 @@
node: $NODE
relationship: tosca.relationships.TagsObject
- service:
- node: service_ONOS_CORD
+ node: service#ONOS_CORD
relationship: tosca.relationships.MemberOfService
# VTN dataPlaneIntf field for node $NODE
@@ -71,7 +73,7 @@
node: $NODE
relationship: tosca.relationships.TagsObject
- service:
- node: service_ONOS_CORD
+ node: service#ONOS_CORD
relationship: tosca.relationships.MemberOfService
# VTN dataPlaneIp field for node $NODE
@@ -85,7 +87,7 @@
node: $NODE
relationship: tosca.relationships.TagsObject
- service:
- node: service_ONOS_CORD
+ node: service#ONOS_CORD
relationship: tosca.relationships.MemberOfService
EOF
@@ -96,10 +98,10 @@
type: tosca.nodes.ONOSVTNApp
requirements:
- onos_tenant:
- node: service_ONOS_CORD
+ node: service#ONOS_CORD
relationship: tosca.relationships.TenantOfService
- vtn_service:
- node: service_vtn
+ node: service#vtn
relationship: tosca.relationships.UsedByService
properties:
dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp, org.onosproject.cordvtn, org.onosproject.olt, org.onosproject.igmp, org.onosproject.cordmcast