openstack/nova
Code Issues Proposed changes

Merge "Avoid the dual-naming confusion"

Browse Source
This commit is contained in:
Jenkins 2015-12-04 23:20:52 +00:00 committed by Gerrit Code Review
commit 172881415e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/virt/libvirt/driver.py
View File

@ -1059,16 +1059,16 @@ class LibvirtDriver(driver.ComputeDriver):
return self.volume_drivers[driver_type] return self.volume_drivers[driver_type]
def _connect_volume(self, connection_info, disk_info): def _connect_volume(self, connection_info, disk_info):
driver = self._get_volume_driver(connection_info) vol_driver = self._get_volume_driver(connection_info)
driver.connect_volume(connection_info, disk_info) vol_driver.connect_volume(connection_info, disk_info)
def _disconnect_volume(self, connection_info, disk_dev): def _disconnect_volume(self, connection_info, disk_dev):
driver = self._get_volume_driver(connection_info) vol_driver = self._get_volume_driver(connection_info)
driver.disconnect_volume(connection_info, disk_dev) vol_driver.disconnect_volume(connection_info, disk_dev)
def _get_volume_config(self, connection_info, disk_info): def _get_volume_config(self, connection_info, disk_info):
driver = self._get_volume_driver(connection_info) vol_driver = self._get_volume_driver(connection_info)
return driver.get_config(connection_info, disk_info) return vol_driver.get_config(connection_info, disk_info)
def _get_volume_encryptor(self, connection_info, encryption): def _get_volume_encryptor(self, connection_info, encryption):
encryptor = encryptors.get_volume_encryptor(connection_info, encryptor = encryptors.get_volume_encryptor(connection_info,