Fixup for Pure drivers cheesecake replication setup

We had a remnant of the past replication design left behind in the setup
methods which was causing the arrays to be setup with bi-directional
replication. With the switch to cheesecake we do not need the secondary
arrays to be replicating to the primary. This change removes the step
which would configure that.

Change-Id: I5a0472bec8ccdf3af1e7ce42163b42289b1810bb
Closes-Bug: #1556211

diff --git a/cinder/tests/unit/test_pure.py b/cinder/tests/unit/test_pure.py
index c6c94108631175066c18108a415da5186ac72eae..8900b468872562513f75bd3448493a905eff4532 100644 (file)
--- a/cinder/tests/unit/test_pure.py
+++ b/cinder/tests/unit/test_pure.py
@@ -496,8 +496,6 @@ class PureBaseVolumeDriverTestCase(PureBaseSharedDriverTestCase):
         self.assertEqual(self.array2,
                          self.driver._replication_target_arrays[0])
         calls = [
-            mock.call(self.array2, [self.array], 'cinder-group',
-                      REPLICATION_INTERVAL_IN_SEC, retention),
             mock.call(self.array, [self.array2], 'cinder-group',
                       REPLICATION_INTERVAL_IN_SEC, retention)
         ]

diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index ed39440ab5074dc23c5da7f171a99653acbcffcc..664bdebf8a399a45b4a028d243182371ebbdd120 100644 (file)
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -203,10 +203,6 @@ class PureBaseVolumeDriver(san.SanDriver):
                 target_array.array_id = target_array_info["id"]
                 LOG.debug("secondary array name: %s", target_array.array_name)
                 LOG.debug("secondary array id: %s", target_array.array_id)
-                self._setup_replicated_pgroups(target_array, [primary_array],
-                                               self._replication_pg_name,
-                                               self._replication_interval,
-                                               retention_policy)
                 self._replication_target_arrays.append(target_array)
         self._setup_replicated_pgroups(primary_array,
                                        self._replication_target_arrays,