Merge "PowerMax Driver - Create vol suspend fix & DeviceID check"

2020-07-06 18:35:06 +00:00
parent 79dea7ed60 ee2d3189bd
commit a323a026f4
3 changed files with 332 additions and 104 deletions
--- a/cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_common.py
+++ b/cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_common.py
@@ -1213,6 +1213,26 @@ class PowerMaxCommonTest(test.TestCase):
        self.assertEqual(ref_response,
                         (volume_dict, rep_update, rep_info_dict))

+    @mock.patch.object(rest.PowerMaxRest, 'find_volume_device_id',
+                       return_value=tpd.PowerMaxData.device_id2)
+    @mock.patch.object(
+        common.PowerMaxCommon, '_create_non_replicated_volume',
+        return_value=deepcopy(tpd.PowerMaxData.provider_location))
+    @mock.patch.object(rest.PowerMaxRest, 'get_volume',
+                       return_value=tpd.PowerMaxData.volume_details[0])
+    def test_create_volume_update_returning_device_id(
+            self, mck_get, mck_create, mck_find):
+        volume = self.data.test_volume
+        volume_name = '1'
+        volume_size = self.data.test_volume.size
+        extra_specs = self.data.extra_specs
+        ref_response = (self.data.provider_location2, dict(), dict())
+        volume_dict, rep_update, rep_info_dict = (
+            self.common._create_volume(
+                volume, volume_name, volume_size, extra_specs))
+        self.assertEqual(ref_response,
+                         (volume_dict, rep_update, rep_info_dict))
+
    def test_create_volume_success_next_gen(self):
        volume = self.data.test_volume
        volume_name = '1'
@@ -1237,7 +1257,7 @@ class PowerMaxCommonTest(test.TestCase):
    @mock.patch.object(provision.PowerMaxProvision, 'create_volume_from_sg',
                       side_effect=exception.VolumeBackendAPIException(''))
    @mock.patch.object(common.PowerMaxCommon,
-                       '_cleanup_volume_create_post_failure')
+                       '_cleanup_non_rdf_volume_create_post_failure')
    @mock.patch.object(rest.PowerMaxRest, 'delete_storage_group')
    def test_create_volume_failed(self, mck_del, mck_cleanup, mck_create):
        volume = self.data.test_volume
@@ -1265,41 +1285,111 @@ class PowerMaxCommonTest(test.TestCase):
                              extra_specs)
            mck_del.assert_called_once()

-    @mock.patch.object(common.PowerMaxCommon, '_delete_from_srp')
    @mock.patch.object(common.PowerMaxCommon, 'cleanup_rdf_device_pair')
    @mock.patch.object(
        rest.PowerMaxRest, 'is_vol_in_rep_session', return_value=('', '', [
            {utils.RDF_GROUP_NO: tpd.PowerMaxData.rdf_group_no_1}]))
-    def test_cleanup_volume_create_post_failure_rdf_enabled(
-            self, mck_in, mck_clean, mck_del):
+    @mock.patch.object(rest.PowerMaxRest, 'srdf_resume_replication')
+    @mock.patch.object(utils.PowerMaxUtils, 'get_default_storage_group_name',
+                       return_value=tpd.PowerMaxData.storagegroup_name_f)
+    @mock.patch.object(common.PowerMaxCommon, 'prepare_replication_details',
+                       return_value=('', tpd.PowerMaxData.rep_extra_specs,
+                                     '', '',))
+    def test_cleanup_rdf_volume_create_post_failure_sync(
+            self, mck_prep, mck_sg, mck_resume, mck_sess, mck_clean):
        array = self.data.array
        volume = self.data.test_volume
        volume_name = self.data.test_volume.name
        extra_specs = deepcopy(self.data.extra_specs_rep_enabled)
        extra_specs[utils.REP_CONFIG] = self.data.rep_config_sync
+        extra_specs['rep_mode'] = utils.REP_SYNC
        devices = [self.data.device_id]
