CORD-1253 onboard the AddressManager service
Change-Id: I56aa0befc38de0a43f53b886a348cf61bc25e0aa
diff --git a/roles/cord-profile/templates/cord-services.yaml.j2 b/roles/cord-profile/templates/cord-services.yaml.j2
index 2662f00..ce8311f 100644
--- a/roles/cord-profile/templates/cord-services.yaml.j2
+++ b/roles/cord-profile/templates/cord-services.yaml.j2
@@ -23,6 +23,7 @@
imports:
- custom_types/xos.yaml
- custom_types/vtr.yaml
+ - custom_types/addressmanager.yaml
topology_template:
node_templates:
@@ -113,6 +114,9 @@
service#vsg:
type: tosca.nodes.VSGService
requirements:
+ - addressing_tenant:
+ node: service#addressmanager
+ relationship: tosca.relationships.TenantOfService
- vrouter_tenant:
node: service#vrouter
relationship: tosca.relationships.TenantOfService
@@ -126,11 +130,8 @@
artifacts:
pubkey: /opt/cord_profile/key_import/vsg_rsa.pub
- service#vrouter:
- type: tosca.nodes.VRouterService
- properties:
- view_url: /admin/vrouter/vrouterservice/$id$/
- replaces: service_vrouter
+ service#addressmanager:
+ type: tosca.nodes.AddressManagerService
requirements:
- addresses_vsg:
node: addresses_vsg
@@ -139,6 +140,12 @@
node: addresses_public
relationship: tosca.relationships.ProvidesAddresses
+ service#vrouter:
+ type: tosca.nodes.VRouterService
+ properties:
+ view_url: /admin/vrouter/vrouterservice/$id$/
+ replaces: service_vrouter
+
vRouter_ONOS_app:
type: tosca.nodes.ONOSvRouterApp
requirements:
@@ -250,11 +257,11 @@
node: out#wanside
relationship: tosca.relationships.IsType
- vrouter_wanside:
+ addressmanager_wanside:
type: tosca.nodes.ServiceInterface
requirements:
- service:
- node: service#vrouter
+ node: service#addressmanager
relationship: tosca.relationships.MemberOfService
- interface:
node: in#wanside