Merge "Retype issue in Kaminario Cinder drivers"

This commit is contained in:
Jenkins 2016-08-25 08:27:58 +00:00 committed by Gerrit Code Review
commit f3d62bbb18
3 changed files with 8 additions and 2 deletions

View File

@ -400,7 +400,7 @@ class TestKaminarioISCSI(test.TestCase):
backend_ip, res_volumes = self.driver.failover_host(None, volumes)
self.assertEqual('10.0.0.2', backend_ip)
status = res_volumes[0]['updates']['replication_status']
self.assertEqual(fields.ReplicationStatus.ENABLED, status)
self.assertEqual(fields.ReplicationStatus.DISABLED, status)
def test_delete_volume_replica(self):
"""Test _delete_volume_replica."""

View File

@ -499,7 +499,7 @@ class KaminarioCinderDriver(cinder.volume.driver.ISCSIDriver):
src_ssn.save()
LOG.debug("The target session: %s state is "
"changed to in sync", session_name)
rep_status = fields.ReplicationStatus.ENABLED
rep_status = fields.ReplicationStatus.DISABLED
volume_updates.append({'volume_id': v['id'],
'updates':
{'replication_status': rep_status}})

View File

@ -0,0 +1,6 @@
---
fixes:
- Fixed retyping 'dedup volume without replication' <->
'nodedup volume without replication' after replication failback and
removing replication for a replicated volume in Kaminario iSCSI and
FC Cinder Drivers.