From 40e56b2b566d42ca68ea8f60e80d830599325f12 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 3 Oct 2018 12:11:16 -0400 Subject: [PATCH] Fix logging parameter in _populate_pci_mac_address The code was erroneously logging a module import, not the pci_request_id variable. This fixes the code and adds an assertion to the related test. Change-Id: I2c84e118a285d5e8d5165752e642d9aff9eeca3a --- nova/network/neutronv2/api.py | 2 +- nova/tests/unit/network/test_neutronv2.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index f4556d939d36..be6aebc8f609 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -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: diff --git a/nova/tests/unit/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py index b95e1433f7ea..24d8138c95dc 100644 --- a/nova/tests/unit/network/test_neutronv2.py +++ b/nova/tests/unit/network/test_neutronv2.py @@ -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):