openstack
/
neutron
Code Issues Proposed changes

SR-IOV agent should specify host when requesting devices info 

Otherwise neutron server may set BUILD status for ports not bound
to agent's host.

Closes-Bug: #1702635
Change-Id: Ic0aa2b5d8fb5ad682293ce2b8e44606ef862a62d
This commit is contained in:
Oleg Bondarev 2017-07-06 15:43:15 +04:00
parent 3a894d0b9e
commit 6402cd37c9
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py
View File

@ -279,7 +279,7 @@ class SriovNicSwitchAgent(object):
try:
macs_list = set([device_info[0] for device_info in devices_info])
devices_details_list = self.plugin_rpc.get_devices_details_list(
self.context, macs_list, self.agent_id)
self.context, macs_list, self.agent_id, self.conf.host)
except Exception as e:
LOG.debug("Unable to get port details for devices "
"with MAC addresses %(devices)s: %(e)s",

21
neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py
View File

@ -221,6 +221,27 @@ class TestSriovAgent(base.BaseTestCase):
'mac4']))
agent.treat_devices_removed.assert_called_with(set(['mac1']))
def test_treat_devices_added_updated_sends_host(self):
agent = self.agent
host = 'host1'
cfg.CONF.set_override('host', host)
agent.plugin_rpc = mock.Mock()
MAC = 'aa:bb:cc:dd:ee:ff'
device_details = {'device': MAC,
'port_id': 'port123',
'network_id': 'net123',
'admin_state_up': True,
'network_type': 'vlan',
'segmentation_id': 100,
'profile': {'pci_slot': '1:2:3.0'},
'physical_network': 'physnet1',
'port_security_enabled': False}
agent.plugin_rpc.get_devices_details_list.return_value = (
[device_details])
agent.treat_devices_added_updated([[MAC]])
agent.plugin_rpc.get_devices_details_list.assert_called_once_with(
mock.ANY, set([MAC]), mock.ANY, host)
def test_treat_devices_added_updated_and_removed(self):
agent = self.agent
MAC1 = 'aa:bb:cc:dd:ee:ff'