From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 17 Mar 2016 02:52:41 +0000 (+0000)
Subject: Merge "Rework Storwize/SVC protocol to fix add_vdisk_copy"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=76a19863df3fe81359a669f7867cbb095a1ffbcd;p=openstack-build%2Fcinder-build.git

Merge "Rework Storwize/SVC protocol to fix add_vdisk_copy"
---

76a19863df3fe81359a669f7867cbb095a1ffbcd
diff --cc cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
index 02191efd6,57380f4cd..f5e43d96d
--- a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py
@@@ -1946,20 -1776,8 +1942,21 @@@ class StorwizeSVCCommonDriver(san.SanDr
              self._vdiskcopyops_loop = loopingcall.FixedIntervalLoopingCall(
                  self._check_volume_copy_ops)
              self._vdiskcopyops_loop.start(interval=self.VDISKCOPYOPS_INTERVAL)
+         LOG.debug('leave: do_setup')
  
 +        # v2 replication setup
 +        self._do_replication_setup()
 +
 +    def _validate_pools_exist(self):
 +        # Validate that the pool exists
 +        pools = self.configuration.storwize_svc_volpool_name
 +        for pool in pools:
 +            try:
 +                self._helpers.get_pool_attrs(pool)
 +            except exception.VolumeBackendAPIException:
 +                msg = _('Failed getting details for pool %s.') % pool
 +                raise exception.InvalidInput(reason=msg)
 +
      def check_for_setup_error(self):
          """Ensure that the flags are set properly."""
          LOG.debug('enter: check_for_setup_error')