openstack/nova-powervm
Code Issues Proposed changes

Rebase on rm_ssp_storage

Browse Source 
Recent pypowervm change in branch rm_ssp_storage replaced the
remove_lu_linked_clone method with one called rm_ssp_storage.  This
change set rebases accordingly.

Closes-Bug: 1480220

Change-Id: I258b587dd0c27f9160d9a201178b1868d3880ad3
This commit is contained in:
Eric Fried
2015-07-28 16:31:22 -05:00
parent 0087e709e1
commit d73c7e60e4
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova_powervm/tests/virt/powervm/disk/test_ssp.py
View File

@@ -359,14 +359,14 @@ class TestSSPDiskAdapter(test.TestCase):
def _mk_img_lu(idx):
lu = pvm_stg.LU.bld(None, 'img_lu%d' % idx, 123,
typ=pvm_stg.LUType.IMAGE)
lu._udid('xxImage-LU-UDID-%d' % idx)
lu._udid('xxabc123%d' % idx)
return lu
def _mk_dsk_lu(idx, cloned_from_idx):
lu = pvm_stg.LU.bld(None, 'dsk_lu%d' % idx, 123,
typ=pvm_stg.LUType.DISK)
lu._udid('xxDisk-LU-UDID-%d' % idx)
lu._cloned_from_udid('yyImage-LU-UDID-%d' % cloned_from_idx)
lu._udid('xxabc123%d' % idx)
lu._cloned_from_udid('yyabc123%d' % cloned_from_idx)
return lu
# We should be ignoring the return value from update - but it still

6
nova_powervm/virt/powervm/disk/ssp.py
View File

@@ -131,11 +131,7 @@ class SSPDiskAdapter(disk_drv.DiskAdapter):
ElementWrappers) that are to be deleted. Derived
from the return value from disconnect_image_disk.
"""
ssp = self._ssp
for lu_to_rm in storage_elems:
ssp = tsk_stg.remove_lu_linked_clone(
ssp, lu_to_rm, del_unused_image=True, update=False)
ssp.update()
tsk_stg.rm_ssp_storage(self._ssp, storage_elems)
def create_disk_from_image(self, context, instance, img_meta, disk_size_gb,
image_type=disk_drv.DiskType.BOOT):