commit b239b8b5502485cb640d480982f4656ea42cb12a
author Scott Baker <smbaker@gmail.com> Wed Sep 16 16:11:30 2015 -0700
committer Scott Baker <smbaker@gmail.com> Wed Sep 16 16:11:30 2015 -0700
tree 0e4869a59e238cc062bd020950d6d78bb82551b1
parent 03394b3246c8af4ada3ed28648128e70e3b29268

relationship -> relationships

xos/tosca/resources/xossite.py

diff --git a/xos/tosca/resources/xossite.py b/xos/tosca/resources/xossite.py
index a65129a..997c9e9 100644
--- a/xos/tosca/resources/xossite.py
+++ b/xos/tosca/resources/xossite.py
@@ -46,7 +46,7 @@
                     controller_name = None
                     for sd_req in v["requirements"]:
                         for (sd_req_k, sd_req_v) in sd_req.items():
-                            if sd_req_v["relationship"] == "tosca.relationship.UsesController":
+                            if sd_req_v["relationship"] == "tosca.relationships.UsesController":
                                 controller_name = sd_req_v["node"]
                     if not controller_name:
                         raise Exception("Controller must be specified in SiteDeployment relationship")

xos/tosca/samples/new_site_deploy_slice.yaml

diff --git a/xos/tosca/samples/new_site_deploy_slice.yaml b/xos/tosca/samples/new_site_deploy_slice.yaml
index fa047a3..6ccadc1 100644
--- a/xos/tosca/samples/new_site_deploy_slice.yaml
+++ b/xos/tosca/samples/new_site_deploy_slice.yaml
@@ -40,7 +40,7 @@
                requirements:
                    - controller:
                        node: newcontroller
-                       relationship: tosca.relationship.UsesController
+                       relationship: tosca.relationships.UsesController
 
     newsite_tosca:
       type: tosca.nodes.Slice