openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Make sure subports are unique when removing them"

This commit is contained in:
Zuul 2019-10-09 10:31:56 +00:00 committed by Gerrit Code Review
parent ee7cdb9a0d 9172f378e0
commit 3953b99599
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kuryr_kubernetes/controller/drivers/nested_vlan_vif.py
View File

@ -218,7 +218,7 @@ class NestedVlanPodVIFDriver(nested_vif.NestedPodVIFDriver):
def _remove_subports(self, neutron, trunk_id, subports_id):
subports_body = []
for subport_id in subports_id:
for subport_id in set(subports_id):
subports_body.append({'port_id': subport_id})
try:
neutron.trunk_remove_subports(trunk_id,

13
kuryr_kubernetes/tests/unit/controller/drivers/test_nested_vlan_vif.py
View File

@ -576,6 +576,19 @@ class TestNestedVlanPodVIFDriver(test_base.TestCase):
neutron.trunk_remove_subports.assert_called_once_with(
trunk_id, {'sub_ports': subportid_dict})
def test__remove_subports_duplicate(self):
cls = nested_vlan_vif.NestedVlanPodVIFDriver
m_driver = mock.Mock(spec=cls)
neutron = self.useFixture(k_fix.MockNeutronClient()).client
trunk_id = mock.sentinel.trunk_id
subport_id = mock.sentinel.subport_id
subportid_dict = [{'port_id': subport_id}]
cls._remove_subports(m_driver, neutron, trunk_id, [subport_id,
subport_id])
neutron.trunk_remove_subports.assert_called_once_with(
trunk_id, {'sub_ports': subportid_dict})
@mock.patch('kuryr.lib.segmentation_type_drivers.allocate_segmentation_id')
def test_get_vlan_id(self, mock_alloc_seg_id):
cls = nested_vlan_vif.NestedVlanPodVIFDriver