Merge lp:~james-page/charm-helpers/lp1531102 into lp:charm-helpers

[James Page]

Update >= liberty version detection to deal with patch release, tidy swift version code and fixup unit tests.

[Liam Young (gnuoy)]

approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2015-12-14 14:32:10 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-01-05 09:22:01 +0000
@@ -131,40 +131,40 @@
 # >= Liberty version->codename mapping
 PACKAGE_CODENAMES = {
     'nova-common': OrderedDict([
-        ('12.0.0', 'liberty'),
-        ('13.0.0', 'mitaka'),
+        ('12.0', 'liberty'),
+        ('13.0', 'mitaka'),
     ]),
     'neutron-common': OrderedDict([
-        ('7.0.0', 'liberty'),
-        ('8.0.0', 'mitaka'),
+        ('7.0', 'liberty'),
+        ('8.0', 'mitaka'),
     ]),
     'cinder-common': OrderedDict([
-        ('7.0.0', 'liberty'),
-        ('8.0.0', 'mitaka'),
+        ('7.0', 'liberty'),
+        ('8.0', 'mitaka'),
     ]),
     'keystone': OrderedDict([
-        ('8.0.0', 'liberty'),
-        ('9.0.0', 'mitaka'),
+        ('8.0', 'liberty'),
+        ('9.0', 'mitaka'),
     ]),
     'horizon-common': OrderedDict([
-        ('8.0.0', 'liberty'),
-        ('9.0.0', 'mitaka'),
+        ('8.0', 'liberty'),
+        ('9.0', 'mitaka'),
     ]),
     'ceilometer-common': OrderedDict([
-        ('5.0.0', 'liberty'),
-        ('6.0.0', 'mitaka'),
+        ('5.0', 'liberty'),
+        ('6.0', 'mitaka'),
     ]),
     'heat-common': OrderedDict([
-        ('5.0.0', 'liberty'),
-        ('6.0.0', 'mitaka'),
+        ('5.0', 'liberty'),
+        ('6.0', 'mitaka'),
     ]),
     'glance-common': OrderedDict([
-        ('11.0.0', 'liberty'),
-        ('12.0.0', 'mitaka'),
+        ('11.0', 'liberty'),
+        ('12.0', 'mitaka'),
     ]),
     'openstack-dashboard': OrderedDict([
-        ('8.0.0', 'liberty'),
-        ('9.0.0', 'mitaka'),
+        ('8.0', 'liberty'),
+        ('9.0', 'mitaka'),
     ]),
 }
 
@@ -251,7 +251,14 @@
         error_out(e)
 
     vers = apt.upstream_version(pkg.current_ver.ver_str)
-    match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
+    if 'swift' in pkg.name:
+        # Fully x.y.z match for swift versions
+        match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
+    else:
+        # x.y match only for 20XX.X
+        # and ignore patch level for other packages
+        match = re.match('^(\d+)\.(\d+)', vers)
+
     if match:
         vers = match.group(0)
 
@@ -263,13 +270,8 @@
         # < Liberty co-ordinated project versions
         try:
             if 'swift' in pkg.name:
-                swift_vers = vers[:5]
-                if swift_vers not in SWIFT_CODENAMES:
-                    # Deal with 1.10.0 upward
-                    swift_vers = vers[:6]
-                return SWIFT_CODENAMES[swift_vers]
+                return SWIFT_CODENAMES[vers]
             else:
-                vers = vers[:6]
                 return OPENSTACK_CODENAMES[vers]
         except KeyError:
             if not fatal:
 
=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2015-12-14 14:32:10 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2016-01-05 09:22:01 +0000
@@ -26,11 +26,13 @@
 }
 
 FAKE_REPO = {
+    # liberty patch release
     'neutron-common': {
-        'pkg_vers': '2:7.0.0-0ubuntu1',
+        'pkg_vers': '2:7.0.1-0ubuntu1',
         'os_release': 'liberty',
         'os_version': '2015.2'
     },
+    # liberty release version
     'nova-common': {
         'pkg_vers': '2:12.0.0~b1-0ubuntu1',
         'os_release': 'liberty',
@@ -51,17 +53,18 @@
         'os_release': 'grizzly',
         'os_version': '2013.1'
     },
-    'swift-proxy': {
-        'pkg_vers': '1.7.7-0ubuntu1',
+    # Exercise swift version detection
+    'swift-storage': {
+        'pkg_vers': '1.8.0-0ubuntu1',
         'os_release': 'grizzly',
-        'os_version': '1.7.7'
-    },
-    'swift-proxy': {
-        'pkg_vers': '1.9.0-0ubuntu1',
-        'os_release': 'havana',
-        'os_version': '1.9.0'
-    },
-    'swift-proxy': {
+        'os_version': '1.8.0'
+    },
+    'swift-proxy': {
+        'pkg_vers': '1.13.1-0ubuntu1',
+        'os_release': 'icehouse',
+        'os_version': '1.13.1'
+    },
+    'swift-common': {
         'pkg_vers': '1.10.0~rc1-0ubuntu1',
         'os_release': 'havana',
         'os_version': '1.10.0'