NetApp eseries: report max_over_subscription_ratio correctly

The scheduler is looking for a key named
"max_over_subscription_ratio".

Closes-Bug: #1534240

Change-Id: I12f7a6ae8592bc8bc3b7fe70b2ff9cc947dc57d3

diff --git a/cinder/tests/unit/volume/drivers/netapp/eseries/test_library.py b/cinder/tests/unit/volume/drivers/netapp/eseries/test_library.py
index 66d6663d8a75067ede9fb5d59d7b71f7b9e85c57..ec8f842030736de32c04dfd50aa1af3dd934a1ba 100644 (file)
--- a/cinder/tests/unit/volume/drivers/netapp/eseries/test_library.py
+++ b/cinder/tests/unit/volume/drivers/netapp/eseries/test_library.py
@@ -453,7 +453,7 @@ class NetAppEseriesLibraryTestCase(test.TestCase):
         self.assertEqual(fake_pool['label'], pool_stats.get('pool_name'))
         self.assertEqual(reserved_pct, pool_stats['reserved_percentage'])
         self.assertEqual(over_subscription_ratio,
-                         pool_stats['max_oversubscription_ratio'])
+                         pool_stats['max_over_subscription_ratio'])
         self.assertEqual(total_gb, pool_stats.get('total_capacity_gb'))
         self.assertEqual(used_gb, pool_stats.get('provisioned_capacity_gb'))
         self.assertEqual(free_gb, pool_stats.get('free_capacity_gb'))

diff --git a/cinder/volume/drivers/netapp/eseries/library.py b/cinder/volume/drivers/netapp/eseries/library.py
index d4d15e0ef37670b5126cb6ca9290d1a93c843d37..fea03a0b47549953e4e8a18acfff17d6a4ff8019 100644 (file)
--- a/cinder/volume/drivers/netapp/eseries/library.py
+++ b/cinder/volume/drivers/netapp/eseries/library.py
@@ -990,7 +990,7 @@ class NetAppESeriesLibrary(object):
             cinder_pool["QoS_support"] = False
             cinder_pool["reserved_percentage"] = (
                 self.configuration.reserved_percentage)
-            cinder_pool["max_oversubscription_ratio"] = (
+            cinder_pool["max_over_subscription_ratio"] = (
                 self.configuration.max_over_subscription_ratio)
             tot_bytes = int(storage_pool.get("totalRaidedSpace", 0))
             used_bytes = int(storage_pool.get("usedSpace", 0))