Merge lp:~thedac/charms/trusty/neutron-api/status into lp:~openstack-charmers-archive/charms/trusty/neutron-api/next

[David Ames]

Add workload status settings

Based on Liam Young's original work add workload status settings to the neutron-api charm as a proof of concept.

The plan is to move context_status, set_context_status and incomplete_contexts to charmhelpers.

Looking for feedback before proceeding.

[David Ames (thedac)]

Status functions moved to charm helpers

Please also see
https://code.launchpad.net/~thedac/charm-helpers/openstack-workload-status/+merge/264353

[lp:~thedac/charms/trusty/neutron-api/status]

118. By David Ames on 2015-07-10

More status sets for install process

119. By David Ames on 2015-07-10

Use functools wraps

120. By David Ames on 2015-07-10

With @wraps in the decorator can now apply context_status to *_joined functions

121. By David Ames on 2015-07-13

Set status when waiting on a particular variable in a given context
Compound the status messages keeping the highest priority workload state

[David Ames (thedac)]

charmhelpers.contrib.openstack.context.context_complete now sets a waiting state when missing specific data. It uses status_compound which takes in the current status and a new state and message and "adds" them together keeping the most severe workload state and concatenating the messages.

It is important to note that in practice these statuses are ephemeral as the context_status decorator comes around and runs set_context_status which is a bit more of a hammer. This is necessary to make sure we set a known state rather than just the last set state wins.

I am very much open to ideas to get us further granularity into set_context_status. set_context_status relies on charmhelpers.contrib.openstack.templ
ates.OSConfigRenderer.complete_contexts which ultimately runs the __call__() function of the context object. We may be able to expand this somehow.

[lp:~thedac/charms/trusty/neutron-api/status]

122. By David Ames on 2015-07-14

Updates to status_set

[James Page (james-page)]

review: Needs Fixing

[lp:~thedac/charms/trusty/neutron-api/status]

123. By David Ames on 2015-07-17

Set workload state waiting or blocked

124. By David Ames on 2015-07-17

Let the decorator set the status

125. By David Ames on 2015-07-17

Fix unit tests for new related(interface) check

Unmerged revisions

125. By David Ames on 2015-07-17

Fix unit tests for new related(interface) check

124. By David Ames on 2015-07-17

Let the decorator set the status

123. By David Ames on 2015-07-17

Set workload state waiting or blocked

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-07-16 20:17:53 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-07-17 22:28:29 +0000
@@ -37,6 +37,8 @@
     relation_ids,
     related_units,
     relation_set,
+    status_compound,
+    status_get,
     unit_get,
     unit_private_ip,
     charm_name,
@@ -101,11 +103,17 @@
 
 def context_complete(ctxt):
     _missing = []
+    # keys are set by default even before the relation completes them
+    # i.e. rabbitmq-password: None
+    # so if they are None or '' they are missing from the relation
     for k, v in six.iteritems(ctxt):
         if v is None or v == '':
             _missing.append(k)
 
     if _missing:
+        status_compound(status_get(include_data=True), 'waiting',
+                                   'Missing required data: %s' % 
+                                   ' '.join(_missing))
         log('Missing required data: %s' % ' '.join(_missing), level=INFO)
         return False
 

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2015-07-16 20:17:53 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-07-17 22:28:29 +0000
@@ -40,7 +40,8 @@
     charm_dir,
     INFO,
     relation_ids,
