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

Author: Zuul

openstackclient/common/quota.py

@@ -33,16 +33,15 @@
 
 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',
     'instances': 'instances',
     '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 @@
 ]
 
 NOVA_NETWORK_QUOTAS = {
+    'fixed_ips': 'fixed-ips',
     'floating_ips': 'floating-ips',
     'security_group_rules': 'secgroup-rules',
     'security_groups': 'secgroups',
@@ -405,7 +405,6 @@ def take_action(self, parsed_args):
             columns = (
                 'id',
                 'cores',
-                'fixed_ips',
                 'injected_files',
                 'injected_file_content_bytes',
                 'injected_file_path_bytes',
@@ -419,7 +418,6 @@ def take_action(self, parsed_args):
             column_headers = (
                 'Project ID',
                 'Cores',
-                'Fixed IPs',
                 'Injected Files',
                 'Injected File Content Bytes',
                 'Injected File Path Bytes',

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 @@ def setUp(self):
         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,