From 716909decbdd8dd9b02090672bfdf54c2fa071df Mon Sep 17 00:00:00 2001 From: Eunsoo Park Date: Mon, 19 Feb 2018 16:33:54 +0900 Subject: [PATCH] NestedMacvlanPodVIFDriver gets host port before request vif This commit changes macvlan driver to get host port before request vif to neutron. Change-Id: I403609b824aa72184836dacfac09a312698afe78 Closes-Bug: 1750332 Signed-off-by: Eunsoo Park --- kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py | 2 +- .../tests/unit/controller/drivers/test_nested_macvlan_vif.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py diff --git a/kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py b/kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py old mode 100644 new mode 100755 index 8e3a44602..746502a6e --- a/kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py +++ b/kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py @@ -35,6 +35,7 @@ class NestedMacvlanPodVIFDriver(nested_vif.NestedPodVIFDriver): neutron = clients.get_neutron_client() req = self._get_port_request(pod, project_id, subnets, security_groups) + vm_port = self._get_parent_port(neutron, pod) container_port = neutron.create_port(req).get('port') container_mac = container_port['mac_address'] @@ -42,7 +43,6 @@ class NestedMacvlanPodVIFDriver(nested_vif.NestedPodVIFDriver): container_port['fixed_ips']) with self.lock: - vm_port = self._get_parent_port(neutron, pod) self._add_to_allowed_address_pairs(neutron, vm_port, container_ips, container_mac) diff --git a/kuryr_kubernetes/tests/unit/controller/drivers/test_nested_macvlan_vif.py b/kuryr_kubernetes/tests/unit/controller/drivers/test_nested_macvlan_vif.py index b752cb451..2dfcea8d7 100644 --- a/kuryr_kubernetes/tests/unit/controller/drivers/test_nested_macvlan_vif.py +++ b/kuryr_kubernetes/tests/unit/controller/drivers/test_nested_macvlan_vif.py @@ -113,7 +113,7 @@ class TestNestedMacvlanPodVIFDriver(test_base.TestCase): m_driver, pod, project_id, subnets, security_groups) m_driver._get_port_request.assert_called_once_with( pod, project_id, subnets, security_groups) - neutron.create_port.assert_called_once_with(port_request) + neutron.create_port.assert_not_called() m_driver._get_parent_port.assert_called_once_with(neutron, pod) m_driver._add_to_allowed_address_pairs.assert_not_called() m_to_vif.assert_not_called()