Merge lp:~jjo/juju-deployer/fix-juju-deployer-diff-for-multiple-relations-between-servicepair into lp:juju-deployer

[JuanJo Ciarlante]

[jjo] diff: support multiple relations between service pair(s)
- use a "*" when found, then special-case Endpoint comparison to use it as a wildcard for relation name (ie only compare service names)
- fix env/mem.py to be able to load more complex cfgs, use openstack-1501.yaml
- add a couple of tests simulating an environment created from an edited config file (save original env YAML to tmp file, load it, edit dictionary, export to YAML, inject to ConfigStack via mock_open)

Because juju environment object doesn't contain the named relation originally used, diff support is not deterministic: e.g. if you have a service pair with 3 possible relations, with environment having foo:r1<->bar:r2 while config specifying foo:r2<->bar:r3, it'll show as nil diff -- IMO still better than voiding juju-deployer diff usage if there's any double-relation at environment.

[JuanJo Ciarlante (jjo)]

- WIP, fixing tests to:
  - env/mem.py: be able to load openstack-1501.yaml into
    'mem'(testing) env
  - test_diff.py: use 'openstack' instead of 'blog'
- could reproduce "ValueError: Ambigious relations for
  service" at tests (now I need to fix it ;)

[JuanJo Ciarlante (jjo)]

* tests ok:
Ran 106 tests in 61.608s
OK (SKIP=1)

* also verified against live 1501 openstack deploys

[Kapil Thangavelu (hazmat)]

looks good... i'm a bit concerned about this much logic in the fake env without just using an actual stub env impl. some of the bits here like * logic go away even just using the actual core status api vs the cli format of it as endpoints are always qualified. need a bit more time to work through fully.

[David Britton (dpb)]

Hi jjo, please clean up the conflicts on this branch WRT trunk. I'm continuing the review as well so I don't make you wait another year. :)

review: Needs Fixing

[David Britton (dpb)]

Some small things in the inline comments.

=== modified file 'deployer/action/diff.py'
--- deployer/action/diff.py	2015-01-27 15:14:00 +0000
+++ deployer/action/diff.py	2015-03-11 03:54:39 +0000
@@ -28,9 +28,8 @@
                 'options'] = self.env.get_config(svc_name)
             self.env_state['services'][svc_name][
                 'constraints'] = self.env.get_constraints(svc_name)
-            self.env_state['services'][svc_name][
-                'unit_count'] = len(
-                    self.env_status['services'][svc_name].get('units', {}))
+            self.env_state['services'][svc_name]['unit_count'] = len(
+                self.env_status['services'][svc_name].get('units', {}))
             rels.update(self._load_rels(svc_name))
         self.env_state['relations'] = sorted(rels)
 
@@ -59,8 +58,15 @@
         for r, eps in svc_rels.items():
             if src in eps:
                 if found:
-                    raise ValueError("Ambigious relations for service")
-                found = r
+                    self.deployment.log.warning(
+                        "Service: %s will show ambiguous relations to %s"
+                        % (src, tgt))
+                    # use "*" to note the ambiguity - will be specially
+                    # processed by Endpoint comparisons as a kind of
+                    # ~wildcard
+                    found = "*"
+                else:
+                    found = r
         return found
 
     def get_delta(self):
@@ -130,15 +136,19 @@
         if d_sc != e_s['constraints']:
             mod['env-constraints'] = e_s['constraints']
             mod['cfg-constraints'] = d_sc
-        for k, v in d_s.get('options', {}).items():
-            # Deploy options not known to the env may originate
-            # from charm version delta or be an invalid config.
-            if not k in e_s['options']:
-                continue
+        all_options = set(d_s.get('options', {}).keys() +
+                          e_s.get('options', {}).keys())
+        for k in all_options:
+            # deploy cfg value
+            d_v = d_s.get('options', {}).get(k)
+            # if unset at config, use charm's default
+            if d_v is None:
+                d_v = charm.config.get(k, {}).get('default', None)
+            # environment cfg value
             e_v = e_s['options'].get(k, {}).get('value')
-            if e_v != v:
+            if e_v != d_v:
                 mod.setdefault('env-config', {}).update({k: e_v})
