openstack/neutron
Code Issues Proposed changes

Merge "portbindings: use constants for extension keys"

Browse Source
This commit is contained in:
Jenkins 2016-01-12 19:06:20 +00:00 committed by Gerrit Code Review
commit 6109e67e8d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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))

2
neutron/tests/unit/plugins/ml2/_test_mech_agent.py
View File

@ -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):

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

@ -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)

4
neutron/tests/unit/plugins/ml2/drivers/mech_sriov/mech_driver/test_mech_sriov_nic_switch.py
View File

@ -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