commit 039cb68739043164b59951d7b4d541049e0ff7ac
author Scott Baker <smbaker@gmail.com> Thu Oct 06 15:18:46 2016 -0700
committer Scott Baker <smbaker@gmail.com> Thu Oct 06 16:33:38 2016 -0700
tree 80be3fd977f44033b50b81eb2900fd815d04c538
parent c5bf2e571a269993adf08c1bee3328297a71f13d

replace SiteDeployment with new non-nested requirements

Change-Id: I151bd07f278d1021481541bdc46fb36fe3713c79

frontend/mocks/mcord.yaml

diff --git a/frontend/mocks/mcord.yaml b/frontend/mocks/mcord.yaml
index 6c10ad3..c7b8ea7 100644
--- a/frontend/mocks/mcord.yaml
+++ b/frontend/mocks/mcord.yaml
@@ -89,11 +89,10 @@
       requirements:
           - deployment:
                node: StanfordDeployment
-               relationship: tosca.relationships.SiteDeployment
-               requirements:
-                   - controller:
-                       node: CloudLab
-                       relationship: tosca.relationships.UsesController
+               relationship: tosca.relationships.MemberOfDeployment
+          - controller:
+               node: CloudLab
+               relationship: tosca.relationships.UsesController
 
 
     # Nodes

frontend/sample.yaml

diff --git a/frontend/sample.yaml b/frontend/sample.yaml
index 0cc47ab..2d018a6 100644
--- a/frontend/sample.yaml
+++ b/frontend/sample.yaml
@@ -46,11 +46,10 @@
       requirements:
           - deployment:
                node: MyDeployment
-               relationship: tosca.relationships.SiteDeployment
-               requirements:
-                   - controller:
-                       node: CloudLab
-                       relationship: tosca.relationships.UsesController
+               relationship: tosca.relationships.MemberOfDeployment
+          - controller:
+               node: CloudLab
+               relationship: tosca.relationships.UsesController
 
     Public shared IPv4:
       type: tosca.nodes.NetworkTemplate