Merge "Fix Quota Support for HMs"

Author: Jenkins

openstackclient/common/quota.py

@@ -75,7 +75,7 @@
     'vip': 'vips',
     'subnetpool': 'subnetpools',
     'member': 'members',
-    'health_monitor': 'health-monitors',
+    'healthmonitor': 'health-monitors',
 }
 
 

openstackclient/tests/unit/common/test_quota.py

@@ -250,7 +250,7 @@ def test_quota_set_network(self):
             '--ports', str(network_fakes.QUOTA['port']),
             '--vips', str(network_fakes.QUOTA['vip']),
             '--members', str(network_fakes.QUOTA['member']),
-            '--health-monitors', str(network_fakes.QUOTA['health_monitor']),
+            '--health-monitors', str(network_fakes.QUOTA['healthmonitor']),
             identity_fakes.project_name,
         ]
         verifylist = [
@@ -266,7 +266,7 @@ def test_quota_set_network(self):
             ('port', network_fakes.QUOTA['port']),
             ('vip', network_fakes.QUOTA['vip']),
             ('member', network_fakes.QUOTA['member']),
-            ('health_monitor', network_fakes.QUOTA['health_monitor']),
+            ('healthmonitor', network_fakes.QUOTA['healthmonitor']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -284,7 +284,7 @@ def test_quota_set_network(self):
             'port': network_fakes.QUOTA['port'],
             'vip': network_fakes.QUOTA['vip'],
             'member': network_fakes.QUOTA['member'],
-            'health_monitor': network_fakes.QUOTA['health_monitor'],
+            'healthmonitor': network_fakes.QUOTA['healthmonitor'],
         }
         self.network_mock.update_quota.assert_called_once_with(
             identity_fakes.project_id,

openstackclient/tests/unit/network/v2/fakes.py

@@ -33,7 +33,7 @@
     "port": 50,
     "vip": 10,
     "member": 10,
-    "health_monitor": 10,
+    "healthmonitor": 10,
 }