openstack/cinder
Code Issues Proposed changes

Merge "Remove db access from XIV/DS8K CG functions"

Browse Source
This commit is contained in:
Jenkins 2015-11-21 04:01:52 +00:00 committed by Gerrit Code Review
commit c8726b9907
2 changed files with 42 additions and 40 deletions
cinder
tests/unit
test_ibm_xiv_ds8k.py
volume/drivers/ibm
xiv_ds8k.py

73
cinder/tests/unit/test_ibm_xiv_ds8k.py

@ -41,13 +41,16 @@ CONSISTGROUP_ID = 1
VOLUME = {'size': 16,
'name': FAKE,
'id': 1,
'consistencygroup_id': CONSISTGROUP_ID,
'status': 'available'}
VOLUME2 = {'size': 32,
'name': FAKE2,
'id': 2,
'consistencygroup_id': CONSISTGROUP_ID,
'status': 'available'}
CG_VOLUME = {'size': 16,
'name': FAKE,
'id': 3,
'consistencygroup_id': CONSISTGROUP_ID,
'status': 'available'}
MANAGED_FAKE = "managed_fake"
MANAGED_VOLUME = {'size': 16,
@ -203,8 +206,7 @@ class XIVDS8KFakeProxyDriver(object):
return {'status': 'available'}
def delete_consistencygroup(self, ctxt, group):
volumes = []
def delete_consistencygroup(self, ctxt, group, volumes):
for volume in self.volumes.values():
if (group.get('id', None)
== volume.get('consistencygroup_id', None)):
@ -240,8 +242,7 @@ class XIVDS8KFakeProxyDriver(object):
return None, None
def create_cgsnapshot(self, ctxt, cgsnapshot):
snapshots = []
def create_cgsnapshot(self, ctxt, cgsnapshot, snapshots):
for volume in self.volumes.values():
if (cgsnapshot.get('consistencygroup_id', None)
== volume.get('consistencygroup_id', None)):
@ -262,25 +263,22 @@ class XIVDS8KFakeProxyDriver(object):
return {'status': 'available'}, snapshots
def delete_cgsnapshot(self, ctxt, cgsnapshot):
snapshots = []
for snapshot in self.snapshots.values():
if (cgsnapshot.get('id', None)
== snapshot.get('cgsnapshot_id', None)):
if snapshot['name'] == CANNOT_DELETE:
raise exception.VolumeBackendAPIException(
message='Snapshot can not be deleted')
else:
snapshot['status'] = 'deleted'
snapshots.append(snapshot)
def delete_cgsnapshot(self, ctxt, cgsnapshot, snapshots):
updated_snapshots = []
for snapshot in snapshots:
if snapshot['name'] == CANNOT_DELETE:
raise exception.VolumeBackendAPIException(
message='Snapshot can not be deleted')
else:
snapshot['status'] = 'deleted'
updated_snapshots.append(snapshot)
# Delete snapshots in consistency group
self.snapshots = {k: snap for k, snap in self.snapshots.items()
if not(snap.get('consistencygroup_id', None)
== cgsnapshot.get('cgsnapshot_id', None))}
return {'status': 'deleted'}, snapshots
return {'status': 'deleted'}, updated_snapshots
class XIVDS8KVolumeDriverTest(test.TestCase):
@ -700,7 +698,7 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
# Create volumes
# And add the volumes into the consistency group before creating cg
self.driver.create_volume(VOLUME)
self.driver.create_volume(CG_VOLUME)
self.assertRaises(exception.CinderException,
self.driver.create_consistencygroup,
@ -717,11 +715,12 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
self.driver.create_consistencygroup(ctxt, CONSISTGROUP)
# Create volumes and add them to consistency group
self.driver.create_volume(VOLUME)
self.driver.create_volume(CG_VOLUME)
# Delete consistency group
model_update, volumes = \
self.driver.delete_consistencygroup(ctxt, CONSISTGROUP, [])
self.driver.delete_consistencygroup(
ctxt, CONSISTGROUP, [CG_VOLUME])
# Verify the result
self.assertEqual('deleted',
@ -743,7 +742,7 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
self.driver.create_consistencygroup(ctxt, CONSISTGROUP)
# Set the volume not to be deleted
volume = copy.deepcopy(VOLUME)
volume = copy.deepcopy(CG_VOLUME)
volume['name'] = CANNOT_DELETE
# Create volumes and add them to consistency group
@ -751,7 +750,7 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
self.assertRaises(exception.VolumeBackendAPIException,
self.driver.delete_consistencygroup,
ctxt, CONSISTGROUP, [])
ctxt, CONSISTGROUP, [volume])
def test_create_cgsnapshot(self):
"""Test that create_cgsnapshot return successfully."""
@ -768,7 +767,7 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
# Create consistency group snapshot
model_update, snapshots = \
self.driver.create_cgsnapshot(ctxt, CG_SNAPSHOT, [])
self.driver.create_cgsnapshot(ctxt, CG_SNAPSHOT, [VOLUME])
# Verify the result
self.assertEqual('available',
@ -779,8 +778,8 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
snap['status'])
# Clean the environment
self.driver.delete_cgsnapshot(ctxt, CG_SNAPSHOT, [])
self.driver.delete_consistencygroup(ctxt, CONSISTGROUP, [])
self.driver.delete_cgsnapshot(ctxt, CG_SNAPSHOT, [VOLUME])
self.driver.delete_consistencygroup(ctxt, CONSISTGROUP, [VOLUME])
def test_create_cgsnapshot_fail_on_no_pool_space_left(self):
"""Test that create_cgsnapshot return fail when no pool space left."""
@ -793,7 +792,7 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
self.driver.create_consistencygroup(ctxt, CONSISTGROUP)
# Set the volume size
volume = copy.deepcopy(VOLUME)
volume = copy.deepcopy(CG_VOLUME)
volume['size'] = POOL_SIZE / 2 + 1
# Create volumes and add them to consistency group
@ -801,11 +800,11 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
self.assertRaises(exception.VolumeBackendAPIException,
self.driver.create_cgsnapshot,
ctxt, CG_SNAPSHOT, [])
ctxt, CG_SNAPSHOT, [volume])
# Clean the environment
self.driver.volumes = None
self.driver.delete_consistencygroup(ctxt, CONSISTGROUP, [])
self.driver.delete_consistencygroup(ctxt, CONSISTGROUP, [volume])
def test_delete_cgsnapshot(self):
"""Test that delete_cgsnapshot return successfully."""
@ -818,14 +817,14 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
self.driver.create_consistencygroup(ctxt, CONSISTGROUP)
# Create volumes and add them to consistency group
self.driver.create_volume(VOLUME)
self.driver.create_volume(CG_VOLUME)
# Create consistency group snapshot
self.driver.create_cgsnapshot(ctxt, CG_SNAPSHOT, [])
self.driver.create_cgsnapshot(ctxt, CG_SNAPSHOT, [CG_VOLUME])
# Delete consistency group snapshot
model_update, snapshots = \
self.driver.delete_cgsnapshot(ctxt, CG_SNAPSHOT, [])
self.driver.delete_cgsnapshot(ctxt, CG_SNAPSHOT, [CG_VOLUME])
# Verify the result
self.assertEqual('deleted',
@ -836,7 +835,7 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
snap['status'])
# Clean the environment
self.driver.delete_consistencygroup(ctxt, CONSISTGROUP, [])
self.driver.delete_consistencygroup(ctxt, CONSISTGROUP, [CG_VOLUME])
def test_delete_cgsnapshot_fail_on_snapshot_not_delete(self):
"""Test delete_cgsnapshot when the snapshot cannot be deleted."""
@ -849,18 +848,18 @@ class XIVDS8KVolumeDriverTest(test.TestCase):
self.driver.create_consistencygroup(ctxt, CONSISTGROUP)
# Set the snapshot not to be deleted
volume = copy.deepcopy(VOLUME)
volume = copy.deepcopy(CG_VOLUME)
volume['name'] = CANNOT_DELETE
# Create volumes and add them to consistency group
self.driver.create_volume(volume)
# Create consistency group snapshot
self.driver.create_cgsnapshot(ctxt, CG_SNAPSHOT, [])
self.driver.create_cgsnapshot(ctxt, CG_SNAPSHOT, [volume])
self.assertRaises(exception.VolumeBackendAPIException,
self.driver.delete_cgsnapshot,
ctxt, CG_SNAPSHOT, [])
ctxt, CG_SNAPSHOT, [volume])
def test_update_consistencygroup_without_volumes(self):
"""Test update_consistencygroup when there are no volumes specified."""

9
cinder/volume/drivers/ibm/xiv_ds8k.py

@ -250,17 +250,20 @@ class XIVDS8KDriver(san.SanDriver,
def delete_consistencygroup(self, context, group, volumes):
"""Deletes a consistency group."""
return self.xiv_ds8k_proxy.delete_consistencygroup(context, group)
return self.xiv_ds8k_proxy.delete_consistencygroup(
context, group, volumes)
def create_cgsnapshot(self, context, cgsnapshot, snapshots):
"""Creates a consistency group snapshot."""
return self.xiv_ds8k_proxy.create_cgsnapshot(context, cgsnapshot)
return self.xiv_ds8k_proxy.create_cgsnapshot(
context, cgsnapshot, snapshots)
def delete_cgsnapshot(self, context, cgsnapshot, snapshots):
"""Deletes a consistency group snapshot."""
return self.xiv_ds8k_proxy.delete_cgsnapshot(context, cgsnapshot)
return self.xiv_ds8k_proxy.delete_cgsnapshot(
context, cgsnapshot, snapshots)
def update_consistencygroup(self, context, group,
add_volumes, remove_volumes):