openstack
/
nova
Code Issues Proposed changes

Merge "VMware: fix exception when using multiple compute nodes" into stable/havana

This commit is contained in:
Jenkins 2014-04-09 23:49:17 +00:00 committed by Gerrit Code Review
parent 3e208e1953 2885173947
commit c57efa476e
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nova/virt/vmwareapi/driver.py
View File

@ -372,14 +372,6 @@ class VMwareESXDriver(driver.ComputeDriver):
"""inject network info for specified instance."""
self._vmops.inject_network_info(instance, network_info)
def plug_vifs(self, instance, network_info):
"""Plug VIFs into networks."""
self._vmops.plug_vifs(instance, network_info)
def unplug_vifs(self, instance, network_info):
"""Unplug VIFs from networks."""
self._vmops.unplug_vifs(instance, network_info)
def list_instance_uuids(self):
"""List VM instance UUIDs."""
uuids = self._vmops.list_instances()
@ -733,16 +725,6 @@ class VMwareVCDriver(VMwareESXDriver):
_vmops = self._get_vmops_for_compute_node(instance['node'])
_vmops.inject_network_info(instance, network_info)
def plug_vifs(self, instance, network_info):
"""Plug VIFs into networks."""
_vmops = self._get_vmops_for_compute_node(instance['node'])
_vmops.plug_vifs(instance, network_info)
def unplug_vifs(self, instance, network_info):
"""Unplug VIFs from networks."""
_vmops = self._get_vmops_for_compute_node(instance['node'])
_vmops.unplug_vifs(instance, network_info)
class VMwareAPISession(object):
"""

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

@ -1600,16 +1600,6 @@ class VMwareVMOps(object):
client_factory = self._session._get_vim().client.factory
self._set_machine_id(client_factory, instance, network_info)
def plug_vifs(self, instance, network_info):
"""Plug VIFs into networks."""
msg = _("VIF plugging is not supported by the VMware driver.")
raise NotImplementedError(msg)
def unplug_vifs(self, instance, network_info):
"""Unplug VIFs from networks."""
msg = _("VIF unplugging is not supported by the VMware driver.")
raise NotImplementedError(msg)
class VMwareVCVMOps(VMwareVMOps):
"""Management class for VM-related tasks.