diff --git 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 index 7e1f9384543..1e486156320 100644 --- 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 @@ -2774,11 +2774,13 @@ class PowerMaxCommonTest(test.TestCase): snapshots)) self.assertEqual(ref_model_update, model_update) - def test_delete_group_snapshot_failed(self): - group_snapshot = self.data.test_group_snapshot_failed + @mock.patch.object(common.PowerMaxCommon, '_find_volume_group', + return_value=None) + def test_delete_group_snapshot_not_on_array(self, mock_gvg): + group_snapshot = self.data.test_group_snapshot_1 snapshots = [] ref_model_update = ( - {'status': fields.GroupSnapshotStatus.ERROR_DELETING}) + {'status': fields.GroupSnapshotStatus.DELETED}) with mock.patch.object(volume_utils, 'is_group_a_cg_snapshot_type', return_value=True): model_update, snapshots_model_update = ( diff --git a/cinder/volume/drivers/dell_emc/powermax/common.py b/cinder/volume/drivers/dell_emc/powermax/common.py index 2d7ff329bc4..375731f52c1 100644 --- a/cinder/volume/drivers/dell_emc/powermax/common.py +++ b/cinder/volume/drivers/dell_emc/powermax/common.py @@ -6003,14 +6003,13 @@ class PowerMaxCommon(object): if volume_group and volume_group.get('name'): vol_grp_name = volume_group['name'] if vol_grp_name is None: - exception_message = ( - _("Cannot find generic volume group %(grp_id)s.") % - {'group_id': source_group.id}) - raise exception.VolumeBackendAPIException( - message=exception_message) - - self.provision.delete_group_replica( - array, snap_name, vol_grp_name) + LOG.warning("Cannot find generic volume group %(grp_ss_id)s. " + "on array %(array)s", + {'grp_ss_id': group_snapshot.id, + 'array': array}) + else: + self.provision.delete_group_replica( + array, snap_name, vol_grp_name) model_update = {'status': fields.GroupSnapshotStatus.DELETED} for snapshot in snapshots: