summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-12 23:17:36 +0000
committerGerrit Code Review <review@openstack.org>2012-09-12 23:17:36 +0000
commitde63434fec28987f4a7e6850e05cce0fa0082d44 (patch)
tree11853c213d8727888963c74e0aae024a99f5cd16
parent0b1eee6bb39243ef117f65b0eaf3d6f14b0aa3d7 (diff)
parentc9e573955bc6ae22c2508ccc640690828b150152 (diff)
Merge "Rename _unplug_vifs to unplug_vifs"
-rw-r--r--nova/virt/vmwareapi/vmops.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index f650316da..541e16e44 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -588,7 +588,7 @@ class VMWareVMOps(object):
" while un-registering the VM: %s") % str(excep),
instance=instance)
- self._unplug_vifs(instance, network_info)
+ self.unplug_vifs(instance, network_info)
# Delete the folder holding the VM related content on
# the datastore.
@@ -827,7 +827,7 @@ class VMWareVMOps(object):
for (network, mapping) in network_info:
self._vif_driver.plug(instance, (network, mapping))
- def _unplug_vifs(self, instance, network_info):
+ def unplug_vifs(self, instance, network_info):
"""Unplug VIFs from networks."""
for (network, mapping) in network_info:
self._vif_driver.unplug(instance, (network, mapping))