From: Vincent Hou <shou@us.ibm.com>
Date: Fri, 11 Mar 2016 21:25:18 +0000 (-0500)
Subject: Add the key 'replication' and set the correct 'replication_status'
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1ed4d2d2fb1906c10c50fbd5af048d1d02f86be2;p=openstack-build%2Fcinder-build.git

Add the key 'replication' and set the correct 'replication_status'

This patch fixes the minor issues following the implementation
of replication v2.1 for storwize driver. It adds the key
'replication' to make sure of that the cinder-volume service
can have a successful restart and sets the 'replication_status
'back to enabled for failback.

Change-Id: I1ddb715e72336378434b7ee5ffe617cbb94cd16b
Closes-Bug: #1556285
---

diff --git a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
index 5bd6af51d..8f50e5a39 100644
--- a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
@@ -2535,7 +2535,7 @@ class StorwizeSVCCommonDriver(san.SanDriver,
                 replication.replication_failback(volume)
                 volume_update_list.append(
                     {'volume_id': volume['id'],
-                     'updates': {'replication_status': 'available'}})
+                     'updates': {'replication_status': 'enabled'}})
             else:
                 volume_update_list.append(
                     {'volume_id': volume['id'],
@@ -3103,6 +3103,7 @@ class StorwizeSVCCommonDriver(san.SanDriver,
         data['pools'] = [self._build_pool_stats(pool)
                          for pool in
                          self.configuration.storwize_svc_volpool_name]
+        data['replication'] = self._replication_enabled
         data['replication_enabled'] = self._replication_enabled
         data['replication_targets'] = self._get_replication_targets(),
         self._stats = data