openstack/neutron
Code Issues Proposed changes

Merge "Scan for MAC through all devices in macvtap agent"

Browse Source
This commit is contained in:
Zuul 2018-11-03 12:11:18 +00:00 committed by Gerrit Code Review
commit a6997efae6
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neutron/plugins/ml2/drivers/macvtap/agent/macvtap_neutron_agent.py
View File

@ -112,13 +112,13 @@ class MacvtapManager(amb.CommonAgentManagerBase):
def get_agent_id(self): def get_agent_id(self):
devices = ip_lib.IPWrapper().get_devices(True) devices = ip_lib.IPWrapper().get_devices(True)
if devices: for device in devices:
mac = ip_lib.get_device_mac(devices[0].name) mac = ip_lib.get_device_mac(device.name)
return 'macvtap%s' % mac.replace(":", "") if mac:
else: return 'macvtap%s' % mac.replace(":", "")
LOG.error("Unable to obtain MAC address for unique ID. " LOG.error("Unable to obtain MAC address for unique ID. "
"Agent terminated!") "Agent terminated!")
sys.exit(1) sys.exit(1)
def get_devices_modified_timestamps(self, devices): def get_devices_modified_timestamps(self, devices):
# TODO(kevinbenton): this should be implemented to detect # TODO(kevinbenton): this should be implemented to detect

11
neutron/tests/unit/plugins/ml2/drivers/macvtap/agent/test_macvtap_neutron_agent.py
View File

@ -146,6 +146,17 @@ class TestMacvtapManager(base.BaseTestCase):
self.mgr.get_agent_id() self.mgr.get_agent_id()
mock_exit.assert_called_once_with(1) mock_exit.assert_called_once_with(1)
def test_get_agent_id_no_mac(self):
mock_devices = [ip_lib.IPDevice('macvtap0'),
ip_lib.IPDevice('macvtap1')]
with mock.patch.object(ip_lib.IPWrapper, 'get_devices',
return_value=mock_devices),\
mock.patch.object(ip_lib, 'get_device_mac',
side_effect=[None, 'foo:bar:1']) as mock_gdm:
self.assertEqual('macvtapfoobar1', self.mgr.get_agent_id())
mock_gdm.assert_has_calls([mock.call('macvtap0'),
mock.call('macvtap1')])
def test_get_extension_driver_type(self): def test_get_extension_driver_type(self):
self.assertEqual('macvtap', self.mgr.get_extension_driver_type()) self.assertEqual('macvtap', self.mgr.get_extension_driver_type())