From 49d25b39924f3e699a28e0cb9c34fe0a0499772b Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Mon, 21 Dec 2015 10:21:57 -0800 Subject: [PATCH] portbindings: use constants for extension keys Use the constants defined in the portbindings extension. TrivialFix Change-Id: I90c3deeae9018d4e5b23283f64657d9f5d5723c7 --- .../plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py | 4 ++-- neutron/tests/unit/plugins/ml2/_test_mech_agent.py | 2 +- .../ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py | 4 ++-- .../mech_sriov/mech_driver/test_mech_sriov_nic_switch.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py index 4fe5879a3..3f2edef62 100644 --- a/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py +++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py @@ -71,8 +71,8 @@ class SriovNicSwitchRpcCallbacks(sg_rpc.SecurityGroupAgentRpcCallbackMixin): # processed in the same order as the relevant API requests. mac = port['mac_address'] pci_slot = None - if port.get('binding:profile'): - pci_slot = port['binding:profile'].get('pci_slot') + if port.get(portbindings.PROFILE): + pci_slot = port[portbindings.PROFILE].get('pci_slot') if pci_slot: self.agent.updated_devices.add((mac, pci_slot)) diff --git a/neutron/tests/unit/plugins/ml2/_test_mech_agent.py b/neutron/tests/unit/plugins/ml2/_test_mech_agent.py index 2402bc15b..271620c63 100644 --- a/neutron/tests/unit/plugins/ml2/_test_mech_agent.py +++ b/neutron/tests/unit/plugins/ml2/_test_mech_agent.py @@ -53,7 +53,7 @@ class FakePortContext(api.PortContext): @property def current(self): return {'id': PORT_ID, - 'binding:vnic_type': self._bound_vnic_type} + portbindings.VNIC_TYPE: self._bound_vnic_type} @property def original(self): diff --git a/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py b/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py index a794d8764..947a7aebc 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py +++ b/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_sriov_nic_agent.py @@ -286,7 +286,7 @@ class TestSriovNicSwitchRpcCallbacks(base.BaseTestCase): def _create_fake_port(self): return {'id': uuidutils.generate_uuid(), - 'binding:profile': {'pci_slot': PCI_SLOT}, + portbindings.PROFILE: {'pci_slot': PCI_SLOT}, 'mac_address': DEVICE_MAC} def test_port_update_with_pci_slot(self): @@ -305,7 +305,7 @@ class TestSriovNicSwitchRpcCallbacks(base.BaseTestCase): def test_port_update_without_pci_slot(self): port = self._create_fake_port() - port['binding:profile'] = None + port[portbindings.PROFILE] = None kwargs = {'context': self.context, 'port': port} self.sriov_rpc_callback.port_update(**kwargs) self.assertEqual(set(), self.agent.updated_devices) diff --git a/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/mech_driver/test_mech_sriov_nic_switch.py b/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/mech_driver/test_mech_sriov_nic_switch.py index df42a57ac..c69e0a471 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/mech_driver/test_mech_sriov_nic_switch.py +++ b/neutron/tests/unit/plugins/ml2/drivers/mech_sriov/mech_driver/test_mech_sriov_nic_switch.py @@ -45,8 +45,8 @@ class TestFakePortContext(base.FakePortContext): @property def current(self): return {'id': base.PORT_ID, - 'binding:vnic_type': self._bound_vnic_type, - 'binding:profile': self._bound_profile} + portbindings.VNIC_TYPE: self._bound_vnic_type, + portbindings.PROFILE: self._bound_profile} def set_binding(self, segment_id, vif_type, vif_details, state): self._bound_segment_id = segment_id -- 2.45.2