CORD-1250 Update to new Service/Tenancy models
Change-Id: Iad7f5f1764c87d5e259a4d8913a23550cc30aa8f
diff --git a/roles/cord-profile/files/fixtures.yaml b/roles/cord-profile/files/fixtures.yaml
index 02e0f6f..a331ce5 100644
--- a/roles/cord-profile/files/fixtures.yaml
+++ b/roles/cord-profile/files/fixtures.yaml
@@ -46,12 +46,6 @@
siterole#tech:
type: tosca.nodes.SiteRole
- tenantrole#admin:
- type: tosca.nodes.TenantRole
-
- tenantrole#access:
- type: tosca.nodes.TenantRole
-
deploymentrole#admin:
type: tosca.nodes.DeploymentRole
diff --git a/roles/cord-profile/templates/cord-services.yaml.j2 b/roles/cord-profile/templates/cord-services.yaml.j2
index f6295ae..72509ff 100644
--- a/roles/cord-profile/templates/cord-services.yaml.j2
+++ b/roles/cord-profile/templates/cord-services.yaml.j2
@@ -33,6 +33,9 @@
no-update: true
{% endif %}
+ service#rcord:
+ type: tosca.nodes.Service
+
# ONOS_CORD, fully created in vtn.yaml
service#ONOS_CORD:
type: tosca.nodes.ONOSService
@@ -179,3 +182,62 @@
node: image#vsg-1.1
relationship: tosca.relationships.DefaultImage
+ in#lanside:
+ type: tosca.nodes.InterfaceType
+ properties:
+ direction: in
+
+ out#lanside:
+ type: tosca.nodes.InterfaceType
+ properties:
+ direction: out
+
+ in#wanside:
+ type: tosca.nodes.InterfaceType
+ properties:
+ direction: in
+
+ out#wanside:
+ type: tosca.nodes.InterfaceType
+ properties:
+ direction: out
+
+ volt_lanside:
+ type: tosca.nodes.ServiceInterface
+ requirements:
+ - service:
+ node: service#volt
+ relationship: tosca.relationships.MemberOfService
+ - interface:
+ node: out#lanside
+ relationship: tosca.relationships.IsType
+
+ vsg_lanside:
+ type: tosca.nodes.ServiceInterface
+ requirements:
+ - service:
+ node: service#vsg
+ relationship: tosca.relationships.MemberOfService
+ - interface:
+ node: in#lanside
+ relationship: tosca.relationships.IsType
+
+ vsg_wanside:
+ type: tosca.nodes.ServiceInterface
+ requirements:
+ - service:
+ node: service#vsg
+ relationship: tosca.relationships.MemberOfService
+ - interface:
+ node: out#wanside
+ relationship: tosca.relationships.IsType
+
+ vrouter_wanside:
+ type: tosca.nodes.ServiceInterface
+ requirements:
+ - service:
+ node: service#vrouter
+ relationship: tosca.relationships.MemberOfService
+ - interface:
+ node: in#wanside
+ relationship: tosca.relationships.IsType
\ No newline at end of file