replace SiteDeployment with new non-nested requirements
Change-Id: I151bd07f278d1021481541bdc46fb36fe3713c79
diff --git a/common/base.yaml b/common/base.yaml
index 3638dd9..847b1fb 100644
--- a/common/base.yaml
+++ b/common/base.yaml
@@ -58,11 +58,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
diff --git a/common/cloudlab-openstack.yaml b/common/cloudlab-openstack.yaml
index 969f84c..c50283f 100644
--- a/common/cloudlab-openstack.yaml
+++ b/common/cloudlab-openstack.yaml
@@ -64,11 +64,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
diff --git a/common/mydeployment.yaml b/common/mydeployment.yaml
index c81fd93..1205723 100644
--- a/common/mydeployment.yaml
+++ b/common/mydeployment.yaml
@@ -42,7 +42,7 @@
requirements:
- deployment:
node: MyDeployment
- relationship: tosca.relationships.SiteDeployment
+ relationship: tosca.relationships.MemberOfDeployment
# Attach the Tenant view to the MyDeployment deployment
Tenant:
diff --git a/cord-pod-ansible/setup.yaml b/cord-pod-ansible/setup.yaml
index c13f0eb..20b1b12 100644
--- a/cord-pod-ansible/setup.yaml
+++ b/cord-pod-ansible/setup.yaml
@@ -39,11 +39,10 @@
requirements:
- deployment:
node: MyDeployment
- relationship: tosca.relationships.SiteDeployment
- requirements:
- - controller:
- node: MyOpenStack
- relationship: tosca.relationships.UsesController
+ relationship: tosca.relationships.MemberOfDeployment
+ - controller:
+ node: MyOpenStack
+ relationship: tosca.relationships.UsesController
# This user already exists in XOS with this password
# It's an example of how to create new users
diff --git a/cord-pod/setup.yaml b/cord-pod/setup.yaml
index c13f0eb..20b1b12 100644
--- a/cord-pod/setup.yaml
+++ b/cord-pod/setup.yaml
@@ -39,11 +39,10 @@
requirements:
- deployment:
node: MyDeployment
- relationship: tosca.relationships.SiteDeployment
- requirements:
- - controller:
- node: MyOpenStack
- relationship: tosca.relationships.UsesController
+ relationship: tosca.relationships.MemberOfDeployment
+ - controller:
+ node: MyOpenStack
+ relationship: tosca.relationships.UsesController
# This user already exists in XOS with this password
# It's an example of how to create new users
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
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
diff --git a/mcord/setup.yaml b/mcord/setup.yaml
index 57ceab7..3c480ef 100644
--- a/mcord/setup.yaml
+++ b/mcord/setup.yaml
@@ -43,11 +43,10 @@
requirements:
- deployment:
node: MyDeployment
- relationship: tosca.relationships.SiteDeployment
- requirements:
- - controller:
- node: MyOpenStack
- relationship: tosca.relationships.UsesController
+ relationship: tosca.relationships.MemberOfDeployment
+ - controller:
+ node: MyOpenStack
+ relationship: tosca.relationships.UsesController
Topology:
type: tosca.nodes.DashboardView
properties: