Merge lp:~hopem/charm-helpers/fix-network-vlan-ranges-parser into lp:charm-helpers

[Edward Hope-Morley]

[Liam Young (gnuoy)]

Approve

review: Approve

[Liam Young (gnuoy)]

Actually I'm hitting a unit test failure for py3.

FAIL: test_parse_data_port_mappings (tests.contrib.openstack.test_neutron_utils.NeutronTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/liam/branches/prove-it-to-ed/charm-helpers/tests/contrib/openstack/test_neutron_utils.py", line 187, in test_parse_data_port_mappings
    self.assertEqual(ret, {'br0': 'eth0'})
AssertionError: {'eth0': ''} != {'br0': 'eth0'}
- {'eth0': ''}
+ {'br0': 'eth0'}

Seems to be caused by {'key': ''}.values() != [''] in py3

[Liam Young (gnuoy)]

review: Needs Fixing

[lp:~hopem/charm-helpers/fix-network-vlan-ranges-parser]

370. By Edward Hope-Morley on 2015-05-20

fix py3 compat

371. By Edward Hope-Morley on 2015-05-20

sync trunk

[Edward Hope-Morley (hopem)]

Fixed

Unmerged revisions

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2015-04-13 07:40:54 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2015-05-20 19:41:56 +0000
@@ -256,11 +256,14 @@
 def parse_mappings(mappings):
     parsed = {}
     if mappings:
-        mappings = mappings.split(' ')
+        mappings = mappings.split()
         for m in mappings:
             p = m.partition(':')
-            if p[1] == ':':
-                parsed[p[0].strip()] = p[2].strip()
+            key = p[0].strip()
+            if p[1]:
+                parsed[key] = p[2].strip()
+            else:
+                parsed[key] = ''
 
     return parsed
 
@@ -283,13 +286,13 @@
     Returns dict of the form {bridge:port}.
     """
     _mappings = parse_mappings(mappings)
-    if not _mappings:
+    if not _mappings or list(_mappings.values()) == ['']:
         if not mappings:
             return {}
 
         # For backwards-compatibility we need to support port-only provided in
         # config.
-        _mappings = {default_bridge: mappings.split(' ')[0]}
+        _mappings = {default_bridge: mappings.split()[0]}
 
     bridges = _mappings.keys()
     ports = _mappings.values()
@@ -309,6 +312,8 @@
 
     Mappings must be a space-delimited list of provider:start:end mappings.
 
+    The start:end range is optional and may be omitted.
+
     Returns dict of the form {provider: (start, end)}.
     """
     _mappings = parse_mappings(mappings)

=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
--- tests/contrib/openstack/test_neutron_utils.py	2015-03-12 09:48:13 +0000
+++ tests/contrib/openstack/test_neutron_utils.py	2015-05-20 19:41:56 +0000
@@ -197,3 +197,6 @@
         ret = neutron.parse_vlan_range_mappings('physnet1:1001:2000 physnet2:2001:3000')
         self.assertEqual(ret, {'physnet1': ('1001', '2000'),
                                'physnet2': ('2001', '3000')})
+        ret = neutron.parse_vlan_range_mappings('physnet1 physnet2:2001:3000')
+        self.assertEqual(ret, {'physnet1': ('',),
+                               'physnet2': ('2001', '3000')})