Merge lp:~james-page/charm-helpers/swift-dev-support into lp:charm-helpers

[James Page]

Add support for fallback matching on major.minor version for Swift

This allows trunk package builds to be used with the charms.

[Liam Young (gnuoy)]

LGTM

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2016-05-25 13:04:34 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-05-27 09:07:16 +0000
@@ -279,6 +279,7 @@
 def get_swift_codename(version):
     '''Determine OpenStack codename that corresponds to swift version.'''
     codenames = [k for k, v in six.iteritems(SWIFT_CODENAMES) if version in v]
+
     if len(codenames) > 1:
         # If more than one release codename contains this version we determine
         # the actual codename based on the highest available install source.
@@ -290,6 +291,16 @@
                 return codename
     elif len(codenames) == 1:
         return codenames[0]
+
+    # NOTE: fallback - attempt to match with just major.minor version
+    match = re.match('^(\d+)\.(\d+)', version)
+    if match:
+        major_minor_version = match.group(0)
+        for codename, versions in six.iteritems(SWIFT_CODENAMES):
+            for release_version in versions:
+                if release_version.startswith(major_minor_version):
+                    return codename
+
     return None
 
 

=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2016-03-08 12:28:33 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2016-05-27 09:07:16 +0000
@@ -71,6 +71,11 @@
         'os_release': 'havana',
         'os_version': '1.10.0'
     },
+    'swift-mitaka-dev': {
+        'pkg_vers': '2.7.1.dev8.201605111703.trusty-0ubuntu1',
+        'os_release': 'mitaka',
+        'os_version': '2.7.0'
+    },
     # a package thats available in the cache but is not installed
     'cinder-common': {
         'os_release': 'havana',