Merge lp:~ack/charms/trusty/glance/fix-pause-resume-tests into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Alberto Donato]

This syncs charmhelpers to bring in the fixes for pause/resume, and fixes related charm tests.

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

charm_lint_check #10900 glance-next for ack mp272582
    LINT OK: passed

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

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

charm_unit_test #10117 glance-next for ack mp272582
    UNIT OK: passed

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

[Corey Bryant (corey.bryant)]

Looks good, thanks. Just waiting on amulet results to post.

review: Approve

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

charm_amulet_test #6869 glance-next for ack mp272582
    AMULET OK: passed

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

[lp:~ack/charms/trusty/glance/fix-pause-resume-tests]

145. By Alberto Donato on 2015-09-30

Re-sync'd charmhelpers and merged from next.

=== modified file 'charmhelpers/contrib/openstack/amulet/utils.py'
--- charmhelpers/contrib/openstack/amulet/utils.py	2015-09-25 14:35:40 +0000
+++ charmhelpers/contrib/openstack/amulet/utils.py	2015-09-30 15:01:27 +0000
@@ -752,7 +752,7 @@
             self.log.debug('SSL is enabled  @{}:{} '
                            '({})'.format(host, port, unit_name))
             return True
-        elif not port and not conf_ssl:
+        elif not conf_ssl:
             self.log.debug('SSL not enabled @{}:{} '
                            '({})'.format(host, port, unit_name))
             return False

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-09-29 15:49:04 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-09-30 15:01:27 +0000
@@ -1364,7 +1364,7 @@
             normalized.update({port: port for port in resolved
                                if port in ports})
             if resolved:
-                return {bridge: normalized[port] for port, bridge in
+                return {normalized[port]: bridge for port, bridge in
                         six.iteritems(portmap) if port in normalized.keys()}
 
         return None
@@ -1375,8 +1375,8 @@
     def __call__(self):
         ctxt = {}
         mappings = super(PhyNICMTUContext, self).__call__()
-        if mappings and mappings.values():
-            ports = mappings.values()
+        if mappings and mappings.keys():
+            ports = sorted(mappings.keys())
             napi_settings = NeutronAPIContext()()
             mtu = napi_settings.get('network_device_mtu')
             all_ports = set()

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2015-09-03 09:41:01 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2015-09-30 15:01:27 +0000
@@ -310,10 +310,10 @@
 def parse_data_port_mappings(mappings, default_bridge='br-data'):
     """Parse data port mappings.
 
-    Mappings must be a space-delimited list of port:bridge mappings.
+    Mappings must be a space-delimited list of bridge:port.
 
-    Returns dict of the form {port:bridge} where port may be an mac address or
-    interface name.
+    Returns dict of the form {port:bridge} where ports may be mac addresses or
+    interface names.
     """
 
     # NOTE(dosaboy): we use rvalue for key to allow multiple values to be

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-09-14 14:12:33 +0000
+++ tests/basic_deployment.py	2015-09-30 15:01:27 +0000
@@ -47,16 +47,6 @@
             {self.glance_sentry: self.SERVICES},
             expect_success=should_run)
 
-    def get_service_overrides(self, unit):
-        """
-        Return a dict mapping service names to a boolean indicating whether
-        an override file exists for that service.
-        """
-        init_contents = unit.directory_contents("/etc/init/")
-        return {
-            service: "{}.override".format(service) in init_contents["files"]
-            for service in self.SERVICES}
-
     def _add_services(self):
         """Add services
 
@@ -571,11 +561,7 @@
         assert u.wait_on_action(action_id), "Pause action failed."
 
         self._assert_services(should_run=False)
-        assert all(self.get_service_overrides(unit).itervalues()), \
-            "Not all override files were created."
 
         action_id = u.run_action(unit, "resume")
         assert u.wait_on_action(action_id), "Resume action failed"
-        assert not any(self.get_service_overrides(unit).itervalues()), \
-            "Not all override files were removed."
         self._assert_services(should_run=True)

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/utils.py'
--- tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-09-10 09:30:59 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/utils.py	2015-09-30 15:01:27 +0000
@@ -752,7 +752,7 @@
             self.log.debug('SSL is enabled  @{}:{} '
                            '({})'.format(host, port, unit_name))
             return True
-        elif not port and not conf_ssl:
+        elif not conf_ssl:
             self.log.debug('SSL not enabled @{}:{} '
                            '({})'.format(host, port, unit_name))
             return False