From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 23 Jan 2016 05:57:28 +0000 (+0000)
Subject: Merge "Set LVM driver default overprovisioning ratio to 1.0"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cbc99485fca96c3b9c53cdc660011aab8bb4e294;p=openstack-build%2Fcinder-build.git

Merge "Set LVM driver default overprovisioning ratio to 1.0"
---

cbc99485fca96c3b9c53cdc660011aab8bb4e294
diff --cc cinder/tests/unit/test_volume.py
index 86ba29321,350580609..d3a5a230c
--- a/cinder/tests/unit/test_volume.py
+++ b/cinder/tests/unit/test_volume.py
@@@ -7365,8 -7374,28 +7366,28 @@@ class LVMVolumeDriverTestCase(DriverTes
          volume = tests_utils.create_volume(self.context, status='available',
                                             size=1, host=CONF.host)
          ret = self.volume.driver.unmanage(volume)
 -        self.assertEqual(ret, None)
 +        self.assertIsNone(ret)
  
+     # Global setting, LVM setting, expected outcome
+     @ddt.data((10.0, 2.0, 2.0))
+     @ddt.data((10.0, None, 10.0))
+     @ddt.unpack
+     def test_lvm_max_over_subscription_ratio(self,
+                                              global_value,
+                                              lvm_value,
+                                              expected_value):
+         configuration = conf.Configuration(fake_opt, 'fake_group')
+         configuration.max_over_subscription_ratio = global_value
+         configuration.lvm_max_over_subscription_ratio = lvm_value
+ 
+         fake_vg = mock.Mock(fake_lvm.FakeBrickLVM('cinder-volumes', False,
+                                                   None, 'default'))
+         lvm_driver = lvm.LVMVolumeDriver(configuration=configuration,
+                                          vg_obj=fake_vg, db=db)
+ 
+         self.assertEqual(expected_value,
+                          lvm_driver.configuration.max_over_subscription_ratio)
+ 
  
  class ISCSITestCase(DriverTestCase):
      """Test Case for ISCSIDriver"""