-                mod.setdefault('cfg-config', {}).update({k: v})
+                mod.setdefault('cfg-config', {}).update({k: d_v})
         if not charm or not charm.is_subordinate():
             if e_s['unit_count'] != d_s.get('num_units', 1):
                 mod['num_units'] = e_s['unit_count'] - d_s.get('num_units', 1)
@@ -146,6 +156,7 @@
 
     def do_diff(self):
         self.start_time = time.time()
+        self.deployment.fetch_charms()
         self.deployment.resolve()
         self.env.connect()
         self.env_status = self.env.status()

=== modified file 'deployer/env/mem.py'
--- deployer/env/mem.py	2014-04-21 22:49:05 +0000
+++ deployer/env/mem.py	2015-03-11 03:54:39 +0000
@@ -48,15 +48,52 @@
             raise EnvError("Invalid service name")
         return self._services[svc_name]
 
-    def add_relation(self, endpoint_a, endpoint_b):
-        """Add relations
-        """
+    def _remove_relation(self, s_from, r_from, s_to):
+        """Low level _remove_relation
+        """
+        rels = self._relations.get(s_from, {})
+        related_svcs = rels.get(r_from, [])
+        if s_to in related_svcs:
+            related_svcs.remove(s_to)
+
+    def remove_relation(self, src_ep, dst_ep):
+        """Remove relation, eps are "service_name:rel_name"
+        """
+        assert ":" in src_ep and ":" in dst_ep
+        (svc0, rel0, svc1, rel1) = src_ep.split(':') + dst_ep.split(':')
+        for (s_from, r_from, s_to) in ((svc0, rel0, svc1),
+                                       (svc1, rel1, svc0)):
+            self._remove_relation(s_from, r_from, s_to)
+
+    def _remove_service_relations(self, svc):
+        self._relations.pop(svc, None)
+        for _, rels in self._relations.items():
+            for _, dst_svcs in rels.items():
+                while svc in dst_svcs:
+                    dst_svcs.remove(svc)
+
+    def _add_relation(self, s_from, r_from, s_to):
+        """Low level _add_relation (only one-way)
+        """
+        src_rels = self._relations.setdefault(s_from, {})
+        src_rels.setdefault(r_from, [])
+        src_rels[r_from].append(s_to)
+
+    def add_relation(self, src_ep, dst_ep):
+        """Add relation, eps are "service_name:rel_name"
+        """
+        assert ":" in src_ep and ":" in dst_ep
+        (svc0, rel0, svc1, rel1) = src_ep.split(':') + dst_ep.split(':')
+        for (s_from, r_from, s_to) in ((svc0, rel0, svc1),
+                                       (svc1, rel1, svc0)):
+            self._add_relation(s_from, r_from, s_to)
 
     def destroy_service(self, svc_name):
         """ Destroy a service
         """
         if not svc_name in self._services:
             raise EnvError("Invalid service name")
+        self._remove_service_relations(svc_name)
         del self._services[svc_name]
 
     def close(self):
@@ -129,40 +166,78 @@
             self.set_config(svc_name, service.config)
             self.set_constraints(svc_name, service.constraints)
 
+    def _get_interfaces_namesets(self, svc, req_prov):
+        charm_rels = {}
+        try:
+            if req_prov:
+                charm_interfaces = self._deployment.get_charm_for(
+                    svc).get_requires()
+            else:
+                charm_interfaces = self._deployment.get_charm_for(
+                    svc).get_provides()
+        except KeyError:
+            return {}
+        for interfaces in charm_interfaces.values():
+            for interface in interfaces:
+                iface = interface.get('interface')
+                names = charm_rels.setdefault(iface, set())
+                names.add(interface.get('name'))
+        return charm_rels
+
     def _compile_relations(self):
         """ Compile a relation dictionary by svc_name, with
             their values structured for status() return
         """
         for rel in self._deployment.get_relations():
+            # src, dst are svcname[:if_name], e.g.:
+            # "rabbitmq" or "rabbitmq:amqp"
             for src, dst in (rel[0], rel[1]), (rel[1], rel[0]):