-        self.common._cleanup_volume_create_post_failure(
+        self.common._cleanup_rdf_volume_create_post_failure(
            volume, volume_name, extra_specs, devices)
-        mck_in.assert_called_once_with(array, self.data.device_id)
+        mck_prep.assert_called_once_with(extra_specs)
+        mck_sg.assert_called_once_with(
+            extra_specs['srp'], extra_specs['slo'], extra_specs['workload'],
+            False, True, extra_specs['rep_mode'])
+        mck_resume.assert_called_once_with(
+            array, self.data.storagegroup_name_f, self.data.rdf_group_no_1,
+            self.data.rep_extra_specs)
+        mck_sess.assert_called_once_with(array, self.data.device_id)
+        mck_clean.assert_called_once_with(
+            array, self.data.rdf_group_no_1, self.data.device_id, extra_specs)
+
+    @mock.patch.object(common.PowerMaxCommon, 'cleanup_rdf_device_pair')
+    @mock.patch.object(
+        rest.PowerMaxRest, 'is_vol_in_rep_session', return_value=('', '', [
+            {utils.RDF_GROUP_NO: tpd.PowerMaxData.rdf_group_no_1}]))
+    @mock.patch.object(rest.PowerMaxRest, 'srdf_resume_replication')
+    @mock.patch.object(utils.PowerMaxUtils, 'get_rdf_management_group_name',
+                       return_value=tpd.PowerMaxData.storagegroup_name_f)
+    @mock.patch.object(common.PowerMaxCommon, 'prepare_replication_details',
+                       return_value=('', tpd.PowerMaxData.rep_extra_specs,
+                                     '', '',))
+    def test_cleanup_rdf_volume_create_post_failure_non_sync(
+            self, mck_prep, mck_mgmt, mck_resume, mck_sess, mck_clean):
+        array = self.data.array
+        volume = self.data.test_volume
+        volume_name = self.data.test_volume.name
+        extra_specs = deepcopy(self.data.extra_specs_rep_enabled)
+        extra_specs[utils.REP_CONFIG] = self.data.rep_config_async
+        extra_specs['rep_mode'] = utils.REP_ASYNC
+        devices = [self.data.device_id]
+        self.common._cleanup_rdf_volume_create_post_failure(
+            volume, volume_name, extra_specs, devices)
+        mck_prep.assert_called_once_with(extra_specs)
+        mck_mgmt.assert_called_once_with(extra_specs[utils.REP_CONFIG])
+        mck_resume.assert_called_once_with(
+            array, self.data.storagegroup_name_f, self.data.rdf_group_no_1,
+            self.data.rep_extra_specs)
+        mck_sess.assert_called_once_with(array, self.data.device_id)
        mck_clean.assert_called_once_with(
            array, self.data.rdf_group_no_1, self.data.device_id, extra_specs)
-        mck_del.assert_called_once_with(
-            array, self.data.device_id, volume_name, extra_specs)

    @mock.patch.object(common.PowerMaxCommon, '_delete_from_srp')
    @mock.patch.object(masking.PowerMaxMasking, 'remove_and_reset_members')
-    @mock.patch.object(
-        rest.PowerMaxRest, 'is_vol_in_rep_session', return_value=('', '', ''))
-    def test_cleanup_volume_create_post_failure_rdf_disabled(
-            self, mck_in, mck_remove, mck_del):
+    @mock.patch.object(rest.PowerMaxRest, 'is_vol_in_rep_session',
+                       return_value=('', '', False))
+    @mock.patch.object(rest.PowerMaxRest, 'srdf_resume_replication')
+    @mock.patch.object(utils.PowerMaxUtils, 'get_rdf_management_group_name',
+                       return_value=tpd.PowerMaxData.storagegroup_name_f)
+    @mock.patch.object(common.PowerMaxCommon, 'prepare_replication_details',
+                       return_value=('', tpd.PowerMaxData.rep_extra_specs,
+                                     '', '',))
+    def test_cleanup_rdf_volume_create_post_failure_pre_rdf_establish(
+            self, mck_prep, mck_mgmt, mck_resume, mck_sess, mck_rem, mck_del):
+        array = self.data.array
+        volume = self.data.test_volume
+        volume_name = self.data.test_volume.name
+        extra_specs = deepcopy(self.data.extra_specs_rep_enabled)
+        extra_specs[utils.REP_CONFIG] = self.data.rep_config_sync
+        extra_specs['rep_mode'] = utils.REP_ASYNC
+        devices = [self.data.device_id]
+        self.common._cleanup_rdf_volume_create_post_failure(
+            volume, volume_name, extra_specs, devices)
+        mck_prep.assert_called_once_with(extra_specs)
+        mck_mgmt.assert_called_once_with(extra_specs[utils.REP_CONFIG])
+        mck_resume.assert_called_once_with(
+            array, self.data.storagegroup_name_f, self.data.rdf_group_no_1,
+            self.data.rep_extra_specs)
+        mck_sess.assert_called_once_with(array, self.data.device_id)
+        mck_rem.assert_called_once_with(array, volume, self.data.device_id,
+                                        volume_name, extra_specs, False)
+        mck_del.assert_called_once_with(array, self.data.device_id,
+                                        volume_name, extra_specs)
+
+    @mock.patch.object(common.PowerMaxCommon, '_delete_from_srp')
+    @mock.patch.object(masking.PowerMaxMasking, 'remove_and_reset_members')
+    def test_cleanup_non_rdf_volume_create_post_failure(
+            self, mck_remove, mck_del):
        array = self.data.array
        volume = self.data.test_volume
        volume_name = self.data.test_volume.name
        extra_specs = self.data.extra_specs
        devices = [self.data.device_id]
-        self.common._cleanup_volume_create_post_failure(
+        self.common._cleanup_non_rdf_volume_create_post_failure(
            volume, volume_name, extra_specs, devices)
-        mck_in.assert_called_once_with(array, self.data.device_id)
        mck_remove.assert_called_once_with(
            array, volume, self.data.device_id, volume_name, extra_specs,
            False)
--- a/cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_replication.py
+++ b/cinder/tests/unit/volume/drivers/dell_emc/powermax/test_powermax_replication.py
@@ -1174,6 +1174,41 @@ class PowerMaxReplicationTest(test.TestCase):
        mck_resume.assert_called_once_with(
            array, rdf_mgmt_grp, rdf_group_no, rep_extra_specs)

+    @mock.patch.object(rest.PowerMaxRest, 'srdf_resume_replication')
+    @mock.patch.object(
+        rest.PowerMaxRest, 'srdf_remove_device_pair_from_storage_group',
+        side_effect=exception.CinderException)
+    @mock.patch.object(
+        rest.PowerMaxRest, 'get_storage_groups_from_volume',
+        return_value=[tpd.PowerMaxData.storagegroup_name_f])
+    @mock.patch.object(
+        rest.PowerMaxRest, 'get_rdf_pair_volume',
+        return_value=tpd.PowerMaxData.rdf_group_vol_details)
+    @mock.patch.object(
+        common.PowerMaxCommon, '_get_replication_extra_specs',
+        return_value=tpd.PowerMaxData.rep_extra_specs)
+    @mock.patch.object(
+        common.PowerMaxCommon, 'get_rdf_details',
+        return_value=(tpd.PowerMaxData.rdf_group_no_1,
+                      tpd.PowerMaxData.remote_array))
+    def test_cleanup_rdf_device_pair_attempt_resume_on_exception(
+            self, mck_rdf, mck_rep, mck_pair, mck_sg, mck_rem, mck_resume):
+        array = self.data.array
+        rdf_group_no = self.data.rdf_group_no_1
+        device_id = self.data.device_id
+        extra_specs = deepcopy(self.data.rep_extra_specs)
+        extra_specs[utils.REP_MODE] = utils.REP_SYNC
+        extra_specs[utils.REP_CONFIG] = self.data.rep_config_sync
+        rep_extra_specs = self.common._get_replication_extra_specs(
+            extra_specs, extra_specs[utils.REP_CONFIG])
+        self.assertRaises(
+            exception.CinderException,
+            self.common.cleanup_rdf_device_pair, array, rdf_group_no,
+            device_id, extra_specs)
+        mck_resume.assert_called_once_with(
+            array, self.data.storagegroup_name_f, rdf_group_no,
+            rep_extra_specs, False)
+
    @mock.patch.object(
        rest.PowerMaxRest, 'get_num_vols_in_sg', return_value=1)
    @mock.patch.object(