Merge lp:~1chb1n/charms/trusty/neutron-openvswitch/next-amulet-mitaka-1601 into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[Ryan Beisner]

Enable mitaka/liberty amulet tests; Update test deployment topology to satisfy workload status; wait for unit status instead of sleeping before amulet tests.

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

charm_lint_check #17457 neutron-openvswitch-next for 1chb1n mp282838
    LINT OK: passed

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

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

charm_unit_test #16308 neutron-openvswitch-next for 1chb1n mp282838
    UNIT OK: passed

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

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

charm_amulet_test #8821 neutron-openvswitch-next for 1chb1n mp282838
    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/14515233/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8821/

[lp:~1chb1n/charms/trusty/neutron-openvswitch/next-amulet-mitaka-1601]

105. By Ryan Beisner on 2016-01-18

fix dict definition typo

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

charm_unit_test #16423 neutron-openvswitch-next for 1chb1n mp282838
    UNIT OK: passed

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

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

charm_lint_check #17578 neutron-openvswitch-next for 1chb1n mp282838
    LINT OK: passed

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

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

charm_amulet_test #8884 neutron-openvswitch-next for 1chb1n mp282838
    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/14572886/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8884/

[lp:~1chb1n/charms/trusty/neutron-openvswitch/next-amulet-mitaka-1601]

106. By Ryan Beisner on 2016-01-20

rebase

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

charm_unit_test #16617 neutron-openvswitch-next for 1chb1n mp282838
    UNIT OK: passed

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

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

charm_lint_check #17783 neutron-openvswitch-next for 1chb1n mp282838
    LINT OK: passed

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

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

charm_lint_check #17788 neutron-openvswitch-next for 1chb1n mp282838
    LINT OK: passed

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

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

charm_unit_test #16624 neutron-openvswitch-next for 1chb1n mp282838
    UNIT OK: passed

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

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

charm_amulet_test #8914 neutron-openvswitch-next for 1chb1n mp282838
    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/14584923/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8914/

[lp:~1chb1n/charms/trusty/neutron-openvswitch/next-amulet-mitaka-1601]

107. By Ryan Beisner on 2016-01-20

update amulet tests for systemd-based releases

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

charm_lint_check #17796 neutron-openvswitch-next for 1chb1n mp282838
    LINT OK: passed

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

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

charm_unit_test #16632 neutron-openvswitch-next for 1chb1n mp282838
    UNIT OK: passed

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

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

charm_amulet_test #8928 neutron-openvswitch-next for 1chb1n mp282838
    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/14588851/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8928/

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

charm_amulet_test #8933 neutron-openvswitch-next for 1chb1n mp282838
    AMULET OK: passed

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

[David Ames (thedac)]

"I'll allow it". In the interest of test coverage I am going to merge this but I have a couple of caveats in line for future reference.

review: Approve

=== modified file 'tests/018-basic-trusty-liberty' (properties changed: -x to +x)
=== modified file 'tests/019-basic-trusty-mitaka' (properties changed: -x to +x)
=== modified file 'tests/020-basic-wily-liberty' (properties changed: -x to +x)
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-13 16:07:30 +0000
+++ tests/basic_deployment.py	2016-01-20 20:56:46 +0000
@@ -9,6 +9,8 @@
     OpenStackAmuletDeployment
 )
 