-                try:
-                    src_requires = self._deployment.get_charm_for(
-                        src).get_requires()
-                    dst_provides = self._deployment.get_charm_for(
-                        dst).get_provides()
-                except KeyError:
-                    continue
-                # Create dicts key-ed by:
-                #  { interface_type: (interface_name, svc_name)}
-                src_dict = {}
-                dst_dict = {}
-                # {rel_name: [{interface: name }...]}
-                for _, interfaces in src_requires.items():
-                    for interface in interfaces:
-                        src_dict[interface.get('interface')] = (
-                            interface.get('name'), src)
-                for _, interfaces in dst_provides.items():
-                    for interface in interfaces:
-                        dst_dict[interface.get('interface')] = (
-                            interface.get('name'), dst)
-                # Create juju env relation entries as:
-                # {svc_name: { interface_name: [ svc_name2, ...] }, ...}
-                for src_rel, (if_name, src_svc_name) in src_dict.items():
-                    if src_rel in dst_dict:
-                        src_rels = self._relations.setdefault(src_svc_name, {})
-                        src_rels.setdefault(if_name, [])
-                        dst_svc_name = dst_dict[src_rel][1]
-                        src_rels[if_name].append(dst_svc_name)
+                # hack to get src_ifname, dst_ifname set to ''
+                # if string doesn't have ':'
+                src_svc, src_ifname = (src + ':').split(':')[0:2]
+                dst_svc, dst_ifname = (dst + ':').split(':')[0:2]
+
+                # Get charm_rels dicts keyed by interface, value
+                # is a set with all possible if_names:
+                # src_charm_rels:
+                #   { "rabbitmq": set("amqp") }
+                # dst_charm_rels:
+                #   { "rabbitmq": set("amqp", "amqp-nova") }
+                src_charm_rels = self._get_interfaces_namesets(src_svc, 0)
+                dst_charm_rels = self._get_interfaces_namesets(dst_svc, 1)
+
+                # Join src_charm_rels, dst_charm_rels by their keys (interface)
+                for src_charm_if, src_charm_ifnames in src_charm_rels.items():
+                    dst_charm_ifnames = dst_charm_rels.get(src_charm_if)
+                    # if interface found in dst_charm_rels:
+                    if dst_charm_ifnames:
+                        # explicit svc_name:ifname, e.g.: "rabbitmq:amqp"
+                        if src_ifname:
+                            if not src_ifname in src_charm_ifnames:
+                                assert ('interface name {}'
+                                        'not found for service {}').format(
+                                            src_ifname, src_svc)
+                        else:
+                            src_ifnames = list(src_charm_ifnames)
+                            assert len(src_ifnames) == 1, (
+                                "{}<->{} relation needs explicit "
+                                "{}:NAME, with NAME from: {}".format(
+                                    src, dst, src_ifnames))
+                            src_ifname = src_ifnames[0]
+                        if dst_ifname:
+                            if not dst_ifname in dst_charm_ifnames:
+                                assert ('interface name {}'
+                                        'not found for service {}').format(
+                                            dst_ifname, dst_svc)
+                        else:
+                            dst_ifnames = list(dst_charm_ifnames)
+                            assert len(dst_ifnames) == 1, (
+                                "{}<->{} relation needs explicit "
+                                "{}:NAME, with NAME from: {}".format(
+                                    dst, src, dst_ifnames))
+                            dst_ifname = dst_ifnames[0]
+                        self._add_relation(src_svc, src_ifname, dst_svc)
+                        self._add_relation(dst_svc, dst_ifname, src_svc)
 
     def status(self):
         """ Return all services status """

=== modified file 'deployer/relation.py'
--- deployer/relation.py	2013-07-22 15:29:31 +0000
+++ deployer/relation.py	2015-03-11 03:54:39 +0000
@@ -11,6 +11,14 @@
         else:
             self.service = ep
 
+    def __eq__(self, ep):
+        # exactly equal by full endpoint (service:name), or
+        # equal only by service if name is "*" or unset
+        return ((self.ep == ep.ep)
+                or
+                ((not self.name or self.name == "*" or
+                  not ep.name or ep.name == "*")
+                 and self.service == ep.service))
 
 class EndpointPair(object):
     # Really simple endpoint service matching that does not work for multiple
@@ -23,14 +31,12 @@
     def __eq__(self, ep_pair):
         if not isinstance(ep_pair, EndpointPair):
             return False
-        return (ep_pair.ep_x.service in self
+        return (ep_pair.ep_x in self
                 and
-                ep_pair.ep_y.service in self)
+                ep_pair.ep_y in self)
 
