openstack/python-openstackclient
Code Issues Proposed changes

Merge "quota: Move nova-network-related quota"

Browse Source
This commit is contained in:
Zuul 2024-07-15 16:02:25 +00:00 committed by Gerrit Code Review
commit cf81902402
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstackclient/common/quota.py
View File

@ -33,7 +33,6 @@ LOG = logging.getLogger(__name__)
COMPUTE_QUOTAS = { COMPUTE_QUOTAS = {
'cores': 'cores', 'cores': 'cores',
'fixed_ips': 'fixed-ips',
'injected_file_content_bytes': 'injected-file-size', 'injected_file_content_bytes': 'injected-file-size',
'injected_file_path_bytes': 'injected-path-size', 'injected_file_path_bytes': 'injected-path-size',
'injected_files': 'injected-files', 'injected_files': 'injected-files',
@ -41,8 +40,8 @@ COMPUTE_QUOTAS = {
'key_pairs': 'key-pairs', 'key_pairs': 'key-pairs',
'metadata_items': 'properties', 'metadata_items': 'properties',
'ram': 'ram', 'ram': 'ram',
'server_groups': 'server-groups',
'server_group_members': 'server-group-members', 'server_group_members': 'server-group-members',
'server_groups': 'server-groups',
} }
VOLUME_QUOTAS = { VOLUME_QUOTAS = {
@ -61,6 +60,7 @@ IMPACT_VOLUME_TYPE_QUOTAS = [
] ]
NOVA_NETWORK_QUOTAS = { NOVA_NETWORK_QUOTAS = {
'fixed_ips': 'fixed-ips',
'floating_ips': 'floating-ips', 'floating_ips': 'floating-ips',
'security_group_rules': 'secgroup-rules', 'security_group_rules': 'secgroup-rules',
'security_groups': 'secgroups', 'security_groups': 'secgroups',
@ -405,7 +405,6 @@ class ListQuota(command.Lister):
columns = ( columns = (
'id', 'id',
'cores', 'cores',
'fixed_ips',
'injected_files', 'injected_files',
'injected_file_content_bytes', 'injected_file_content_bytes',
'injected_file_path_bytes', 'injected_file_path_bytes',
@ -419,7 +418,6 @@ class ListQuota(command.Lister):
column_headers = ( column_headers = (
'Project ID', 'Project ID',
'Cores', 'Cores',
'Fixed IPs',
'Injected Files', 'Injected Files',
'Injected File Content Bytes', 'Injected File Content Bytes',
'Injected File Path Bytes', 'Injected File Path Bytes',

2
openstackclient/tests/unit/common/test_quota.py
View File

@ -73,7 +73,6 @@ class TestQuotaList(TestQuota):
compute_column_header = ( compute_column_header = (
'Project ID', 'Project ID',
'Cores', 'Cores',
'Fixed IPs',
'Injected Files', 'Injected Files',
'Injected File Content Bytes', 'Injected File Content Bytes',
'Injected File Path Bytes', 'Injected File Path Bytes',
@ -130,7 +129,6 @@ class TestQuotaList(TestQuota):
self.compute_reference_data = ( self.compute_reference_data = (
self.projects[0].id, self.projects[0].id,
self.compute_quotas[0].cores, self.compute_quotas[0].cores,
self.compute_quotas[0].fixed_ips,
self.compute_quotas[0].injected_files, self.compute_quotas[0].injected_files,
self.compute_quotas[0].injected_file_content_bytes, self.compute_quotas[0].injected_file_content_bytes,
self.compute_quotas[0].injected_file_path_bytes, self.compute_quotas[0].injected_file_path_bytes,