From f5f543b8de67362339a957e10e98c3d111f779e9 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <stephenfin@redhat.com>
Date: Wed, 10 Jul 2024 11:22:27 +0100
Subject: [PATCH] quota: Move nova-network-related quota
This was incorrectly grouped as a general compute quota, when in fact
it's a nova-network quota. Move it.
Change-Id: If93c95bc181ab766137b61943a09821810345300
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
---
openstackclient/common/quota.py | 6 ++----
openstackclient/tests/unit/common/test_quota.py | 2 --
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py
index 78688dfa8d..4eb44b393e 100644
--- a/openstackclient/common/quota.py
+++ b/openstackclient/common/quota.py
@@ -33,7 +33,6 @@ LOG = logging.getLogger(__name__)
COMPUTE_QUOTAS = {
'cores': 'cores',
- 'fixed_ips': 'fixed-ips',
'injected_file_content_bytes': 'injected-file-size',
'injected_file_path_bytes': 'injected-path-size',
'injected_files': 'injected-files',
@@ -41,8 +40,8 @@ COMPUTE_QUOTAS = {
'key_pairs': 'key-pairs',
'metadata_items': 'properties',
'ram': 'ram',
- 'server_groups': 'server-groups',
'server_group_members': 'server-group-members',
+ 'server_groups': 'server-groups',
}
VOLUME_QUOTAS = {
@@ -61,6 +60,7 @@ IMPACT_VOLUME_TYPE_QUOTAS = [
]
NOVA_NETWORK_QUOTAS = {
+ 'fixed_ips': 'fixed-ips',
'floating_ips': 'floating-ips',
'security_group_rules': 'secgroup-rules',
'security_groups': 'secgroups',
@@ -405,7 +405,6 @@ class ListQuota(command.Lister):
columns = (
'id',
'cores',
- 'fixed_ips',
'injected_files',
'injected_file_content_bytes',
'injected_file_path_bytes',
@@ -419,7 +418,6 @@ class ListQuota(command.Lister):
column_headers = (
'Project ID',
'Cores',
- 'Fixed IPs',
'Injected Files',
'Injected File Content Bytes',
'Injected File Path Bytes',
diff --git a/openstackclient/tests/unit/common/test_quota.py b/openstackclient/tests/unit/common/test_quota.py
index 7edddbb19a..b07d6e015c 100644
--- a/openstackclient/tests/unit/common/test_quota.py
+++ b/openstackclient/tests/unit/common/test_quota.py
@@ -73,7 +73,6 @@ class TestQuotaList(TestQuota):
compute_column_header = (
'Project ID',
'Cores',
- 'Fixed IPs',
'Injected Files',
'Injected File Content Bytes',
'Injected File Path Bytes',
@@ -130,7 +129,6 @@ class TestQuotaList(TestQuota):
self.compute_reference_data = (
self.projects[0].id,
self.compute_quotas[0].cores,
- self.compute_quotas[0].fixed_ips,
self.compute_quotas[0].injected_files,
self.compute_quotas[0].injected_file_content_bytes,
self.compute_quotas[0].injected_file_path_bytes,