openstack/ironic
Code Issues Proposed changes

Merge "Replace vif_portgroup_id with vif_port_id"

Browse Source
This commit is contained in:
Jenkins 2016-06-20 17:53:41 +00:00 committed by Gerrit Code Review
commit ce9f37d2a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/conductor/manager.py
View File

@ -1844,14 +1844,14 @@ class ConductorManager(base_manager.BaseConductorManager):
'node': node.uuid}) 'node': node.uuid})
if 'address' in portgroup_obj.obj_what_changed(): if 'address' in portgroup_obj.obj_what_changed():
vif = portgroup_obj.extra.get('vif_portgroup_id') vif = portgroup_obj.extra.get('vif_port_id')
if vif: if vif:
api = dhcp_factory.DHCPFactory() api = dhcp_factory.DHCPFactory()
api.provider.update_port_address( api.provider.update_port_address(
vif, vif,
portgroup_obj.address, portgroup_obj.address,
token=context.auth_token) token=context.auth_token)
# Log warning if there is no vif_portgroup_id and an instance # Log warning if there is no vif_port_id and an instance
# is associated with the node. # is associated with the node.
elif node.instance_uuid: elif node.instance_uuid:
LOG.warning(_LW( LOG.warning(_LW(

4
ironic/tests/unit/conductor/test_manager.py
View File

@ -3059,7 +3059,7 @@ class UpdatePortgroupTestCase(mgr_utils.ServiceSetUpMixin,
node = obj_utils.create_test_node(self.context, driver='fake') node = obj_utils.create_test_node(self.context, driver='fake')
pg = obj_utils.create_test_portgroup( pg = obj_utils.create_test_portgroup(
self.context, node_id=node.id, self.context, node_id=node.id,
extra={'vif_portgroup_id': 'fake-id'}) extra={'vif_port_id': 'fake-id'})
new_address = '11:22:33:44:55:bb' new_address = '11:22:33:44:55:bb'
pg.address = new_address pg.address = new_address
self.service.update_portgroup(self.context, pg) self.service.update_portgroup(self.context, pg)
@ -3073,7 +3073,7 @@ class UpdatePortgroupTestCase(mgr_utils.ServiceSetUpMixin,
node = obj_utils.create_test_node(self.context, driver='fake') node = obj_utils.create_test_node(self.context, driver='fake')
pg = obj_utils.create_test_portgroup( pg = obj_utils.create_test_portgroup(
self.context, node_id=node.id, self.context, node_id=node.id,
extra={'vif_portgroup_id': 'fake-id'}) extra={'vif_port_id': 'fake-id'})
old_address = pg.address old_address = pg.address
pg.address = '11:22:33:44:55:bb' pg.address = '11:22:33:44:55:bb'
mac_update_mock.side_effect = ( mac_update_mock.side_effect = (