+# This file needs de-linted.  The (mis)use of n-o q-a below causes all lint 
+# to go undetected.  Remove that & fixme.
 from charmhelpers.contrib.openstack.amulet.utils import (
     OpenStackAmuletUtils,
     DEBUG, # flake8: noqa
@@ -36,6 +38,11 @@
         self._add_relations()
         self._configure_services()
         self._deploy()
+
+        u.log.info('Waiting on extended status checks...')
+        exclude_services = ['mysql']
+        self._auto_wait_for_status(exclude_services=exclude_services)
+
         self._initialize_tests()
 
     def _add_services(self):
@@ -45,9 +52,14 @@
            and the rest of the service are from lp branches that are
            compatible with the local charm (e.g. stable or next).
            """
+        # Services and relations which are present merely to satisfy required_interfaces
+        # and workload status are not inspected.  Fix me.  Inspect those too.
         this_service = {'name': 'neutron-openvswitch'}
         other_services = [{'name': 'nova-compute'},
                           {'name': 'rabbitmq-server'},
+                          {'name': 'keystone'},  # satisfy workload stat
+                          {'name': 'mysql'},  # satisfy workload stat
+                          {'name': 'glance'},  # satisfy workload stat
                           {'name': 'neutron-api'}]
         super(NeutronOVSBasicDeployment, self)._add_services(this_service,
                                                              other_services)
@@ -55,11 +67,21 @@
     def _add_relations(self):
         """Add all of the relations for the services."""
         relations = {
-            'neutron-openvswitch:amqp': 'rabbitmq-server:amqp',
+            'neutron-openvswitch:amqp': 'rabbitmq-server:amqp',  
             'neutron-openvswitch:neutron-plugin':
             'nova-compute:neutron-plugin',
             'neutron-openvswitch:neutron-plugin-api':
             'neutron-api:neutron-plugin-api',
+            # Satisfy workload stat:
+            'neutron-api:identity-service': 'keystone:identity-service',
+            'neutron-api:shared-db': 'mysql:shared-db',
+            'neutron-api:amqp': 'rabbitmq-server:amqp',
+            'nova-compute:amqp': 'rabbitmq-server:amqp',
+            'nova-compute:image-service': 'glance:image-service',
+            'glance:identity-service': 'keystone:identity-service',
+            'glance:shared-db': 'mysql:shared-db',
+            'glance:amqp': 'rabbitmq-server:amqp',
+            'keystone:shared-db': 'mysql:shared-db',
         }
         super(NeutronOVSBasicDeployment, self)._add_relations(relations)
 
@@ -124,22 +146,26 @@
         self.compute_sentry = self.d.sentry.unit['nova-compute/0']
         self.rabbitmq_sentry = self.d.sentry.unit['rabbitmq-server/0']
         self.neutron_api_sentry = self.d.sentry.unit['neutron-api/0']
+        self.n_ovs_sentry = self.d.sentry.unit['neutron-openvswitch/0']
 
-    def test_services(self):
+    def test_100_services(self):
         """Verify the expected services are running on the corresponding
            service units."""
+        u.log.debug('Checking system services on units...')
 
-        commands = {
-            self.compute_sentry: ['status nova-compute',
-                                  'status neutron-plugin-openvswitch-agent'],
-            self.rabbitmq_sentry: ['service rabbitmq-server status'],
-            self.neutron_api_sentry: ['status neutron-server'],
+        services = {
+            self.compute_sentry: ['nova-compute',
+                                  'neutron-plugin-openvswitch-agent'],
+            self.rabbitmq_sentry: ['rabbitmq-server'],
+            self.neutron_api_sentry: ['neutron-server'],
         }
 
-        ret = u.validate_services(commands)
+        ret = u.validate_services_by_name(services)
         if ret:
             amulet.raise_status(amulet.FAIL, msg=ret)
 
+        u.log.debug('OK')
+
     def test_rabbitmq_amqp_relation(self):
         """Verify data in rabbitmq-server/neutron-openvswitch amqp relation"""
         unit = self.rabbitmq_sentry
@@ -189,6 +215,8 @@
     def check_ml2_setting_propagation(self, service, charm_key,
                                       config_file_key, vpair,
                                       section):
+
+        # Needs love - test actions not clear in log
         unit = self.compute_sentry
         conf = "/etc/neutron/plugins/ml2/ml2_conf.ini"
         for value in vpair:
@@ -202,6 +230,8 @@
 
     def test_l2pop_propagation(self):
         """Verify that neutron-api l2pop setting propagates to neutron-ovs"""
+
+        # Needs love - not idempotent
         self.check_ml2_setting_propagation('neutron-api',
                                            'l2-population',
                                            'l2_population',
@@ -210,6 +240,8 @@
 
     def test_nettype_propagation(self):
         """Verify that neutron-api nettype setting propagates to neutron-ovs"""
+
+        # Needs love - not idempotent
         self.check_ml2_setting_propagation('neutron-api',
                                            'overlay-network-type',
                                            'tunnel_types',
@@ -218,6 +250,8 @@
 
     def test_secgroup_propagation_local_override(self):
         """Verify disable-security-groups overrides what neutron-api says"""
+
+        # Needs love - not idempotent
         unit = self.compute_sentry
         conf = "/etc/neutron/plugins/ml2/ml2_conf.ini"
         self.d.configure('neutron-api', {'neutron-security-groups': 'True'})
@@ -237,20 +271,37 @@
                                      {'enable_security_group': 'True'})
 
     def test_z_restart_on_config_change(self):
-        """Verify that the specified services are restarted when the config
-           is changed.
-
-           Note(coreycb): The method name with the _z_ is a little odd
-           but it forces the test to run last.  It just makes things
-           easier because restarting services requires re-authorization.
-           """
-        conf = '/etc/neutron/neutron.conf'
-        self.d.configure('neutron-openvswitch', {'use-syslog': 'True'})
-        if not u.service_restarted(self.compute_sentry,
-                                   'neutron-openvswitch-agent', conf,
-                                   pgrep_full=True, sleep_time=60):
-            self.d.configure('neutron-openvswitch', {'use-syslog': 'False'})
-            msg = ('service neutron-openvswitch-agent did not restart after '
-                   'config change')
-            amulet.raise_status(amulet.FAIL, msg=msg)
-        self.d.configure('neutron-openvswitch', {'use-syslog': 'False'})
+        """Verify that the specified services are restarted when the
+        config is changed."""
+
+        sentry = self.n_ovs_sentry
+        juju_service = 'neutron-openvswitch'
+
+        # Expected default and alternate values
+        set_default = {'debug': 'False'}
+        set_alternate = {'debug': 'True'}
+
+        # Services which are expected to restart upon config change,
+        # and corresponding config files affected by the change
+        conf_file = '/etc/neutron/neutron.conf'
+        services = {
+            'neutron-openvswitch-agent': conf_file
+        }
+
+        # Make config change, check for svc restart, conf file mod time change
+        u.log.debug('Making config change on {}...'.format(juju_service))
+        mtime = u.get_sentry_time(sentry)
+        self.d.configure(juju_service, set_alternate)
+
+        sleep_time = 60
+        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,
+                                                     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)
+
+        self.d.configure(juju_service, set_default)
+        u.log.debug('OK')