-    def __contains__(self, svc_name):
-        return (svc_name == self.ep_x.service
-                or
-                svc_name == self.ep_y.service)
+    def __contains__(self, ep):
+        return (self.ep_x == ep or self.ep_y == ep)
 
     def __hash__(self):
         return hash(tuple(sorted(

=== added file 'deployer/tests/test_data/openstack/openstack-1501.yaml'
--- deployer/tests/test_data/openstack/openstack-1501.yaml	1970-01-01 00:00:00 +0000
+++ deployer/tests/test_data/openstack/openstack-1501.yaml	2015-03-11 03:54:39 +0000
@@ -0,0 +1,172 @@
+# based on https://api.jujucharms.com/v4/bundle/openstack-telemetry-30/archive/bundle.yaml
+openstack:
+    series: trusty
+    overrides:
+        openstack-origin: cloud:trusty-icehouse
+        source: cloud:trusty-updates/icehouse
+
+    services:
+      ceilometer:
+        charm: cs:trusty/ceilometer
+        num_units: 1
+      ceilometer-agent:
+        charm: cs:trusty/ceilometer-agent
+        num_units: 0
+      ceph:
+        charm: cs:trusty/ceph
+        num_units: 3
+        options:
+          fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+          monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+          osd-devices: /dev/sdb
+          osd-reformat: "yes"
+      ceph-osd:
+        charm: cs:trusty/ceph-osd
+        num_units: 1
+        options:
+          osd-devices: /dev/sdb
+          osd-reformat: "yes"
+      ceph-radosgw:
+        charm: cs:trusty/ceph-radosgw
+        num_units: 1
+        options:
+          use-embedded-webserver: true
+      cinder:
+        charm: cs:trusty/cinder
+        num_units: 1
+        options:
+          block-device: None
+          glance-api-version: 2
+      cinder-ceph:
+        charm: cs:trusty/cinder-ceph
+        num_units: 0
+      glance:
+        charm: cs:trusty/glance
+        num_units: 1
+      keystone:
+        charm: cs:trusty/keystone
+        num_units: 1
+        options:
+          admin-password: openstack
+      mongodb:
+        charm: cs:trusty/mongodb
+        num_units: 1
+      mysql:
+        charm: cs:trusty/mysql
+        num_units: 1
+        options:
+          max-connections: 20000
+      neutron-api:
+        charm: cs:trusty/neutron-api
+        num_units: 1
+        options:
+          neutron-security-groups: true
+      neutron-gateway:
+        charm: cs:trusty/quantum-gateway
+        num_units: 1
+        options:
+          ext-port: eth1
+      neutron-openvswitch:
+        charm: cs:trusty/neutron-openvswitch
+        num_units: 0
+      nova-cloud-controller:
+        charm: cs:trusty/nova-cloud-controller
+        num_units: 1
+        options:
+          network-manager: Neutron
+          quantum-security-groups: "yes"
+      nova-compute:
+        charm: cs:trusty/nova-compute
+        num_units: 3
+        options:
+          enable-live-migration: true
+          enable-resize: true
+          migration-auth-type: ssh
+      openstack-dashboard:
+        charm: cs:trusty/openstack-dashboard
+        num_units: 1
+      rabbitmq-server:
+        charm: cs:trusty/rabbitmq-server
+        num_units: 1
+    series: trusty
+    relations:
+    - - nova-compute:amqp
+      - rabbitmq-server:amqp
+    - - neutron-gateway:amqp
+      - rabbitmq-server:amqp
+    - - keystone:shared-db
+      - mysql:shared-db
+    - - nova-cloud-controller:identity-service
+      - keystone:identity-service
+    - - glance:identity-service
+      - keystone:identity-service
+    - - neutron-api:identity-service
+      - keystone:identity-service
+    - - neutron-openvswitch:neutron-plugin-api
+      - neutron-api:neutron-plugin-api
+    - - neutron-api:shared-db
+      - mysql:shared-db
+    - - neutron-api:amqp
+      - rabbitmq-server:amqp
+    - - neutron-gateway:neutron-plugin-api
+      - neutron-api:neutron-plugin-api
+    - - glance:shared-db
+      - mysql:shared-db
+    - - glance:amqp
+      - rabbitmq-server:amqp
+    - - nova-cloud-controller:image-service
+      - glance:image-service
+    - - nova-compute:image-service
+      - glance:image-service
+    - - nova-cloud-controller:cloud-compute
+      - nova-compute:cloud-compute
+    - - nova-cloud-controller:amqp
+      - rabbitmq-server:amqp
+    - - nova-cloud-controller:quantum-network-service
+      - neutron-gateway:quantum-network-service
+    - - nova-compute:neutron-plugin
+      - neutron-openvswitch:neutron-plugin
+    - - neutron-openvswitch:amqp
+      - rabbitmq-server:amqp
+    - - openstack-dashboard:identity-service
+      - keystone:identity-service
+    - - nova-cloud-controller:shared-db
+      - mysql:shared-db
+    - - nova-cloud-controller:neutron-api
+      - neutron-api:neutron-api
+    - - cinder:image-service
+      - glance:image-service
+    - - cinder:amqp
+      - rabbitmq-server:amqp
+    - - cinder:identity-service
+      - keystone:identity-service
+    - - cinder:cinder-volume-service
+      - nova-cloud-controller:cinder-volume-service
+    - - cinder-ceph:storage-backend
+      - cinder:storage-backend
+    - - ceph:client
+      - nova-compute:ceph
+    - - cinder:shared-db
+      - mysql:shared-db
+    - - ceph:client
+      - cinder-ceph:ceph
+    - - ceph:client
+      - glance:ceph
+    - - ceph-osd:mon
+      - ceph:osd
+    - - ceph-radosgw:mon
+      - ceph:radosgw
+    - - ceph-radosgw:identity-service
+      - keystone:identity-service
+    - - ceilometer:amqp
+      - rabbitmq-server:amqp
+    - - ceilometer-agent:ceilometer-service
+      - ceilometer:ceilometer-service
+    - - ceilometer:identity-service
+      - keystone:identity-service
+    - - ceilometer:identity-notifications
+      - keystone:identity-notifications
+    - - ceilometer-agent:nova-ceilometer
+      - nova-compute:nova-ceilometer
+    - - ceilometer:shared-db
+      - mongodb:database

=== modified file 'deployer/tests/test_diff.py'
--- deployer/tests/test_diff.py	2014-01-23 12:40:57 +0000
+++ deployer/tests/test_diff.py	2015-03-11 03:54:39 +0000
@@ -5,6 +5,8 @@
 import unittest
 import shutil
 import tempfile
+import yaml
+from deployer.tests.mock import patch, mock_open
 from deployer.env.mem import MemoryEnvironment
 from deployer.config import ConfigStack
 from deployer.utils import setup_logging
@@ -27,9 +29,11 @@
     def setUpClass(cls):
         deployment = ConfigStack(
             [os.path.join(
-                cls.test_data_dir, "blog.yaml")]).get('wordpress-prod')
+                cls.test_data_dir,
+                "openstack",
+                "openstack-1501.yaml")]).get('openstack')
         cls._dir = tempfile.mkdtemp()
