]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Merge "Dell SC: Fix legacy bug, init_conn bug and REST API bug."
authorJenkins <jenkins@review.openstack.org>
Sat, 25 Jul 2015 04:40:31 +0000 (04:40 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 25 Jul 2015 04:40:31 +0000 (04:40 +0000)
1  2 
cinder/tests/unit/test_dellscapi.py
cinder/volume/drivers/dell/dell_storagecenter_api.py

Simple merge
index 1e985b52b4673a1cd4826fb12b39684dba0fc1c9,cd56cfb7d63b7a481a6a31fe0621beef9cd8a0c4..b538d569c9c23444949770951f7a46218b8f6fa3
@@@ -1838,11 -1918,8 +2005,12 @@@ class StorageCenterApi(object)
                         expiration.
          :returns: Dell SC replay object.
          '''
+         self.cg_except_on_no_support()
          if profile:
 +            # We have to make sure these are snappable.
 +            self._init_cg_volumes(self._get_id(profile))
 +
 +            # Succeed or fail we soldier on.
              payload = {}
              payload['description'] = replayid
              payload['expireTime'] = expire