From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 28 Jun 2015 14:27:10 +0000 (+0000)
Subject: Merge "Make VNX Cinder Driver aware of VNX Pool Full Threshold"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=18563cb928c2e2308aa3f57d80dfe332bbe3cc12;p=openstack-build%2Fcinder-build.git

Merge "Make VNX Cinder Driver aware of VNX Pool Full Threshold"
---

18563cb928c2e2308aa3f57d80dfe332bbe3cc12
diff --cc cinder/tests/unit/test_emc_vnxdirect.py
index edcaff66d,a16e1e861..9d1eb7c3e
--- a/cinder/tests/unit/test_emc_vnxdirect.py
+++ b/cinder/tests/unit/test_emc_vnxdirect.py
@@@ -1990,10 -2046,10 +2047,10 @@@ Time Remaining:  0 second(s
                            self.driver.create_volume,
                            self.testData.test_failed_volume)
          expect_cmd = [mock.call(*self.testData.LUN_CREATION_CMD(
-             'failed_vol1', 1, 'unit_test_pool', None, None, False))]
+             'failed_vol1', 1, 'unit_test_pool', None, None, poll=False))]
          fake_cli.assert_has_calls(expect_cmd)
  
 -    @mock.patch('cinder.openstack.common.loopingcall.FixedIntervalLoopingCall',
 +    @mock.patch('oslo_service.loopingcall.FixedIntervalLoopingCall',
                  new=utils.ZeroIntervalLoopingCall)
      def test_create_faulted_volume(self):
          volume_name = 'faulted_volume'
@@@ -2100,9 -2156,19 +2157,19 @@@
                        poll=True),
              mock.call(*self.testData.MIGRATION_VERIFY_CMD(1),
                        poll=True)]
-         fake_cli.assert_has_calls(expect_cmd)
+         fake_cli1.assert_has_calls(expect_cmd1)
+ 
+         self.configuration.ignore_pool_full_threshold = True
+         fake_cli2 = self.driverSetup(commands, results)
+         self.driver.create_volume_from_snapshot(self.testData.test_volume2,
+                                                 self.testData.test_snapshot)
+         expect_cmd2 = [
+             mock.call(*self.testData.LUN_CREATION_CMD(
+                 'vol2_dest', 1, 'unit_test_pool', None, None,
+                 ignore_thresholds=True))]
+         fake_cli2.assert_has_calls(expect_cmd2)
  
 -    @mock.patch('cinder.openstack.common.loopingcall.FixedIntervalLoopingCall',
 +    @mock.patch('oslo_service.loopingcall.FixedIntervalLoopingCall',
                  new=utils.ZeroIntervalLoopingCall)
      def test_create_volume_from_snapshot_sync_failed(self):