openstack/python-cinderclient
Code Issues Proposed changes

Merge "Cleanup for Replication v2: remove 'replication-promote'"

Browse Source
This commit is contained in:
Jenkins
2016-03-16 18:15:23 +00:00
committed by Gerrit Code Review
parent 9261687395 9685009da2
commit cd4e28ac11
5 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cinderclient/tests/unit/v2/fakes.py
View File

@@ -455,8 +455,6 @@ class FakeHTTPClient(base_client.HTTPClient):
assert list(body[action]) == ['bootable'] assert list(body[action]) == ['bootable']
elif action == 'os-unmanage': elif action == 'os-unmanage':
assert body[action] is None assert body[action] is None
elif action == 'os-promote-replica':
assert body[action] is None
elif action == 'os-reenable-replica': elif action == 'os-reenable-replica':
assert body[action] is None assert body[action] is None
elif action == 'os-set_image_metadata': elif action == 'os-set_image_metadata':
@@ -1087,9 +1085,6 @@ class FakeHTTPClient(base_client.HTTPClient):
snapshot.update(kw['body']['snapshot']) snapshot.update(kw['body']['snapshot'])
return (202, {}, {'snapshot': snapshot}) return (202, {}, {'snapshot': snapshot})
def post_os_promote_replica_1234(self, **kw):
return (202, {}, {})
def post_os_reenable_replica_1234(self, **kw): def post_os_reenable_replica_1234(self, **kw):
return (202, {}, {}) return (202, {}, {})

5
cinderclient/tests/unit/v2/test_shell.py
View File

@@ -1029,11 +1029,6 @@ class ShellTest(utils.TestCase):
self.assert_called('POST', '/volumes/1234/action', self.assert_called('POST', '/volumes/1234/action',
body={'os-unmanage': None}) body={'os-unmanage': None})
def test_replication_promote(self):
self.run_command('replication-promote 1234')
self.assert_called('POST', '/volumes/1234/action',
body={'os-promote-replica': None})
def test_replication_reenable(self): def test_replication_reenable(self):
self.run_command('replication-reenable 1234') self.run_command('replication-reenable 1234')
self.assert_called('POST', '/volumes/1234/action', self.assert_called('POST', '/volumes/1234/action',

8
cinderclient/tests/unit/v2/test_volumes.py
View File

@@ -281,14 +281,6 @@ class VolumesTest(utils.TestCase):
cs.assert_called('POST', '/os-snapshot-manage', {'snapshot': expected}) cs.assert_called('POST', '/os-snapshot-manage', {'snapshot': expected})
self._assert_request_id(vol) self._assert_request_id(vol)
def test_replication_promote(self):
v = cs.volumes.get('1234')
self._assert_request_id(v)
vol = cs.volumes.promote(v)
cs.assert_called('POST', '/volumes/1234/action',
{'os-promote-replica': None})
self._assert_request_id(vol)
def test_replication_reenable(self): def test_replication_reenable(self):
v = cs.volumes.get('1234') v = cs.volumes.get('1234')
self._assert_request_id(v) self._assert_request_id(v)

11
cinderclient/v2/shell.py
View File

@@ -2236,17 +2236,6 @@ def do_unmanage(cs, args):
cs.volumes.unmanage(volume.id) cs.volumes.unmanage(volume.id)
@utils.arg('volume', metavar='<volume>',
help='Name or ID of the volume to promote. '
'The volume should have the replica volume created with '
'source-replica argument.')
@utils.service_type('volumev2')
def do_replication_promote(cs, args):
"""Promote a secondary volume to primary for a relationship."""
volume = utils.find_volume(cs, args.volume)
cs.volumes.promote(volume.id)
@utils.arg('volume', metavar='<volume>', @utils.arg('volume', metavar='<volume>',
help='Name or ID of the volume to reenable replication. ' help='Name or ID of the volume to reenable replication. '
'The replication-status of the volume should be inactive.') 'The replication-status of the volume should be inactive.')

4
cinderclient/v2/volumes.py
View File

@@ -587,10 +587,6 @@ class VolumeManager(base.ManagerWithFind):
"""Unmanage a volume.""" """Unmanage a volume."""
return self._action('os-unmanage', volume, None) return self._action('os-unmanage', volume, None)
def promote(self, volume):
"""Promote secondary to be primary in relationship."""
return self._action('os-promote-replica', volume, None)
def reenable(self, volume): def reenable(self, volume):
"""Sync the secondary volume with primary for a relationship.""" """Sync the secondary volume with primary for a relationship."""
return self._action('os-reenable-replica', volume, None) return self._action('os-reenable-replica', volume, None)