-        os.mkdir(os.path.join(cls._dir, "precise"))
+        os.mkdir(os.path.join(cls._dir, "trusty"))
         deployment.repo_path = cls._dir
         deployment.fetch_charms()
         deployment.resolve()
@@ -40,6 +44,12 @@
         shutil.rmtree(cls._dir)
 
     @classmethod
+    def get_dir(cls):
+        """ Return temp working dir
+        """
+        return cls._dir
+
+    @classmethod
     def get_deployment(cls):
         """ Return saved deployment at class initialization
         """
@@ -56,54 +66,140 @@
         # Removing 1 unit must show -1 'num_units'
         dpl = self.get_deployment()
         env = MemoryEnvironment(dpl.name, dpl)
-        env.remove_unit(env.status()['services']['haproxy']['units'][0])
+        env.remove_unit(env.status()['services']['nova-compute']['units'][0])
         diff = Diff(env, dpl, {}).do_diff()
         self.assertEqual(
-            diff['services']['modified']['haproxy']['num_units'], -1)
+            diff['services']['modified']['nova-compute']['num_units'], -1)
         # re-adding a unit -> nil diff
-        env.add_units('haproxy', 1)
+        env.add_units('nova-compute', 1)
         diff = Diff(env, dpl, {}).do_diff()
         self.assertEqual(diff, {})
 
     def test_diff_config(self):
         dpl = self.get_deployment()
         env = MemoryEnvironment(dpl.name, dpl)
