summaryrefslogtreecommitdiffstats
path: root/nova/virt/hyperv
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-09 04:09:45 +0000
committerGerrit Code Review <review@openstack.org>2013-01-09 04:09:45 +0000
commitb9959b180e8035a0654313be3d6cded2da1d4894 (patch)
treeba1ac3bb47d570ef4b631dc344e31ce5be1c5c81 /nova/virt/hyperv
parentddb2400047d0afd8bc8e408ac3e9034b4c625952 (diff)
parente6cae13dd21f03948a28088d45be678f6a0e5c4e (diff)
downloadnova-b9959b180e8035a0654313be3d6cded2da1d4894.tar.gz
nova-b9959b180e8035a0654313be3d6cded2da1d4894.tar.xz
nova-b9959b180e8035a0654313be3d6cded2da1d4894.zip
Merge "attach/detach_volume() take instance as a parameter"
Diffstat (limited to 'nova/virt/hyperv')
-rw-r--r--nova/virt/hyperv/driver.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py
index 62cb46f2f..9599bca33 100644
--- a/nova/virt/hyperv/driver.py
+++ b/nova/virt/hyperv/driver.py
@@ -105,16 +105,16 @@ class HyperVDriver(driver.ComputeDriver):
def get_info(self, instance):
return self._vmops.get_info(instance)
- def attach_volume(self, connection_info, instance_name, mountpoint):
+ def attach_volume(self, connection_info, instance, mountpoint):
"""Attach volume storage to VM instance"""
return self._volumeops.attach_volume(connection_info,
- instance_name,
+ instance['name'],
mountpoint)
- def detach_volume(self, connection_info, instance_name, mountpoint):
+ def detach_volume(self, connection_info, instance, mountpoint):
"""Detach volume storage to VM instance"""
return self._volumeops.detach_volume(connection_info,
- instance_name,
+ instance['name'],
mountpoint)
def get_volume_connector(self, instance):