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

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

Changes seem generally fine to me, but would love to see a unit-test covering this new code.

Also note: there are unrelated py3 test failures.

review: Needs Fixing

[Edward Hope-Morley (hopem)]

Granted!

[Billy Olsen (billy-olsen)]

LGTM, thanks Ed!

review: Approve

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

455. By Edward Hope-Morley on 2015-09-25

avoid duplicate ports in list

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-09-15 17:52:15 +0000
+++ charmhelpers/contrib/openstack/context.py	2015-09-25 16:12:01 +0000
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
+import glob
 import json
 import os
 import re
@@ -1378,8 +1379,18 @@
             ports = mappings.values()
             napi_settings = NeutronAPIContext()()
             mtu = napi_settings.get('network_device_mtu')
+            all_ports = set()
+            # If any of ports is a vlan device, its underlying device must have
+            # mtu applied first.
+            for port in ports:
+                for lport in glob.glob("/sys/class/net/%s/lower_*" % port):
+                    lport = os.path.basename(lport)
+                    all_ports.add(lport.split('_')[1])
+
+            all_ports = list(all_ports)
+            all_ports.extend(ports)
             if mtu:
-                ctxt["devs"] = '\\n'.join(ports)
+                ctxt["devs"] = '\\n'.join(all_ports)
                 ctxt['mtu'] = mtu
 
         return ctxt

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-09-15 17:52:15 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2015-09-25 16:12:01 +0000
@@ -2564,6 +2564,30 @@
         self.assertEquals(context.DataPortContext()(),
                           {'phybr1': 'eth1010'})
 
+    @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(self):
+        self.config.side_effect = fake_config({'data-port':
+                                               'phybr1:eth0'})
+        ctxt = context.PhyNICMTUContext()()
+        self.assertEqual(ctxt, {'devs': 'eth0', '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(self, mock_glob):
+        self.config.side_effect = fake_config({'data-port':
+                                               'phybr1:eth0.100'})
+        mock_glob.return_value = ['/sys/class/net/eth0.100/lower_eth0']
+        ctxt = context.PhyNICMTUContext()()
+        self.assertEqual(ctxt, {'devs': 'eth0\\neth0.100', 'mtu': 5000})
+
     def test_neutronapicontext_defaults(self):
         self.relation_ids.return_value = []
         expected_keys = [