Merge lp:~james-page/charm-helpers/fixup-detection into lp:charm-helpers

[James Page]

Fixup two issues:

1) make regex for >= liberty greedy, matching multiple digits for versions, and update associated tests to ensure that this is exercised.

2) fixup non fatal detection scenario for older version matching code.

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2015-08-28 09:08:41 +0000
+++ charmhelpers/contrib/openstack/utils.py	2015-09-03 08:43:18 +0000
@@ -227,7 +227,7 @@
         error_out(e)
 
     vers = apt.upstream_version(pkg.current_ver.ver_str)
-    match = re.match('^(\d)\.(\d)\.(\d)', vers)
+    match = re.match('^(\d+)\.(\d+)\.(\d+)', vers)
     if match:
         vers = match.group(0)
 
@@ -248,6 +248,8 @@
                 vers = vers[:6]
                 return OPENSTACK_CODENAMES[vers]
         except KeyError:
+            if not fatal:
+                return None
             e = 'Could not determine OpenStack codename for version %s' % vers
             error_out(e)
 

=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2015-08-28 09:08:41 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2015-09-03 08:43:18 +0000
@@ -36,7 +36,7 @@
         'os_release': 'liberty',
         'os_version': '2015.2'
     },
-    'nova-common': {
+    'nova': {
         'pkg_vers': '2012.2.3-0ubuntu2.1',
         'os_release': 'folsom',
         'os_version': '2012.2'