juju/control should be aware of subordinates

juju/state/tests/test_hook.py

 import yaml
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 from juju.lib.pick import pick_attr
 from juju.lib.testing import TestCase
 
 from juju.state.endpoint import RelationEndpoint
 from juju.state.hook import (
     DepartedRelationHookContext, HookContext, RelationChange,
     RelationHookContext)
 from juju.state.errors import (
     UnitRelationStateNotFound, RelationBrokenContextError)
 from juju.state.tests.test_relation import RelationTestBase
 from juju.state.utils import AddedItem, DeletedItem, ModifiedItem
 
 
 class RelationChangeTest(TestCase):
 
     def test_change_properties(self):
 
-        change = RelationChange("db", "membership", "mysql/0")
+        change = RelationChange("db:42", "membership", "mysql/0")
         self.assertEqual(change.relation_name, "db")
+        self.assertEqual(change.relation_ident, "db:42")
         self.assertEqual(change.change_type, "membership")
         self.assertEqual(change.unit_name, "mysql/0")
 
 
 class CommonHookContextTestsMixin(object):
 
     @inlineCallbacks
     def test_config_get(self):
         """Verify we can get config settings.
 
@@ skipping 68 matching lines @@
 
     @inlineCallbacks
     def setUp(self):
         yield super(HookContextTest, self).setUp()
         self.service = self.wordpress_states["service"]
         self.unit = self.wordpress_states["unit"]
         self.context = HookContext(
             self.client, unit_name=self.unit.unit_name)
 
 
-class RelationHookContextTest(HookContextTestBase, CommonHookContextTestsMixin):
+class RelationHookContextTest(HookContextTestBase,
+                              CommonHookContextTestsMixin):
 
     @inlineCallbacks
     def setUp(self):
         yield super(RelationHookContextTest, self).setUp()
         self.service = self.wordpress_states["service"]
         self.unit = self.wordpress_states["unit"]
         self.reset_context()
 
     def reset_context(self):
         self.context = self.get_context(
             self.wordpress_states, "modified", "mysql/0")
 
     def get_context(self, states, change_type, unit_name):
         change = RelationChange(
-            states["service_relation"].relation_name,
+            states["service_relation"].relation_ident,
             change_type,
             unit_name)
         return RelationHookContext(
             self.client, states["unit_relation"], change,
             unit_name=self.unit.unit_name)
 
     @inlineCallbacks
     def test_get(self):
         """Settings from a related unit can be retrieved as a blob."""
         yield self.mysql_states["unit_relation"].set_data({"hello": "world"})
@@ skipping 474 matching lines @@
     def test_get_self(self):
         """Own settings can be retrieved."""
         settings_path = self.get_unit_settings_path(
             self.relation_state,
             self.unit,
             self.container_unit)
         self.client.set(settings_path,
                         yaml.dump({"hello": "world"}))
         data = yield self.context.get(None)
         self.assertEquals(data, {"hello": "world"})