openstack
/
nova
Code Issues Proposed changes

Merge "VMware: pass vm_ref to _set_machine_id"

This commit is contained in:
Jenkins 2014-12-04 21:26:08 +00:00 committed by Gerrit Code Review
parent 9fac465a71 f6c879aeb7
commit 0ba66aa539
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nova/tests/unit/virt/vmwareapi/test_vmops.py
View File

@ -867,7 +867,8 @@ class VMwareVMOpsTestCase(test.NoDBTestCase):
mock_set_machine_id.assert_called_once_with(
self._session.vim.client.factory,
self._instance,
network_info)
network_info,
vm_ref='fake_vm_ref')
if power_on:
mock_power_on_instance.assert_called_once_with(
self._session, self._instance, vm_ref='fake_vm_ref')

9
nova/virt/vmwareapi/vmops.py
View File

@ -511,7 +511,8 @@ class VMwareVMOps(object):
# Set the machine.id parameter of the instance to inject
# the NIC configuration inside the VM
if CONF.flat_injected:
self._set_machine_id(client_factory, instance, network_info)
self._set_machine_id(client_factory, instance, network_info,
vm_ref=vm_ref)
# Set the vnc configuration of the instance, vnc port starts from 5900
if CONF.vnc_enabled:
@ -1305,11 +1306,13 @@ class VMwareVMOps(object):
machine_id_str = machine_id_str + interface_str + '#'
return machine_id_str
def _set_machine_id(self, client_factory, instance, network_info):
def _set_machine_id(self, client_factory, instance, network_info,
vm_ref=None):
"""Set the machine id of the VM for guest tools to pick up
and reconfigure the network interfaces.
"""
vm_ref = vm_util.get_vm_ref(self._session, instance)
if vm_ref is None:
vm_ref = vm_util.get_vm_ref(self._session, instance)
machine_id_change_spec = vm_util.get_machine_id_change_spec(
client_factory,