-        env.set_config('blog', {'tuning': 'bare'})
+        env.set_config('keystone', {'admin-password': 'NOTAPASS'})
         diff = Diff(env, dpl, {}).do_diff()
-        mod_blog = diff['services']['modified']['blog']
-        self.assertTrue(mod_blog['env-config']['tuning'] !=
-                        mod_blog['cfg-config']['tuning'])
-        self.assertEquals(mod_blog['env-config']['tuning'], 'bare')
+        mod_svc = diff['services']['modified']['keystone']
+        self.assertTrue(mod_svc['env-config']['admin-password'] !=
+                        mod_svc['cfg-config']['admin-password'])
+        self.assertEquals(mod_svc['env-config']['admin-password'],
+                          'NOTAPASS')
 
     def test_diff_config_many(self):
         dpl = self.get_deployment()
         env = MemoryEnvironment(dpl.name, dpl)
-        env.set_config('blog', {'tuning': 'bare', 'engine': 'duck'})
+        env.set_config('keystone', {'admin-password': 'NOTAPASS',
+                                    'admin-token': 'NOTATOKEN'})
         diff = Diff(env, dpl, {}).do_diff()
-        mod_blog = diff['services']['modified']['blog']
+        mod_svc = diff['services']['modified']['keystone']
         self.assertEqual(
-            set(mod_blog['env-config'].keys()),
-            set(['tuning', 'engine']))
-        self.assertTrue(mod_blog['env-config']['tuning'] !=
-                        mod_blog['cfg-config']['tuning'])
-        self.assertTrue(mod_blog['env-config']['engine'] !=
-                        mod_blog['cfg-config']['engine'])
+            set(mod_svc['env-config'].keys()),
+            set(['admin-password', 'admin-token']))
+        self.assertTrue(mod_svc['env-config']['admin-password'] !=
+                        mod_svc['cfg-config']['admin-password'])
+        self.assertTrue(mod_svc['env-config']['admin-token'] !=
+                        mod_svc['cfg-config']['admin-token'])
 
     def test_diff_constraints(self):
         dpl = self.get_deployment()
         env = MemoryEnvironment(dpl.name, dpl)
