From 47b2de19ab1ec0aaed5b1b823e14b81b1e19bcb6 Mon Sep 17 00:00:00 2001 From: Isaac Beckman Date: Mon, 12 Jun 2017 13:50:28 +0300 Subject: [PATCH] IBM-Storage: group-create-from-src fail with error create group-create-from-src --group-snapshot fails due to wrong parameter passed to function Change-Id: I61430c62bda505e620f99b06ed17469ecf41e7dc Closes-Bug: 1697414 --- cinder/tests/unit/volume/drivers/ibm/test_xiv_proxy.py | 4 ++-- cinder/volume/drivers/ibm/ibm_storage/xiv_proxy.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/ibm/test_xiv_proxy.py b/cinder/tests/unit/volume/drivers/ibm/test_xiv_proxy.py index ea8aeb51db1..55831c6ca25 100644 --- a/cinder/tests/unit/volume/drivers/ibm/test_xiv_proxy.py +++ b/cinder/tests/unit/volume/drivers/ibm/test_xiv_proxy.py @@ -1315,8 +1315,8 @@ class XIVProxyTest(test.TestCase): {}, group_obj, [volume], cgsnap_group_obj, [snapshot], None, None) - p.ibm_storage_cli.cmd.cg_create.assert_called_once_with(cg=group_obj, - pool='WTF32') + p.ibm_storage_cli.cmd.cg_create.assert_called_once_with( + cg=p._cg_name_from_id(group_obj.id), pool='WTF32') self.assertEqual('available', model_update['status']) diff --git a/cinder/volume/drivers/ibm/ibm_storage/xiv_proxy.py b/cinder/volume/drivers/ibm/ibm_storage/xiv_proxy.py index 4044cbed8e4..fdd84f526e3 100644 --- a/cinder/volume/drivers/ibm/ibm_storage/xiv_proxy.py +++ b/cinder/volume/drivers/ibm/ibm_storage/xiv_proxy.py @@ -1746,7 +1746,7 @@ class XIVProxy(proxy.IBMStorageProxy): LOG.debug("Creating from cgsnapshot %(cg)s", {'cg': self._cg_name_from_group(cgsnapshot)}) try: - self._create_consistencygroup(context, group) + self._create_consistencygroup(context, cgname) except Exception as e: LOG.error( "Creating CG from cgsnapshot failed: %(details)s",