openstack
/
nova
Code Issues Proposed changes

Merge "Fix logging parameter in _populate_pci_mac_address"

This commit is contained in:
Zuul 2018-10-05 00:22:47 +00:00 committed by Gerrit Code Review
parent dd159932d6 40e56b2b56
commit 11d3695db6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/network/neutronv2/api.py
View File

@ -1426,7 +1426,7 @@ class API(base_api.NetworkAPI):
LOG.error("PCI request %s does not have a "
"unique device associated with it. Unable to "
"determine MAC address",
pci_request, instance=instance)
pci_request_id, instance=instance)
return
pci_dev = pci_devs[0]
if pci_dev.dev_type == obj_fields.PciDeviceType.SRIOV_PF:

4
nova/tests/unit/network/test_neutronv2.py
View File

@ -5568,7 +5568,8 @@ class TestNeutronv2Portbinding(TestNeutronv2Base):
self.assertEqual(port_req_body, req)
@mock.patch.object(pci_manager, 'get_instance_pci_devs')
def test_populate_pci_mac_address_no_device(self,
@mock.patch('nova.network.neutronv2.api.LOG.error')
def test_populate_pci_mac_address_no_device(self, mock_log_error,
mock_get_instance_pci_devs):
api = neutronapi.API()
instance, pf, vf = self._populate_pci_mac_address_fakes()
@ -5578,6 +5579,7 @@ class TestNeutronv2Portbinding(TestNeutronv2Base):
req = port_req_body.copy()
api._populate_pci_mac_address(instance, 42, port_req_body)
self.assertEqual(port_req_body, req)
self.assertEqual(42, mock_log_error.call_args[0][1])
def _test_update_port_binding_true(self, expected_bind_host,
func_name, *args):