Merge "Adds v2 replication support"1.5.0

2 files changed, 25 insertions, 0 deletions

diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py
index f641ee7..b0c78b9 100644
--- a/cinderclient/tests/unit/v2/fakes.py
+++ b/cinderclient/tests/unit/v2/fakes.py
@@ -437,6 +437,14 @@ class FakeHTTPClient(base_client.HTTPClient):
         elif action == 'os-migrate_volume':
             assert 'host' in body[action]
             assert 'force_host_copy' in body[action]
+        elif action == 'os-enable_replication':
+            assert body[action] is None
+        elif action == 'os-disable_replication':
+            assert body[action] is None
+        elif action == 'os-list_replication_targets':
+            assert body[action] is None
+        elif action == 'os-failover_replication':
+            assert 'secondary' in body[action]
         elif action == 'os-update_readonly_flag':
             assert list(body[action]) == ['readonly']
         elif action == 'os-retype':
diff --git a/cinderclient/tests/unit/v2/test_shell.py b/cinderclient/tests/unit/v2/test_shell.py
index 42c3dc7..1c140cb 100644
--- a/cinderclient/tests/unit/v2/test_shell.py
+++ b/cinderclient/tests/unit/v2/test_shell.py
@@ -794,6 +794,23 @@ class ShellTest(utils.TestCase):
         self.assert_called('POST', '/volumes/1234/action',
                            body=expected)
 
+    def test_replication_enable(self):
+        self.run_command('replication-enable 1234')
+        self.assert_called('POST', '/volumes/1234/action')
+
+    def test_replication_disable(self):
+        self.run_command('replication-disable 1234')
+        self.assert_called('POST', '/volumes/1234/action')
+
+    def test_replication_list_targets(self):
+        self.run_command('replication-list-targets 1234')
+        self.assert_called('POST', '/volumes/1234/action')
+
+    def test_replication_failover(self):
+        self.run_command('replication-failover 1234 target')
+        expected = {'os-failover_replication': {'secondary': 'target'}}
+        self.assert_called('POST', '/volumes/1234/action', body=expected)
+
     def test_snapshot_metadata_set(self):
         self.run_command('snapshot-metadata 1234 set key1=val1 key2=val2')
         self.assert_called('POST', '/snapshots/1234/metadata',