Fix GenericSwitchNotSupported exceptions

These exceptions were not instantiated with the correct arguments,
leading to a TypeError that was hiding the real issue (lack of support
for trunks on ports or bonds).

Closes-Bug: #2147055
Change-Id: Ifde3a65cb51a237801c49d4c443f222f320f6274
Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
(cherry picked from commit eb20591)

Author: priteau

networking_generic_switch/generic_switch_mech.py

@@ -394,16 +394,17 @@ def update_port_postcommit(self, context):
                     if (trunk_details and not
                             switch.support_trunk_on_bond_ports):
                         raise ngs_exc.GenericSwitchNotSupported(
-                            "Trunks are not supported by "
-                            "networking-generic-switch %s.",
-                            switch.device_name)
+                            feature="trunks",
+                            switch=switch.device_name,
+                            error="Trunks are not supported on bond ports.")
                     switch.plug_bond_to_network(port_id, segmentation_id,
                                                 **plug_kwargs)
                 else:
                     if trunk_details and not switch.support_trunk_on_ports:
                         raise ngs_exc.GenericSwitchNotSupported(
                             feature="trunks",
-                            switch=switch.device_name)
+                            switch=switch.device_name,
+                            error="Trunks are not supported on ports.")
                     switch.plug_port_to_network(port_id, segmentation_id,
                                                 **plug_kwargs)
                 LOG.info("Successfully plugged port %(port_id)s in segment "

networking_generic_switch/tests/unit/test_generic_switch_mech.py

@@ -854,7 +854,12 @@ def test_update_port_postcommit_trunk_not_supported(self, m_pc, m_list):
         self.switch_mock.support_trunk_on_bond_ports = False
         self.switch_mock.support_trunk_on_ports = False
 
-        with self.assertRaises(exceptions.GenericSwitchNotSupported):
+        exception_regex = (
+            'Requested feature trunks is not supported by '
+            'networking-generic-switch on the .*. Trunks are not supported on '
+            'ports.')
+        with self.assertRaisesRegex(exceptions.GenericSwitchNotSupported,
+                                    exception_regex):
             driver.update_port_postcommit(mock_context)
         self.switch_mock.plug_port_to_network.assert_not_called()
         m_pc.assert_not_called()

releasenotes/notes/fix-genericswitchnotsupported-exceptions-80fcdcaadb16ca7b.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes incorrect instantiations of GenericSwitchNotSupported exceptions. See
+    `LP#2147055
+    <https://bugs.launchpad.net/networking-generic-switch/+bug/2147055>`__ for
+    details.