From b18e79c09bcaea86b3f8470c909664e5fe940682 Mon Sep 17 00:00:00 2001
From: yanpuqing <yanpq@awcloud.com>
Date: Tue, 19 Jun 2018 05:13:48 -0400
Subject: [PATCH] Delete the LB object quotas set command in openstackclient
Setting octavia quotas should use "openstack loadbalancer quota set", not
"openstack quota set". The vip parameter had be removed from octavia.
The patch removes '--vips', '--health-monitors', '--l7policies' parameter
in "openstack quota set" command.
Change-Id: Id0046195aa93bae62264d9de7d123cf63bd0fb7e
Task: 19657
Story: 2002016
---
doc/source/cli/command-objects/quota.rst | 3 ---
openstackclient/common/quota.py | 3 ---
openstackclient/tests/unit/common/test_quota.py | 9 ---------
3 files changed, 15 deletions(-)
diff --git a/doc/source/cli/command-objects/quota.rst b/doc/source/cli/command-objects/quota.rst
index f39536af8e..126b210c4c 100644
--- a/doc/source/cli/command-objects/quota.rst
+++ b/doc/source/cli/command-objects/quota.rst
@@ -70,10 +70,7 @@ Set quotas for project
[--ports <num-ports>]
[--routers <num-routers>]
[--rbac-policies <num-rbac-policies>]
- [--vips <num-vips>]
[--subnetpools <num-subnetpools>]
- [--members <num-members>]
- [--health-monitors <num-health-monitors>]
<project>
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py
index 282ea4284d..1027859acd 100644
--- a/openstackclient/common/quota.py
+++ b/openstackclient/common/quota.py
@@ -75,10 +75,7 @@ NETWORK_QUOTAS = {
'port': 'ports',
'router': 'routers',
'rbac_policy': 'rbac-policies',
- 'vip': 'vips',
'subnetpool': 'subnetpools',
- 'healthmonitor': 'health-monitors',
- 'l7policy': 'l7policies',
}
NETWORK_KEYS = ['floating_ips', 'networks', 'rbac_policies', 'routers',
diff --git a/openstackclient/tests/unit/common/test_quota.py b/openstackclient/tests/unit/common/test_quota.py
index 1a3da31d78..fc975b980d 100644
--- a/openstackclient/tests/unit/common/test_quota.py
+++ b/openstackclient/tests/unit/common/test_quota.py
@@ -644,9 +644,6 @@ class TestQuotaSet(TestQuota):
'--routers', str(network_fakes.QUOTA['router']),
'--rbac-policies', str(network_fakes.QUOTA['rbac_policy']),
'--ports', str(network_fakes.QUOTA['port']),
- '--vips', str(network_fakes.QUOTA['vip']),
- '--health-monitors', str(network_fakes.QUOTA['healthmonitor']),
- '--l7policies', str(network_fakes.QUOTA['l7policy']),
self.projects[0].name,
]
verifylist = [
@@ -660,9 +657,6 @@ class TestQuotaSet(TestQuota):
('router', network_fakes.QUOTA['router']),
('rbac_policy', network_fakes.QUOTA['rbac_policy']),
('port', network_fakes.QUOTA['port']),
- ('vip', network_fakes.QUOTA['vip']),
- ('healthmonitor', network_fakes.QUOTA['healthmonitor']),
- ('l7policy', network_fakes.QUOTA['l7policy']),
('project', self.projects[0].name),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -679,9 +673,6 @@ class TestQuotaSet(TestQuota):
'router': network_fakes.QUOTA['router'],
'rbac_policy': network_fakes.QUOTA['rbac_policy'],
'port': network_fakes.QUOTA['port'],
- 'vip': network_fakes.QUOTA['vip'],
- 'healthmonitor': network_fakes.QUOTA['healthmonitor'],
- 'l7policy': network_fakes.QUOTA['l7policy'],
}
self.network_mock.update_quota.assert_called_once_with(
self.projects[0].id,