Merge lp:~adam-collard/charm-helpers/openstack-upgrade-available-swift-stable into lp:~openstack-charmers/charm-helpers/stable-1604

[Adam Collard]

Backport r436 to stable.

See https://code.launchpad.net/~adam-collard/charm-helpers/openstack-upgrade-available-swift/+merge/269481 for trunk MP.

"Special case swift packages for version comparison purposes in openstack_upgrade_available.

Without this change, the swift charms will think that OpenStack upgrades are constantly available because the code ended up comparing numbers from two different version schemes and it turns out that '2014.1' > '1.13.1'"

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2015-08-10 16:39:41 +0000
+++ charmhelpers/contrib/openstack/utils.py	2015-09-03 10:16:26 +0000
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-
 # Copyright 2014-2015 Canonical Limited.
 #
 # This file is part of charm-helpers.
@@ -167,9 +165,9 @@
         error_out(e)
 
 
-def get_os_version_codename(codename):
+def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES):
     '''Determine OpenStack version number from codename.'''
-    for k, v in six.iteritems(OPENSTACK_CODENAMES):
+    for k, v in six.iteritems(version_map):
         if v == codename:
             return k
     e = 'Could not derive OpenStack version for '\
@@ -392,7 +390,11 @@
     import apt_pkg as apt
     src = config('openstack-origin')
     cur_vers = get_os_version_package(package)
-    available_vers = get_os_version_install_source(src)
+    if "swift" in package:
+        codename = get_os_codename_install_source(src)
+        available_vers = get_os_version_codename(codename, SWIFT_CODENAMES)
+    else:
+        available_vers = get_os_version_install_source(src)
     apt.init()
     return apt.version_compare(available_vers, cur_vers) == 1
 
 
=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2015-08-10 16:39:41 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2015-09-03 10:16:26 +0000
@@ -504,6 +504,8 @@
         # milestone to major release detection
         vers_pkg.return_value = '2013.2~b1'
         self.assertTrue(openstack.openstack_upgrade_available('nova-common'))
+        vers_pkg.return_value = '1.9.0'
+        self.assertTrue(openstack.openstack_upgrade_available('swift-proxy'))
 
     @patch.object(openstack, 'lsb_release')
     @patch.object(openstack, 'get_os_version_package')
@@ -517,6 +519,10 @@
         # milestone to majro release detection
         vers_pkg.return_value = '2013.1~b1'
         self.assertFalse(openstack.openstack_upgrade_available('nova-common'))
+        # ugly duckling testing
+        config.return_value = 'cloud:precise-havana'
+        vers_pkg.return_value = '1.10.0'
+        self.assertFalse(openstack.openstack_upgrade_available('swift-proxy'))
 
     @patch.object(openstack, 'is_block_device')
     @patch.object(openstack, 'error_out')