-        env.set_constraints('haproxy', 'foo=bar')
-        diff = Diff(env, dpl, {}).do_diff()
-        mod_haproxy = diff['services']['modified']['haproxy']
-        self.assertTrue(
-            mod_haproxy['env-constraints'] != mod_haproxy['cfg-constraints'])
-        self.assertEqual(mod_haproxy['env-constraints'], {'foo': 'bar'})
-
-    def test_diff_service_destroy(self):
-        dpl = self.get_deployment()
-        env = MemoryEnvironment(dpl.name, dpl)
-        env.destroy_service('haproxy')
-        diff = Diff(env, dpl, {}).do_diff()
-        self.assertTrue(str(diff['relations']['missing'][0]).find('haproxy')
-                        != -1)
-        self.assertTrue(diff['services']['missing'].keys() == ['haproxy'])
+        env.set_constraints('nova-compute', 'foo=bar')
+        diff = Diff(env, dpl, {}).do_diff()
+        mod_svc = diff['services']['modified']['nova-compute']
+        self.assertTrue(
+            mod_svc['env-constraints'] != mod_svc['cfg-constraints'])
+        self.assertEqual(mod_svc['env-constraints'], {'foo': 'bar'})
+
+    def test_diff_env_remove_relation(self):
+        dpl = self.get_deployment()
+        env = MemoryEnvironment(dpl.name, dpl)
+        env.remove_relation('cinder:amqp', 'rabbitmq-server:amqp')
+        diff = Diff(env, dpl, {}).do_diff()
+        self.assertEqual(str(diff['relations']['missing']),
+                         '[cinder:amqp <-> rabbitmq-server:amqp]')
+
+    def test_diff_env_service_destroy(self):
+        dpl = self.get_deployment()
+        env = MemoryEnvironment(dpl.name, dpl)
+        env.destroy_service('nova-compute')
+        diff = Diff(env, dpl, {}).do_diff()
+        self.assertTrue(
+            str(diff['relations']['missing'][0]).find('nova-compute') != -1)
+        self.assertTrue(diff['services']['missing'].keys() == ['nova-compute'])
+
+    def test_diff_cfg_remove_relation(self):
+        dpl = self.get_deployment()
+        # need a tmp file to sneak and save deployment YAML
+        edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
+        dpl.save(edited_config_file)
+        # in memory edit yaml content
+        edited_config = yaml.load(open(edited_config_file))
+        edited_config["relations"].remove(
+            ['nova-compute:amqp', 'rabbitmq-server:amqp'])
+        edited_config = yaml.dump({'openstack': edited_config})
+
+        # mock open to inyect edited_config YAML to ConfigStack
+        with patch('deployer.config.open', mock_open(read_data=edited_config),
+                   create=True):
+            edited_dpl = ConfigStack("mocked").get('openstack')
+
+        edited_dpl.repo_path = self.get_dir()
+        edited_dpl.fetch_charms()
+        edited_dpl.resolve()
+        env = MemoryEnvironment(dpl.name, dpl)
+        diff = Diff(env, edited_dpl, {}).do_diff()
+        self.assertTrue(
+            diff['relations']['unknown'],
+            '[nova-compute:amqp <-> rabbitmq-server:amqp]')
+
+    def test_diff_cfg_remove_ambiguous_relation(self):
+        dpl = self.get_deployment()
+        # need a tmp file to sneak and save deployment YAML
+        edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
+        dpl.save(edited_config_file)
+        # in memory edit yaml content
+        edited_config = yaml.load(open(edited_config_file))
+        edited_config["relations"].remove(
+            ['ceilometer:identity-service', 'keystone:identity-service'])
+        edited_config = yaml.dump({'openstack': edited_config})
+
+        # mock open to inyect edited_config YAML to ConfigStack
+        with patch('deployer.config.open', mock_open(read_data=edited_config),
+                   create=True):
+            edited_dpl = ConfigStack("mocked").get('openstack')
+
+        edited_dpl.repo_path = self.get_dir()
+        edited_dpl.fetch_charms()
+        edited_dpl.resolve()
+        env = MemoryEnvironment(dpl.name, dpl)
+        diff = Diff(env, edited_dpl, {}).do_diff()
+        # verify ceilometer<->keystone present in unknown relations
+        self.assertTrue('ceilometer' in str(diff['relations']['unknown'])
+                        and
+                        'keystone' in str(diff['relations']['unknown']))
+
+    def test_diff_cfg_replace_with_unnamed_relations(self):
+        dpl = self.get_deployment()
+        # need a tmp file to sneak and save deployment YAML
+        edited_config_file = os.path.join(self.get_dir(), 'saved.yaml')
+        dpl.save(edited_config_file)
+        # in memory edit yaml content
+        edited_config = yaml.load(open(edited_config_file))
+        # remove ':name' from service endpoint specification
+        for relation in edited_config["relations"]:
+            relation = [(relation[0] + ":").split(":")[0],
+                        (relation[1] + ":").split(":")[0]]
+        edited_config = yaml.dump({'openstack': edited_config})
+
+        # mock open to inyect edited_config YAML to ConfigStack
+        with patch('deployer.config.open', mock_open(read_data=edited_config),
+                   create=True):
+            edited_dpl = ConfigStack("mocked").get('openstack')
+
+        edited_dpl.repo_path = self.get_dir()
+        edited_dpl.fetch_charms()
+        edited_dpl.resolve()
+        env = MemoryEnvironment(dpl.name, dpl)
+        diff = Diff(env, edited_dpl, {}).do_diff()
+        self.assertEqual(diff, {})

=== modified file 'setup.cfg'
--- setup.cfg	2013-05-16 03:21:04 +0000
+++ setup.cfg	2015-03-11 03:54:39 +0000
@@ -1,7 +1,10 @@
 [build_sphinx]
 source-dir = doc/
-build-dir  = doc/_build
-all_files  = 1
+build-dir = doc/_build
+all_files = 1
 
 [upload_sphinx]
-upload-dir = doc/_build/html
\ No newline at end of file
+upload-dir = doc/_build/html
+
+[easy_install]
+