Merge lp:~therve/pyjuju/subordinates-relation-check into lp:pyjuju

[Thomas Herve]

Only allow one subordinate relations between svcs

It seems to be that topology.has_relation_between_endpoints didn't check for
subordinates properly.

[Kapil Thangavelu (hazmat)]

looks good, thanks!

review: Approve

[Kapil Thangavelu (hazmat)]

*** Submitted:

Only allow one subordinate relations between svcs

It seems to be that topology.has_relation_between_endpoints didn't check for
subordinates properly.

=== modified file 'juju/state/tests/test_relation.py'
--- juju/state/tests/test_relation.py	2012-09-10 03:20:20 +0000
+++ juju/state/tests/test_relation.py	2013-02-28 16:33:46 +0000
@@ -865,6 +865,9 @@
                                  "contents": {"private-address": None}},
                              "unit-0000000002": {
                                  "contents": {"private-address": None}}}}})
+        topology = yield self.get_topology()
+        self.assertTrue(
+            topology.has_relation_between_endpoints([mysql_ep, logging_ep]))
 
     @inlineCallbacks
     def test_presence_node_is_ephemeral(self):
 
=== modified file 'juju/state/topology.py'
--- juju/state/topology.py	2012-09-15 19:24:00 +0000
+++ juju/state/topology.py	2013-02-28 16:33:46 +0000
@@ -544,11 +544,11 @@
         for relation_data in relations.itervalues():
             scope = relation_data["scope"]
             services = relation_data["services"]
+
             for endpoint in endpoints:
                 service = services.get(service_ids[endpoint])
-                if not service or service["name"] != \
-                   endpoint.relation_name or \
-                   scope != endpoint.relation_scope:
+                if (not service or service["name"] != endpoint.relation_name or
+                    scope not in (endpoint.relation_scope, "container")):
                     break
             else:
                 return True