Skip to content

Synchronise 2025.1 with upstream #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
priteau merged 2 commits into from
May 7, 2026
Merged

Synchronise 2025.1 with upstream #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68464a4
CI: Temporary setuptools pin
juliakreger Feb 13, 2026
cca6f54
Fix GenericSwitchNotSupported exceptions
priteau Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions networking_generic_switch/generic_switch_mech.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
7 changes: 6 additions & 1 deletion networking_generic_switch/tests/unit/test_generic_switch_mech.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
7 changes: 7 additions & 0 deletions releasenotes/notes/fix-genericswitchnotsupported-exceptions-80fcdcaadb16ca7b.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ deps =
bashate~=2.1.0 # Apache-2.0
pycodestyle>=2.0.0,<3.0.0 # MIT
doc8~=1.1.0 # Apache-2.0
setuptools<81.0.0
allowlist_externals = bash
{toxinidir}/tools/run_bashate.sh
commands =
Expand Down