-    relation_set
+    relation_set,
+    status_set
 )
 
 from charmhelpers.contrib.storage.linux.lvm import (
@@ -704,3 +705,84 @@
         return projects[key]
 
     return None
+
+
+def context_status(configs, required_interfaces):
+    """
+    Decorator to set workload status based on complete contexts
+    after contexts have been acted on
+    """
+    def wrap(f):
+        @wraps(f)
+        def wrapped_f(*args, **kwargs):
+            # Run the original function first
+            f(*args, **kwargs)
+            # Set workload status now that contexts have been
+            # acted on
+            set_context_status(configs, required_interfaces)
+        return wrapped_f
+    return wrap
+
+
+def set_context_status(configs, required_interfaces):
+    """
+    Set workload status based on complete contexts
+    Left outside of the decorator, context_status,
+    to allow manual use
+    """
+    incomplete_ctxts = incomplete_contexts(configs, required_interfaces)
+    state = 'active'
+    message = ''
+    for context in incomplete_ctxts:
+        related_interface = None
+        for interface in required_interfaces[context]:
+            if related(interface):
+                related_interface = interface
+        if not related_interface:
+            message += "{} context is missing and must be related for " \
+                       "functionality. ".format(context)
+            state = 'blocked'
+        else:
+            message += "{} context's interface, {}, has joined but has not " \
+                       "yet provided the required data on the relation. " \
+                       "".format(context, related_interface)
+            if state != 'blocked':
+                state = 'waiting'
+
+    if state == 'active':
+        message = "All required contexts are present and complete"
+
+    status_set(state, message)
+
+
+def incomplete_contexts(configs, required_interfaces):
+    """
+    Check complete contexts against required_interfaces
+    Return list of incomplete contexts
+
+    configs is an OSConfigRenderer object with configs registered
+
+    required_interfaces is a dictionary of required general interfaces
+    with list values of possible specific interfaces.
+    The interface is said to be satisfied if anyone of the interfaces in the
+    list has a complete context.
+    Example:
+    required_interfaces = {'database': ['shared-db', 'pgsql-db']}
+    """
+    complete_ctxts = configs.complete_contexts()
+    incomplete_contexts = []
+    for svc_type in required_interfaces.keys():
+        found_ctxt = False
+        for interface in required_interfaces[svc_type]:
+            if interface in complete_ctxts:
+                found_ctxt = True
+        if not found_ctxt:
+            incomplete_contexts.append(svc_type)
+    return incomplete_contexts
+
+
+def related(interface):
+    if relation_ids(interface):
+        return True
+    else:
+        return False

=== modified file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	2015-07-16 20:17:53 +0000
+++ hooks/charmhelpers/core/hookenv.py	2015-07-17 22:28:29 +0000
@@ -660,35 +660,103 @@
         )
     cmd = ['status-set', workload_state, message]
     try:
-        ret = subprocess.call(cmd)
-        if ret == 0:
+        subprocess.call(cmd)
+    except OSError as e:
+        if e.errno == errno.ENOENT:
+            log_message = 'status-set failed: {} {}'.format(workload_state,
+                                                            message)
+            log(log_message, level='INFO')
             return
-    except OSError as e:
-        if e.errno != errno.ENOENT:
+        else:
             raise
-    log_message = 'status-set failed: {} {}'.format(workload_state,
-                                                    message)
-    log(log_message, level='INFO')
-
-
-def status_get():
-    """Retrieve the previously set juju workload state
+    # Log the status change
+    if workload_state == 'blocked' or workload_state == 'waiting':
+        lvl = 'WARN'
+    else:
+        lvl = 'INFO'
+    log('{}: {}'.format(workload_state, message), lvl)
+
+
+def status_get(include_data=True, service=False):
+    """Retrieve the previously set juju workload state and return as a
+    dictionary.
+
+    If service is set return status for all units of this service if this unit
+    is the leader
 
     If the status-set command is not found then assume this is juju < 1.23 and
     return 'unknown'
     """
-    cmd = ['status-get']
+    cmd = ['status-get', '--format', 'json']
+    if include_data:
+        cmd.append('--include-data')
+    if service:
+        cmd.append('--service')
     try:
-        raw_status = subprocess.check_output(cmd, universal_newlines=True)
-        status = raw_status.rstrip()
-        return status
+        return json.loads(subprocess.check_output(cmd,
+                                                  universal_newlines=True))
     except OSError as e:
         if e.errno == errno.ENOENT:
-            return 'unknown'
+            return {'status': 'unknown'}
         else:
             raise
 
 
+def status_compound(current_status, workload_state, message):
+    """Compound statuses: Take the current status as a dictionary
+    and new workload state and message then status_set with the highest
+    severity workload state and a compound message
+    Example:
+      status_compound(status_get(include-data=True),
+                      'waiting',
+                      'waiting on relations data')
+    """
+    hierarchy = {'unknown': -1,
+                 'active': 0,
+                 'maintenance': 1,
+                 'waiting': 2,
+                 'blocked': 3,
+                 }
+    current_workload_state = current_status.get('status')
+    current_message = current_status.get('message')
+
+    # Do not set unknown or other invalid state
+    if hierarchy.get(workload_state) is None:
+        return {}
+    elif hierarchy.get(workload_state) < 0:
+        return {}
+    if hierarchy.get(current_workload_state) is None:
+        current_workload_state = 'unknown'
+        current_message = None
+    elif hierarchy.get(current_workload_state) < 0:
+        current_message = None
+
+    # New state of 'active' overrides all others
+    if workload_state == 'active':
+        hierarchy['active'] = 10
+        current_message = None
+
+    # Set workload_state based on hierarchy of statuses
+    if hierarchy.get(current_workload_state) > hierarchy.get(workload_state):
+        workload_state = current_workload_state
+    else:
+        if current_workload_state == 'active':
+            current_message = None
+
+    # Compound the message
+    if current_message and message:
+        message = message + "; " + current_message
+    elif current_message and not message:
+        message = current_message
+
+    # Set new status
+    if workload_state:
+        status_set(workload_state, message)
+
+    # Return new status
+    return {'status': workload_state, 'message': message}
+
+
 def translate_exc(from_exc, to_exc):
     def inner_translate_exc1(f):
         def inner_translate_exc2(*args, **kwargs):

=== modified file 'hooks/neutron_api_hooks.py'
--- hooks/neutron_api_hooks.py	2015-04-23 08:49:03 +0000
+++ hooks/neutron_api_hooks.py	2015-07-17 22:28:29 +0000
@@ -17,6 +17,7 @@
     relation_get,
     relation_ids,
     relation_set,
+    status_set,
     open_port,
     unit_get,
 )
@@ -36,6 +37,7 @@
 from charmhelpers.contrib.openstack.utils import (
     config_value_changed,
     configure_installation_source,
+    context_status,
     git_install_requested,
     openstack_upgrade_available,
     os_requires_version,
@@ -46,6 +48,7 @@
 from neutron_api_utils import (
     CLUSTER_RES,
     NEUTRON_CONF,
+    REQUIRED_INTERFACES,
     api_port,
     determine_packages,
     determine_ports,
@@ -140,14 +143,18 @@
 
 
 @hooks.hook()
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 def install():
+    status_set('maintenance', 'Executing pre-install')
     execd_preinstall()
     configure_installation_source(config('openstack-origin'))
 
+    status_set('maintenance', 'Installing apt packages')
     apt_update()
     apt_install(determine_packages(config('openstack-origin')),
                 fatal=True)
 
+    status_set('maintenance', 'Git install')
     git_install(config('openstack-origin-git'))
 
     [open_port(port) for port in determine_ports()]
@@ -155,6 +162,7 @@
 
 @hooks.hook('upgrade-charm')
 @hooks.hook('config-changed')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 @restart_on_change(restart_map(), stopstart=True)
 def config_changed():
     # If neutron is ready to be queried then check for incompatability between
@@ -163,14 +171,16 @@
         if l3ha_router_present() and not get_l3ha():
             e = ('Cannot disable Router HA while ha enabled routers exist.'
                  ' Please remove any ha routers')
-            log(e, level=ERROR)
+            status_set('blocked', e)
             raise Exception(e)
         if dvr_router_present() and not get_dvr():
             e = ('Cannot disable dvr while dvr enabled routers exist. Please'
                  ' remove any distributed routers')
             log(e, level=ERROR)
+            status_set('blocked', e)
             raise Exception(e)
     if config('prefer-ipv6'):
+        status_set('maintenance', 'configuring ipv6')
         setup_ipv6()
         sync_db_with_multi_ipv6_addresses(config('database'),
                                           config('database-user'))
@@ -178,11 +188,14 @@
     global CONFIGS
     if git_install_requested():
         if config_value_changed('openstack-origin-git'):
+            status_set('maintenance', 'Running Git install')
             git_install(config('openstack-origin-git'))
     else:
         if openstack_upgrade_available('neutron-server'):
+            status_set('maintenance', 'Running openstack upgrade')
             do_openstack_upgrade(CONFIGS)
 
+    status_set('maintenance', 'Installing apt packages')
     apt_install(filter_installed_packages(
                 determine_packages(config('openstack-origin'))),
                 fatal=True)
@@ -203,6 +216,7 @@
 
 
 @hooks.hook('amqp-relation-joined')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 def amqp_joined(relation_id=None):
     relation_set(relation_id=relation_id,
                  username=config('rabbit-user'), vhost=config('rabbit-vhost'))
@@ -210,6 +224,7 @@
 
 @hooks.hook('amqp-relation-changed')
 @hooks.hook('amqp-relation-departed')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 @restart_on_change(restart_map())
 def amqp_changed():
     if 'amqp' not in CONFIGS.complete_contexts():
@@ -219,6 +234,7 @@
 
 
 @hooks.hook('shared-db-relation-joined')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 def db_joined():
     if is_relation_made('pgsql-db'):
         # error, postgresql is used
@@ -238,6 +254,7 @@
 
 
 @hooks.hook('pgsql-db-relation-joined')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 def pgsql_neutron_db_joined():
     if is_relation_made('shared-db'):
         # raise error
@@ -250,6 +267,7 @@
 
 
 @hooks.hook('shared-db-relation-changed')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 @restart_on_change(restart_map())
 def db_changed():
     if 'shared-db' not in CONFIGS.complete_contexts():
@@ -260,6 +278,7 @@
 
 
 @hooks.hook('pgsql-db-relation-changed')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 @restart_on_change(restart_map())
 def postgresql_neutron_db_changed():
     CONFIGS.write(NEUTRON_CONF)
@@ -270,11 +289,13 @@
             'identity-service-relation-broken',
             'shared-db-relation-broken',
             'pgsql-db-relation-broken')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 def relation_broken():
     CONFIGS.write_all()
 
 
 @hooks.hook('identity-service-relation-joined')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 def identity_joined(rid=None, relation_trigger=False):
     public_url = '{}:{}'.format(canonical_url(CONFIGS, PUBLIC),
                                 api_port('neutron-server'))
@@ -296,6 +317,7 @@
 
 
 @hooks.hook('identity-service-relation-changed')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 @restart_on_change(restart_map())
 def identity_changed():
     if 'identity-service' not in CONFIGS.complete_contexts():
@@ -472,6 +494,7 @@
 
 
 @hooks.hook('zeromq-configuration-relation-joined')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 @os_requires_version('kilo', 'neutron-server')
 def zeromq_configuration_relation_joined(relid=None):
     relation_set(relation_id=relid,
@@ -480,6 +503,7 @@
 
 
 @hooks.hook('zeromq-configuration-relation-changed')
+@context_status(CONFIGS, REQUIRED_INTERFACES)
 @restart_on_change(restart_map(), stopstart=True)
 def zeromq_configuration_relation_changed():
     CONFIGS.write_all()

=== modified file 'hooks/neutron_api_utils.py'
--- hooks/neutron_api_utils.py	2015-07-13 19:07:37 +0000
+++ hooks/neutron_api_utils.py	2015-07-17 22:28:29 +0000
@@ -155,6 +155,14 @@
     }),
 ])
 
+# The interface is said to be satisfied if anyone of the interfaces in the
+# list has a complete context.
+REQUIRED_INTERFACES = {
+    'database': ['shared-db', 'pgsql-db'],
+    'message': ['amqp', 'zeromq-configuration'],
+    'identity': ['identity-service'],
+}
+
 
 def api_port(service):
     return API_PORTS[service]

=== modified file 'unit_tests/test_neutron_api_hooks.py'
--- unit_tests/test_neutron_api_hooks.py	2015-06-04 23:28:14 +0000
+++ unit_tests/test_neutron_api_hooks.py	2015-07-17 22:28:29 +0000
@@ -96,8 +96,9 @@
         hooks.hooks.execute([
             'hooks/{}'.format(hookname)])
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch.object(utils, 'git_install_requested')
-    def test_install_hook(self, git_requested):
+    def test_install_hook(self, git_requested, related):
         git_requested.return_value = False
         _pkgs = ['foo', 'bar']
         _ports = [80, 81, 82]
@@ -115,8 +116,9 @@
         self.open_port.assert_has_calls(_port_calls)
         self.assertTrue(self.execd_preinstall.called)
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch.object(utils, 'git_install_requested')
-    def test_install_hook_git(self, git_requested):
+    def test_install_hook_git(self, git_requested, related):
         git_requested.return_value = True
         _pkgs = ['foo', 'bar']
         _ports = [80, 81, 82]
@@ -148,9 +150,10 @@
         self.git_install.assert_called_with(projects_yaml)
         self.open_port.assert_has_calls(_port_calls)
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch.object(hooks, 'configure_https')
     @patch.object(hooks, 'git_install_requested')
-    def test_config_changed(self, git_requested, conf_https):
+    def test_config_changed(self, git_requested, conf_https, related):
         git_requested.return_value = False
         self.neutron_ready.return_value = True
         self.openstack_upgrade_available.return_value = True
@@ -196,11 +199,12 @@
                          'Cannot disable Router HA while ha enabled routers'
                          ' exist. Please remove any ha routers')
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch.object(hooks, 'configure_https')
     @patch.object(hooks, 'git_install_requested')
     @patch.object(hooks, 'config_value_changed')
     def test_config_changed_git(self, config_val_changed, git_requested,
-                                configure_https):
+                                configure_https, related):
         git_requested.return_value = True
         self.neutron_ready.return_value = True
         self.dvr_router_present.return_value = False
@@ -243,7 +247,8 @@
         self.assertTrue(_zmq_joined.called)
         self.assertTrue(_id_cluster_joined.called)
 
-    def test_amqp_joined(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_amqp_joined(self, related):
         self._call_hook('amqp-relation-joined')
         self.relation_set.assert_called_with(
             username='neutron',
@@ -251,16 +256,19 @@
             relation_id=None
         )
 
-    def test_amqp_changed(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_amqp_changed(self, related):
         self.CONFIGS.complete_contexts.return_value = ['amqp']
         self._call_hook('amqp-relation-changed')
         self.assertTrue(self.CONFIGS.write.called_with(NEUTRON_CONF))
 
-    def test_amqp_departed(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_amqp_departed(self, related):
         self._call_hook('amqp-relation-departed')
         self.assertTrue(self.CONFIGS.write.called_with(NEUTRON_CONF))
 
-    def test_db_joined(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_db_joined(self, related):
         self.is_relation_made.return_value = False
         self.unit_get.return_value = 'myhostname'
         self._call_hook('shared-db-relation-joined')
@@ -270,7 +278,8 @@
             hostname='myhostname',
         )
 
-    def test_db_joined_with_postgresql(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_db_joined_with_postgresql(self, related):
         self.is_relation_made.return_value = True
 
         with self.assertRaises(Exception) as context:
@@ -279,7 +288,8 @@
                          'Attempting to associate a mysql database when there '
                          'is already associated a postgresql one')
 
-    def test_postgresql_db_joined(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_postgresql_db_joined(self, related):
         self.unit_get.return_value = 'myhostname'
         self.is_relation_made.return_value = False
         self._call_hook('pgsql-db-relation-joined')
@@ -287,7 +297,8 @@
             database='neutron',
         )
 
-    def test_postgresql_joined_with_db(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_postgresql_joined_with_db(self, related):
         self.is_relation_made.return_value = True
 
         with self.assertRaises(Exception) as context:
@@ -296,30 +307,35 @@
                          'Attempting to associate a postgresql database when'
                          ' there is already associated a mysql one')
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch.object(hooks, 'conditional_neutron_migration')
-    def test_shared_db_changed(self, cond_neutron_mig):
+    def test_shared_db_changed(self, cond_neutron_mig, related):
         self.CONFIGS.complete_contexts.return_value = ['shared-db']
         self._call_hook('shared-db-relation-changed')
         self.assertTrue(self.CONFIGS.write_all.called)
         cond_neutron_mig.assert_called_with()
 
-    def test_shared_db_changed_partial_ctxt(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_shared_db_changed_partial_ctxt(self, related):
         self.CONFIGS.complete_contexts.return_value = []
         self._call_hook('shared-db-relation-changed')
         self.assertFalse(self.CONFIGS.write_all.called)
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch.object(hooks, 'conditional_neutron_migration')
-    def test_pgsql_db_changed(self, cond_neutron_mig):
+    def test_pgsql_db_changed(self, cond_neutron_mig, related):
         self._call_hook('pgsql-db-relation-changed')
         self.assertTrue(self.CONFIGS.write.called)
         cond_neutron_mig.assert_called_with()
 
-    def test_amqp_broken(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=False)
+    def test_amqp_broken(self, related):
         self._call_hook('amqp-relation-broken')
         self.assertTrue(self.CONFIGS.write_all.called)
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch.object(hooks, 'canonical_url')
-    def test_identity_joined(self, _canonical_url):
+    def test_identity_joined(self, _canonical_url, related):
         _canonical_url.return_value = 'http://127.0.0.1'
         self.api_port.return_value = '9696'
         self.test_config.set('region', 'region1')
@@ -337,13 +353,14 @@
             relation_settings=_endpoints
         )
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch('charmhelpers.contrib.openstack.ip.service_name',
            lambda *args: 'neutron-api')
     @patch('charmhelpers.contrib.openstack.ip.unit_get')
     @patch('charmhelpers.contrib.openstack.ip.is_clustered')
     @patch('charmhelpers.contrib.openstack.ip.config')
     def test_identity_changed_public_name(self, _config, _is_clustered,
-                                          _unit_get):
+                                          _unit_get, related):
         _unit_get.return_value = '127.0.0.1'
         _is_clustered.return_value = False
         _config.side_effect = self.test_config.get
@@ -365,15 +382,17 @@
             relation_settings=_endpoints
         )
 
-    def test_identity_changed_partial_ctxt(self):
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
+    def test_identity_changed_partial_ctxt(self, related):
         self.CONFIGS.complete_contexts.return_value = []
         _api_rel_joined = self.patch('neutron_api_relation_joined')
         self.relation_ids.side_effect = self._fake_relids
         self._call_hook('identity-service-relation-changed')
         self.assertFalse(_api_rel_joined.called)
 
+    @patch('charmhelpers.contrib.openstack.utils.related', return_value=True)
     @patch.object(hooks, 'configure_https')
-    def test_identity_changed(self, conf_https):
+    def test_identity_changed(self, conf_https, related):
         self.CONFIGS.complete_contexts.return_value = ['identity-service']
         _api_rel_joined = self.patch('neutron_api_relation_joined')
         self.relation_ids.side_effect = self._fake_relids