openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "NestedMacvlanPodVIFDriver gets host port before request vif"

This commit is contained in:
Zuul 2018-02-24 20:50:05 +00:00 committed by Gerrit Code Review
parent 5294977098 716909decb
commit 4915f38bf6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kuryr_kubernetes/controller/drivers/nested_macvlan_vif.py Normal file → Executable file
View File

@ -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)

2
kuryr_kubernetes/tests/unit/controller/drivers/test_nested_macvlan_vif.py
View File

@ -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()