Removing circular dependency in M-CORD TOSCA
Change-Id: Idddc3a84cb4f7d7466bf583eb4f1ac904cc77237
diff --git a/tosca-configs/mcord/mcord-barcellona-fabric.yaml b/tosca-configs/mcord/mcord-barcellona-fabric.yaml
index afafd40..3fd825a 100644
--- a/tosca-configs/mcord/mcord-barcellona-fabric.yaml
+++ b/tosca-configs/mcord/mcord-barcellona-fabric.yaml
@@ -20,12 +20,95 @@
- custom_types/switchport.yaml
- custom_types/portinterface.yaml
- custom_types/fabricipaddress.yaml
+ - custom_types/site.yaml
+ - custom_types/deployment.yaml
+ - custom_types/sitedeployment.yaml
+ - custom_types/node.yaml
+ - custom_types/vrouterservice.yaml
+ - custom_types/vrouterserviceinstance.yaml
-description: Configures the MCORD POD Fabric
+description: Configures the ONF SEBA POD with AT&T workflow
topology_template:
node_templates:
+ # Site deployment
+ mySite:
+ type: tosca.nodes.Site
+ properties:
+ name: mysite
+ login_base: opencord
+ abbreviated_name: ms
+ site_url: http://opencord.org/
+ hosts_nodes: true
+
+ myDeployment:
+ type: tosca.nodes.Deployment
+ properties:
+ name: mydeployment
+
+ site_deployment:
+ type: tosca.nodes.SiteDeployment
+ requirements:
+ - site:
+ node: mySite
+ relationship: tosca.relationships.BelongsToOne
+ - deployment:
+ node: myDeployment
+ relationship: tosca.relationships.BelongsToOne
+
+ # compute nodes
+ node#node1:
+ type: tosca.nodes.Node
+ properties:
+ dataPlaneIntf: eth2
+ dataPlaneIp: 118.0.0.201
+ name: node1
+ requirements:
+ - site_deployment:
+ node: site_deployment
+ relationship: tosca.relationships.BelongsToOne
+
+ node#node2:
+ type: tosca.nodes.Node
+ properties:
+ dataPlaneIntf: eth2
+ dataPlaneIp: 118.0.0.202
+ name: node2
+ requirements:
+ - site_deployment:
+ node: site_deployment
+ relationship: tosca.relationships.BelongsToOne
+
+ node#node3:
+ type: tosca.nodes.Node
+ properties:
+ dataPlaneIntf: eth2
+ dataPlaneIp: 118.0.0.203
+ name: node3
+ requirements:
+ - site_deployment:
+ node: site_deployment
+ relationship: tosca.relationships.BelongsToOne
+
+ # static routes
+
+ service#vrouter:
+ type: tosca.nodes.VRouterService
+ properties:
+ name: vrouter
+ must-exist: true
+
+
+ vroutersi#calico:
+ type: tosca.nodes.VRouterServiceInstance
+ properties:
+ name: calico
+ requirements:
+ - owner:
+ node: service#vrouter
+ relationship: tosca.relationships.BelongsToOne
+
# Fabric configuration
switch#leaf_1:
type: tosca.nodes.Switch