summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-02-10 15:01:31 -0600
committerTrey Morris <trey.morris@rackspace.com>2011-02-10 15:01:31 -0600
commit87d0b5203610f1e0a7a2e09033c79071fabacaba (patch)
tree32ec60bafaf21936ebf3091fef8840bd7174b6dd
parentb0c6190e0b098af4d808d993c6dcd0796cc80e83 (diff)
downloadnova-87d0b5203610f1e0a7a2e09033c79071fabacaba.tar.gz
nova-87d0b5203610f1e0a7a2e09033c79071fabacaba.tar.xz
nova-87d0b5203610f1e0a7a2e09033c79071fabacaba.zip
passing instance to reset_network instead of vm_ref, also not converting to an opaque ref before making plugin call
-rw-r--r--nova/virt/xenapi/vmops.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 4056e99bc..575e53f80 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -121,7 +121,7 @@ class VMOps(object):
network_ref, instance.mac_address)
# call reset networking
- self.reset_network(vm_ref)
+ self.reset_network(instance)
LOG.debug(_('Starting VM %s...'), vm_ref)
self._session.call_xenapi('VM.start', vm_ref, False, False)
@@ -393,9 +393,8 @@ class VMOps(object):
return 'http://fakeajaxconsole/fake_url'
def reset_network(self, instance):
- vm = self._get_vm_opaque_ref(instance)
args = {'id': str(uuid.uuid4())}
- resp = self._make_agent_call('resetnetwork', vm, '', args)
+ resp = self._make_agent_call('resetnetwork', instance, '', args)
def list_from_xenstore(self, vm, path):
"""Runs the xenstore-ls command to get a listing of all records