Merge lp:~hopem/charm-helpers/lp1500386 into lp:charm-helpers

[Edward Hope-Morley]

[Liam Young (gnuoy)]

Looks like there is an unstable (using py3) unit test:

FAIL: test_phy_nic_mtu_context_vlan_w_duplicate_raw (tests.contrib.openstack.test_os_contexts.ContextTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/liam/branches/merges/charm-helpers-272572/.venv3/lib/python3.4/site-packages/mock.py", line 1201, in patched
    return func(*args, **keywargs)
  File "/home/liam/branches/merges/charm-helpers-272572/tests/contrib/openstack/test_os_contexts.py", line 2678, in test_phy_nic_mtu_context_vlan_w_duplicate_raw
    'mtu': 5000})
AssertionError: {'devs': 'eth0\\neth0.200\\neth0.100', 'mtu': 5000} != {'devs': 'eth0\\neth0.100\\neth0.200', 'mtu': 5000}
- {'devs': 'eth0\\neth0.200\\neth0.100', 'mtu': 5000}
? ^ ^

+ {'devs': 'eth0\\neth0.100\\neth0.200', 'mtu': 5000}
? ^ ^

review: Needs Fixing

[lp:~hopem/charm-helpers/lp1500386]

460. By Edward Hope-Morley on 2015-09-29

fix py3 ordering issue

Unmerged revisions

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-09-25 16:11:52 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-09-29 20:58:03 +0000
@@ -1364,7 +1364,7 @@
             normalized.update({port: port for port in resolved
                                if port in ports})
             if resolved:
-                return {bridge: normalized[port] for port, bridge in
+                return {normalized[port]: bridge for port, bridge in
                         six.iteritems(portmap) if port in normalized.keys()}
 
         return None
@@ -1375,8 +1375,8 @@
     def __call__(self):
         ctxt = {}
         mappings = super(PhyNICMTUContext, self).__call__()
-        if mappings and mappings.values():
-            ports = mappings.values()
+        if mappings and mappings.keys():
+            ports = sorted(mappings.keys())
             napi_settings = NeutronAPIContext()()
             mtu = napi_settings.get('network_device_mtu')
             all_ports = set()

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2015-09-02 14:09:43 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2015-09-29 20:58:03 +0000
@@ -310,10 +310,10 @@
 def parse_data_port_mappings(mappings, default_bridge='br-data'):
     """Parse data port mappings.
 
-    Mappings must be a space-delimited list of port:bridge mappings.
+    Mappings must be a space-delimited list of bridge:port.
 
-    Returns dict of the form {port:bridge} where port may be an mac address or
-    interface name.
+    Returns dict of the form {port:bridge} where ports may be mac addresses or
+    interface names.
     """
 
     # NOTE(dosaboy): we use rvalue for key to allow multiple values to be

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-09-28 09:36:02 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-09-29 20:58:03 +0000
@@ -2604,7 +2604,7 @@
                                                'phybr1:eth1011'})
         mock_resolve.side_effect = lambda ports: ['eth1010']
         self.assertEquals(context.DataPortContext()(),
-                          {'phybr1': 'eth1010'})
+                          {'eth1010': 'phybr1'})
 
     @patch.object(context, 'get_nic_hwaddr')
     @patch.object(context.NeutronPortContext, 'resolve_ports')
@@ -2627,7 +2627,7 @@
         mock_resolve.side_effect = fake_resolve
 
         self.assertEquals(context.DataPortContext()(),
-                          {'phybr1': 'eth1010'})
+                          {'eth1010': 'phybr1'})
 
     @patch.object(context.NeutronAPIContext, '__call__', lambda *args:
                   {'network_device_mtu': 5000})
@@ -2653,6 +2653,30 @@
         ctxt = context.PhyNICMTUContext()()
         self.assertEqual(ctxt, {'devs': 'eth0\\neth0.100', 'mtu': 5000})
 
+    @patch.object(context.glob, 'glob')
+    @patch.object(context.NeutronAPIContext, '__call__', lambda *args:
+                  {'network_device_mtu': 5000})
+    @patch.object(context, 'get_nic_hwaddr', lambda inst, port: port)
+    @patch.object(context.NeutronPortContext, 'resolve_ports',
+                  lambda inst, ports: ports)
+    def test_phy_nic_mtu_context_vlan_w_duplicate_raw(self, mock_glob):
+        self.config.side_effect = fake_config({'data-port':
+                                               'phybr1:eth0.100 '
+                                               'phybr1:eth0.200'})
+
+        def fake_glob(wcard):
+            if 'eth0.100' in wcard:
+                return ['/sys/class/net/eth0.100/lower_eth0']
+            elif 'eth0.200' in wcard:
+                return ['/sys/class/net/eth0.200/lower_eth0']
+
+            raise Exception("Unexpeced key '%s'" % (wcard))
+
+        mock_glob.side_effect = fake_glob
+        ctxt = context.PhyNICMTUContext()()
+        self.assertEqual(ctxt, {'devs': 'eth0\\neth0.100\\neth0.200',
+                                'mtu': 5000})
+
     def test_neutronapicontext_defaults(self):
         self.relation_ids.return_value = []
         expected_keys = [