Merge "Fix Quota Support for HMs"

This commit is contained in:
Jenkins 2016-09-19 08:46:06 +00:00 committed by Gerrit Code Review
commit 2fe7d76c00
3 changed files with 5 additions and 5 deletions
openstackclient
common
tests/unit
common
network/v2

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

@ -250,7 +250,7 @@ class TestQuotaSet(TestQuota):
'--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 @@ class TestQuotaSet(TestQuota):
('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 @@ class TestQuotaSet(TestQuota):
'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,

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