openstack/cinder
Code Issues Proposed changes

Merge "IBM-Storage: group-create-from-src fail with error"

Browse Source
This commit is contained in:
Jenkins 2017-07-19 17:35:56 +00:00 committed by Gerrit Code Review
commit 8a6f4fd00e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/volume/drivers/ibm/test_xiv_proxy.py
View File

@ -1453,8 +1453,8 @@ class XIVProxyTest(test.TestCase):
{}, group_obj, [volume], {}, group_obj, [volume],
cgsnap_group_obj, [snapshot], None, None) cgsnap_group_obj, [snapshot], None, None)
p.ibm_storage_cli.cmd.cg_create.assert_called_once_with(cg=group_obj, p.ibm_storage_cli.cmd.cg_create.assert_called_once_with(
pool='WTF32') cg=p._cg_name_from_id(group_obj.id), pool='WTF32')
self.assertEqual('available', model_update['status']) self.assertEqual('available', model_update['status'])

2
cinder/volume/drivers/ibm/ibm_storage/xiv_proxy.py
View File

@ -1775,7 +1775,7 @@ class XIVProxy(proxy.IBMStorageProxy):
LOG.debug("Creating from cgsnapshot %(cg)s", LOG.debug("Creating from cgsnapshot %(cg)s",
{'cg': self._cg_name_from_group(cgsnapshot)}) {'cg': self._cg_name_from_group(cgsnapshot)})
try: try:
self._create_consistencygroup(context, group) self._create_consistencygroup(context, cgname)
except Exception as e: except Exception as e:
LOG.error( LOG.error(
"Creating CG from cgsnapshot failed: %(details)s", "Creating CG from cgsnapshot failed: %(details)s",