commit b52acdeee5a8d113142f7a624093ced942247852
author Pingping Lin <pingping@onlab.us> Thu Sep 22 15:29:52 2016 -0700
committer Gerrit Code Review <gerrit@localhost> Thu Sep 22 15:29:52 2016 -0700
tree 627b5c27f541ac10c07f43701d8610fb950c8409
parent 19e88b4ec265aff5c13773495af6d05f65acfa07
parent 53e3e3b07e2a37357de746ecc8a2eb108f9994d4

Merge "Restored mcord service grid"

mcord/nodes.yaml

diff --git a/mcord/nodes.yaml b/mcord/nodes.yaml
index 432e779..592d34f 100644
--- a/mcord/nodes.yaml
+++ b/mcord/nodes.yaml
@@ -12,11 +12,41 @@
     mysite:
         type: tosca.nodes.Site
 
+    computeBBU1:
+        type: tosca.nodes.Node
+        requirements:
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+          - deployment:
+              node: MyDeployment
+              relationship: tosca.relationships.MemberOfDeployment
+
     computeBBU2:
         type: tosca.nodes.Node
         requirements:
           - site:
-              node: mysite 
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+          - deployment:
+              node: MyDeployment
+              relationship: tosca.relationships.MemberOfDeployment
+
+    compute9:
+        type: tosca.nodes.Node
+        requirements:
+          - site:
+              node: mysite
+              relationship: tosca.relationships.MemberOfSite
+          - deployment:
+              node: MyDeployment
+              relationship: tosca.relationships.MemberOfDeployment
+
+    compute10:
+        type: tosca.nodes.Node
+        requirements:
+          - site:
+              node: mysite
               relationship: tosca.relationships.MemberOfSite
           - deployment:
               node: MyDeployment
@@ -31,14 +61,3 @@
         - deployment:
             node: MyDeployment
             relationship: tosca.relationships.MemberOfDeployment
-
-    compute10:
-        type: tosca.nodes.Node
-        requirements:
-          - site:
-              node: mysite 
-              relationship: tosca.relationships.MemberOfSite
-          - deployment:
-              node: MyDeployment
-              relationship: tosca.relationships.MemberOfDeployment
-

mcord/vtn-external.yaml

diff --git a/mcord/vtn-external.yaml b/mcord/vtn-external.yaml
index d59e912..734b794 100644
--- a/mcord/vtn-external.yaml
+++ b/mcord/vtn-external.yaml
@@ -33,6 +33,51 @@
           xosPassword: letmein
           replaces: service_vtn
 
+    nova-compute-1:
+      type: tosca.nodes.Node
+
+    # VTN bridgeId field for node nova-compute-1
+    nova-compute-1_bridgeId_tag:
+      type: tosca.nodes.Tag
+      properties:
+          name: bridgeId
+          value: of:0000000000000001
+      requirements:
+          - target:
+              node: nova-compute-1
+              relationship: tosca.relationships.TagsObject
+          - service:
+              node: service#ONOS_CORD
+              relationship: tosca.relationships.MemberOfService
+
+    # VTN dataPlaneIntf field for node nova-compute-1
+    nova-compute-1_dataPlaneIntf_tag:
+      type: tosca.nodes.Tag
+      properties:
+          name: dataPlaneIntf
+          value: fabric
+      requirements:
+          - target:
+              node: nova-compute-1
+              relationship: tosca.relationships.TagsObject
+          - service:
+              node: service#ONOS_CORD
+              relationship: tosca.relationships.MemberOfService
+
+    # VTN dataPlaneIp field for node nova-compute-1
+    nova-compute-1_dataPlaneIp_tag:
+      type: tosca.nodes.Tag
+      properties:
+          name: dataPlaneIp
+          value: 10.168.0.253/24
+      requirements:
+          - target:
+              node: nova-compute-1
+              relationship: tosca.relationships.TagsObject
+          - service:
+              node: service#ONOS_CORD
+              relationship: tosca.relationships.MemberOfService
+
     VTN_ONOS_app:
       type: tosca.nodes.ONOSVTNApp
       requirements: