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

[David Ames]

Workgroup status

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11430 neutron-gateway-next for thedac mp273623
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11430/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10621 neutron-gateway-next for thedac mp273623
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10621/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7172 neutron-gateway-next for thedac mp273623
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12701310/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7172/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7180 neutron-gateway-next for thedac mp273623
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7180/

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

151. By David Ames on 2015-10-07

Run set_os_workload_status after every hook

152. By David Ames on 2015-10-07

Register SharedDBContext

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11492 neutron-gateway-next for thedac mp273623
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11492/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10686 neutron-gateway-next for thedac mp273623
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10686/

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

153. By David Ames on 2015-10-07

Run even on unknown hook

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10691 neutron-gateway-next for thedac mp273623
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10691/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11501 neutron-gateway-next for thedac mp273623
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11501/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7194 neutron-gateway-next for thedac mp273623
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7194/

[James Page (james-page)]

A few comments; a database connection is not required for newer openstack versions (this was required for pre-icehouse versions).

neutron-plugin-api is really required and is mapped by the NeutronAPIContext class.

review: Needs Fixing

[David Ames (thedac)]

Ok, I'll make these changes.

See my comments about the SharedDBContext inline and let me know the right way to proceed.

[James Page (james-page)]

Lets just drop all the stuff related to shared-db or pgsql - its basically a no-op for any supported version of OpenStack that we have.

We should probably drop code and relations associated with that - but not in this proposed.

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

154. By David Ames on 2015-10-08

Remove database relations. Make neutron-api-plugin required

155. By David Ames on 2015-10-08

Allow teardown of the status_set patch by using with statements for patches

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11545 neutron-gateway-next for thedac mp273623
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11545/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10737 neutron-gateway-next for thedac mp273623
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10737/

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

156. By David Ames on 2015-10-08

Register NeutronAPIContext

[David Ames (thedac)]

Let me know if this is the right approach for NeutronAPIContext. Does it need to be registered elsewhere?

review: Resubmit

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11548 neutron-gateway-next for thedac mp273623
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11548/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10740 neutron-gateway-next for thedac mp273623
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10740/

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

157. By David Ames on 2015-10-08

NeutronGatewayContext inherits NeutronAPIContext

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11549 neutron-gateway-next for thedac mp273623
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/11549/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #10741 neutron-gateway-next for thedac mp273623
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/10741/

[James Page (james-page)]

LGTM but I'd like an amulet +1 before landing.

review: Approve

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7246 neutron-gateway-next for thedac mp273623
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/12719692/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7246/

=== modified file 'hooks/neutron_contexts.py'
--- hooks/neutron_contexts.py	2015-07-15 08:08:26 +0000
+++ hooks/neutron_contexts.py	2015-10-08 20:32:14 +0000
@@ -121,10 +121,10 @@
         return ctxt
 
 
-class NeutronGatewayContext(OSContextGenerator):
+class NeutronGatewayContext(NeutronAPIContext):
 
     def __call__(self):
-        api_settings = NeutronAPIContext()()
+        api_settings = super(NeutronGatewayContext, self).__call__()
         ctxt = {
             'shared_secret': get_shared_secret(),
             'local_ip':

=== modified file 'hooks/neutron_hooks.py'
--- hooks/neutron_hooks.py	2015-09-24 16:22:09 +0000
+++ hooks/neutron_hooks.py	2015-10-08 20:32:14 +0000
@@ -10,7 +10,9 @@
     relation_set,
     relation_ids,
     unit_get,
-    Hooks, UnregisteredHookError
+    Hooks,
+    UnregisteredHookError,
+    status_set,
 )
 from charmhelpers.fetch import (
     apt_update,
@@ -34,6 +36,7 @@
     configure_installation_source,
     openstack_upgrade_available,
     os_requires_version,
+    set_os_workload_status,
 )
 from charmhelpers.payload.execd import execd_preinstall
 from charmhelpers.core.sysctl import create as create_sysctl
@@ -64,6 +67,8 @@
     reassign_agent_resources,
     stop_neutron_ha_monitor_daemon,
     use_l3ha,
+    REQUIRED_INTERFACES,
+    check_optional_relations,
 )
 
 hooks = Hooks()
@@ -72,12 +77,14 @@
 
 @hooks.hook('install.real')
 def install():
+    status_set('maintenance', 'Executing pre-install')
     execd_preinstall()
     src = config('openstack-origin')
     if (lsb_release()['DISTRIB_CODENAME'] == 'precise' and
             src == 'distro'):
         src = 'cloud:precise-folsom'
     configure_installation_source(src)
+    status_set('maintenance', 'Installing apt packages')
     apt_update(fatal=True)
     apt_install('python-six', fatal=True)  # Force upgrade
     if valid_plugin():
@@ -85,9 +92,12 @@
                     fatal=True)
         apt_install(filter_installed_packages(get_packages()),
                     fatal=True)
+        status_set('maintenance', 'Git install')
         git_install(config('openstack-origin-git'))
     else:
-        log('Please provide a valid plugin config', level=ERROR)
+        message = 'Please provide a valid plugin config'
+        log(message, level=ERROR)
+        status_set('blocked', message)
         sys.exit(1)
 
     # Legacy HA for Icehouse
@@ -100,10 +110,13 @@
     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'))
             CONFIGS.write_all()
+
     elif not config('action-managed-upgrade'):
         if openstack_upgrade_available(get_common_package()):
+            status_set('maintenance', 'Running openstack upgrade')
             do_openstack_upgrade(CONFIGS)
 
     update_nrpe_config()
@@ -127,11 +140,14 @@
         CONFIGS.write_all()
         configure_ovs()
     else:
-        log('Please provide a valid plugin config', level=ERROR)
+        message = 'Please provide a valid plugin config'
+        log(message, level=ERROR)
+        status_set('blocked', message)
         sys.exit(1)
     if config('plugin') == 'n1kv':
         if not git_install_requested():
             if config('enable-l3-agent'):
+                status_set('maintenance', 'Installing apt packages')
                 apt_install(filter_installed_packages('neutron-l3-agent'))
             else:
                 apt_purge('neutron-l3-agent')
@@ -342,3 +358,5 @@
         hooks.execute(sys.argv)
     except UnregisteredHookError as e:
         log('Unknown hook {} - skipping.'.format(e))
+    set_os_workload_status(CONFIGS, REQUIRED_INTERFACES,
+                           charm_func=check_optional_relations)

=== modified file 'hooks/neutron_utils.py'
--- hooks/neutron_utils.py	2015-09-28 11:18:48 +0000
+++ hooks/neutron_utils.py	2015-10-08 20:32:14 +0000
@@ -23,6 +23,8 @@
     relations_of_type,
     unit_private_ip,
     is_relation_made,
+    relation_ids,
+    status_get,
 )
 from charmhelpers.core.templating import render
 from charmhelpers.fetch import (
@@ -35,6 +37,9 @@
     add_bridge_port,
     full_restart
 )
+from charmhelpers.contrib.hahelpers.cluster import (
+    get_hacluster_config,
+)
 from charmhelpers.contrib.openstack.utils import (
     configure_installation_source,
     get_os_codename_install_source,
@@ -43,7 +48,8 @@
     git_clone_and_install,
     git_src_dir,
     git_pip_venv_dir,
-    get_hostname
+    get_hostname,
+    set_os_workload_status,
 )
 
 from charmhelpers.contrib.openstack.neutron import (
@@ -230,6 +236,13 @@
     'quantum-plugin-openvswitch-agent',
 ]
 
+# The interface is said to be satisfied if anyone of the interfaces in the
+# list has a complete context.
+REQUIRED_INTERFACES = {
+    'messaging': ['amqp', 'zeromq-configuration'],
+    'neutron-plugin-api': ['neutron-plugin-api'],
+}
+
 
 def get_early_packages():
     '''Return a list of package for pre-install based on configured plugin'''
@@ -1236,3 +1249,21 @@
     render('git/upstart/neutron-agent.upstart',
            '/etc/init/neutron-vpn-agent.conf',
            neutron_vpn_agent_context, perms=0o644)
+
+
+def check_optional_relations(configs):
+    required_interfaces = {}
+    if relation_ids('ha'):
+        required_interfaces['ha'] = ['cluster']
+        try:
+            get_hacluster_config()
+        except:
+            return ('blocked',
+                    'hacluster missing configuration: '
+                    'vip, vip_iface, vip_cidr')
+
+    if required_interfaces:
+        set_os_workload_status(configs, required_interfaces)
+        return status_get()
+    else:
+        return 'unknown', 'No optional relations'

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-09-22 14:37:56 +0000
+++ tests/basic_deployment.py	2015-10-08 20:32:14 +0000
@@ -14,7 +14,7 @@
 from charmhelpers.contrib.openstack.amulet.utils import (
     OpenStackAmuletUtils,
     DEBUG,
-    #ERROR
+    # ERROR
 )
 
 # Use DEBUG to turn on debug logging
@@ -936,7 +936,7 @@
         self.neutron.format = 'json'
         net_name = 'ext_net'
 
-        #Verify that the network doesn't exist
+        # Verify that the network doesn't exist
         networks = self.neutron.list_networks(name=net_name)
         net_count = len(networks['networks'])
         if net_count != 0:
@@ -958,7 +958,7 @@
         if network['name'] != net_name:
             amulet.raise_status(amulet.FAIL, msg="network ext_net not found")
 
-        #Cleanup
+        # Cleanup
         u.log.debug('Deleting neutron network...')
         self.neutron.delete_network(network['id'])
 
@@ -992,18 +992,16 @@
         mtime = u.get_sentry_time(sentry)
         self.d.configure(juju_service, set_alternate)
 
-#        sleep_time = 90
+        # sleep_time = 90
         for s, conf_file in services.iteritems():
             u.log.debug("Checking that service restarted: {}".format(s))
             if not u.validate_service_config_changed(sentry, mtime, s,
                                                      conf_file):
-#                                                     conf_file,
-#                                                     sleep_time=sleep_time):
                 self.d.configure(juju_service, set_default)
                 msg = "service {} didn't restart after config change".format(s)
                 amulet.raise_status(amulet.FAIL, msg=msg)
 
             # Only do initial sleep on first service check
-#            sleep_time = 0
+            # sleep_time = 0
 
         self.d.configure(juju_service, set_default)

=== modified file 'unit_tests/test_actions_git_reinstall.py'
--- unit_tests/test_actions_git_reinstall.py	2015-05-07 09:27:07 +0000
+++ unit_tests/test_actions_git_reinstall.py	2015-10-08 20:32:14 +0000
@@ -4,6 +4,10 @@
     config.return_value = 'neutron'
     import neutron_utils as utils  # noqa
 
+from test_utils import (
+    CharmTestCase
+)
+
 # Need to do some early patching to get the module loaded.
 _register_configs = utils.register_configs
 _restart_map = utils.restart_map
@@ -11,16 +15,13 @@
 utils.register_configs = MagicMock()
 utils.restart_map = MagicMock()
 
-import git_reinstall
+with patch('charmhelpers.core.hookenv.status_set'):
+    import git_reinstall
 
 # Unpatch it now that its loaded.
 utils.register_configs = _register_configs
 utils.restart_map = _restart_map
 
-from test_utils import (
-    CharmTestCase
-)
-
 TO_PATCH = [
     'config',
 ]

=== modified file 'unit_tests/test_actions_openstack_upgrade.py'
--- unit_tests/test_actions_openstack_upgrade.py	2015-09-23 14:40:07 +0000
+++ unit_tests/test_actions_openstack_upgrade.py	2015-10-08 20:32:14 +0000
@@ -1,15 +1,16 @@
 from mock import patch
 import os
 
-os.environ['JUJU_UNIT_NAME'] = 'neutron-gateway'
-
-with patch('neutron_utils.register_configs') as register_configs:
-    import openstack_upgrade
-
 from test_utils import (
     CharmTestCase
 )
 
+os.environ['JUJU_UNIT_NAME'] = 'neutron-gateway'
+
+with patch('charmhelpers.core.hookenv.status_set'):
+    with patch('neutron_utils.register_configs') as register_configs:
+        import openstack_upgrade
+
 TO_PATCH = [
     'do_openstack_upgrade',
     'config_changed',

=== modified file 'unit_tests/test_neutron_hooks.py'
--- unit_tests/test_neutron_hooks.py	2015-09-10 12:35:59 +0000
+++ unit_tests/test_neutron_hooks.py	2015-10-08 20:32:14 +0000
@@ -7,7 +7,10 @@
 _restart_map = utils.restart_map
 utils.register_configs = MagicMock()
 utils.restart_map = MagicMock()
-import neutron_hooks as hooks
+
+with patch('charmhelpers.core.hookenv.status_set'):
+    import neutron_hooks as hooks
+
 utils.register_configs = _register_configs
 utils.restart_map = _restart_map