Merge "Fix quota-update issue in LBaaS"
This commit is contained in:
commit
e1cdba48f4
openstackclient
@ -74,8 +74,8 @@ NETWORK_QUOTAS = {
|
|||||||
'rbac_policy': 'rbac-policies',
|
'rbac_policy': 'rbac-policies',
|
||||||
'vip': 'vips',
|
'vip': 'vips',
|
||||||
'subnetpool': 'subnetpools',
|
'subnetpool': 'subnetpools',
|
||||||
'member': 'members',
|
|
||||||
'healthmonitor': 'health-monitors',
|
'healthmonitor': 'health-monitors',
|
||||||
|
'l7policy': 'l7policies',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -249,8 +249,8 @@ class TestQuotaSet(TestQuota):
|
|||||||
'--rbac-policies', str(network_fakes.QUOTA['rbac_policy']),
|
'--rbac-policies', str(network_fakes.QUOTA['rbac_policy']),
|
||||||
'--ports', str(network_fakes.QUOTA['port']),
|
'--ports', str(network_fakes.QUOTA['port']),
|
||||||
'--vips', str(network_fakes.QUOTA['vip']),
|
'--vips', str(network_fakes.QUOTA['vip']),
|
||||||
'--members', str(network_fakes.QUOTA['member']),
|
|
||||||
'--health-monitors', str(network_fakes.QUOTA['healthmonitor']),
|
'--health-monitors', str(network_fakes.QUOTA['healthmonitor']),
|
||||||
|
'--l7policies', str(network_fakes.QUOTA['l7policy']),
|
||||||
identity_fakes.project_name,
|
identity_fakes.project_name,
|
||||||
]
|
]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
@ -265,8 +265,8 @@ class TestQuotaSet(TestQuota):
|
|||||||
('rbac_policy', network_fakes.QUOTA['rbac_policy']),
|
('rbac_policy', network_fakes.QUOTA['rbac_policy']),
|
||||||
('port', network_fakes.QUOTA['port']),
|
('port', network_fakes.QUOTA['port']),
|
||||||
('vip', network_fakes.QUOTA['vip']),
|
('vip', network_fakes.QUOTA['vip']),
|
||||||
('member', network_fakes.QUOTA['member']),
|
|
||||||
('healthmonitor', network_fakes.QUOTA['healthmonitor']),
|
('healthmonitor', network_fakes.QUOTA['healthmonitor']),
|
||||||
|
('l7policy', network_fakes.QUOTA['l7policy']),
|
||||||
]
|
]
|
||||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||||
|
|
||||||
@ -283,8 +283,8 @@ class TestQuotaSet(TestQuota):
|
|||||||
'rbac_policy': network_fakes.QUOTA['rbac_policy'],
|
'rbac_policy': network_fakes.QUOTA['rbac_policy'],
|
||||||
'port': network_fakes.QUOTA['port'],
|
'port': network_fakes.QUOTA['port'],
|
||||||
'vip': network_fakes.QUOTA['vip'],
|
'vip': network_fakes.QUOTA['vip'],
|
||||||
'member': network_fakes.QUOTA['member'],
|
|
||||||
'healthmonitor': network_fakes.QUOTA['healthmonitor'],
|
'healthmonitor': network_fakes.QUOTA['healthmonitor'],
|
||||||
|
'l7policy': network_fakes.QUOTA['l7policy'],
|
||||||
}
|
}
|
||||||
self.network_mock.update_quota.assert_called_once_with(
|
self.network_mock.update_quota.assert_called_once_with(
|
||||||
identity_fakes.project_id,
|
identity_fakes.project_id,
|
||||||
|
@ -34,6 +34,7 @@ QUOTA = {
|
|||||||
"vip": 10,
|
"vip": 10,
|
||||||
"member": 10,
|
"member": 10,
|
||||||
"healthmonitor": 10,
|
"healthmonitor": 10,
|
||||||
|
"l7policy": 5,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user