typing: Indicate tuples to be extended

Change-Id: Ie5907de8d60f2f39e98f6a88227cebb2e2ff565c
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/common/availability_zone.py

@@ -172,17 +172,14 @@ def _get_network_availability_zones(self, parsed_args):
         return result
 
     def take_action(self, parsed_args):
+        columns: tuple[str, ...] = ('Zone Name', 'Zone Status')
         if parsed_args.long:
-            columns = (
-                'Zone Name',
-                'Zone Status',
+            columns += (
                 'Zone Resource',
                 'Host Name',
                 'Service Name',
                 'Service Status',
             )
-        else:
-            columns = ('Zone Name', 'Zone Status')
 
         # Show everything by default.
         show_all = (

openstackclient/common/extension.py

@@ -73,17 +73,9 @@ def get_parser(self, prog_name):
         return parser
 
     def take_action(self, parsed_args):
+        columns: tuple[str, ...] = ('Name', 'Alias', 'Description')
         if parsed_args.long:
-            columns = (
-                'Name',
-                'Alias',
-                'Description',
-                'Namespace',
-                'Updated At',
-                'Links',
-            )
-        else:
-            columns = ('Name', 'Alias', 'Description')
+            columns += ('Namespace', 'Updated At', 'Links')
 
         data = []
 

openstackclient/common/quota.py

@@ -290,7 +290,7 @@ def _list_quota_compute(self, parsed_args, project_ids):
             if default_result != project_result:
                 result += project_result
 
-        columns = (
+        columns: tuple[str, ...] = (
             'id',
             'cores',
             'injected_files',
@@ -303,7 +303,7 @@ def _list_quota_compute(self, parsed_args, project_ids):
             'server_groups',
             'server_group_members',
         )
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             'Project ID',
             'Cores',
             'Injected Files',
@@ -352,7 +352,7 @@ def _list_quota_volume(self, parsed_args, project_ids):
             if default_result != project_result:
                 result += project_result
 
-        columns = (
+        columns: tuple[str, ...] = (
             'id',
             'backups',
             'backup_gigabytes',
@@ -361,7 +361,7 @@ def _list_quota_volume(self, parsed_args, project_ids):
             'snapshots',
             'volumes',
         )
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             'Project ID',
             'Backups',
             'Backup Gigabytes',
@@ -407,7 +407,7 @@ def _list_quota_network(self, parsed_args, project_ids):
             if default_result != project_result:
                 result += project_result
 
-        columns = (
+        columns: tuple[str, ...] = (
             'id',
             'floating_ips',
             'networks',
@@ -419,7 +419,7 @@ def _list_quota_network(self, parsed_args, project_ids):
             'subnets',
             'subnet_pools',
         )
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             'Project ID',
             'Floating IPs',
             'Networks',
@@ -823,11 +823,11 @@ def take_action(self, parsed_args):
                 if k not in ('usage', 'reservation')
             ]
 
-        columns = (
+        columns: tuple[str, ...] = (
             'resource',
             'limit',
         )
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             'Resource',
             'Limit',
         )

openstackclient/compute/v2/aggregate.py

@@ -194,8 +194,8 @@ def take_action(self, parsed_args):
         aggregates = list(compute_client.aggregates())
 
         if sdk_utils.supports_microversion(compute_client, '2.41'):
-            column_headers = ("ID", "UUID")
-            columns = ("id", "uuid")
+            column_headers: tuple[str, ...] = ("ID", "UUID")
+            columns: tuple[str, ...] = ("id", "uuid")
         else:
             column_headers = ("ID",)
             columns = ("id",)

openstackclient/compute/v2/flavor.py

@@ -329,7 +329,7 @@ def take_action(self, parsed_args):
             if parsed_args.long and not f.extra_specs:
                 compute_client.fetch_flavor_extra_specs(f)
 
-        columns = (
+        columns: tuple[str, ...] = (
             "id",
             "name",
             "ram",
@@ -345,7 +345,7 @@ def take_action(self, parsed_args):
                 "extra_specs",
             )
 
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             "ID",
             "Name",
             "RAM",

openstackclient/compute/v2/hypervisor.py

@@ -119,14 +119,20 @@ def take_action(self, parsed_args):
         if parsed_args.matching:
             list_opts['hypervisor_hostname_pattern'] = parsed_args.matching
 
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             "ID",
             "Hypervisor Hostname",
             "Hypervisor Type",
             "Host IP",
             "State",
         )
-        columns = ('id', 'name', 'hypervisor_type', 'host_ip', 'state')
+        columns: tuple[str, ...] = (
+            'id',
+            'name',
+            'hypervisor_type',
+            'host_ip',
+            'state',
+        )
 
         if parsed_args.long:
             if not sdk_utils.supports_microversion(compute_client, '2.88'):

openstackclient/compute/v2/keypair.py

@@ -372,7 +372,7 @@ def take_action(self, parsed_args):
         else:
             data = compute_client.keypairs(**kwargs)
 
-        columns = ("Name", "Fingerprint")
+        columns: tuple[str, ...] = ("Name", "Fingerprint")
 
         if sdk_utils.supports_microversion(compute_client, '2.2'):
             columns += ("Type",)

openstackclient/compute/v2/server.py

@@ -430,15 +430,15 @@ def take_action(self, parsed_args):
 
         interface = compute_client.create_server_interface(server.id, **kwargs)
 
-        columns = (
+        columns: tuple[str, ...] = (
             'port_id',
             'server_id',
             'net_id',
             'mac_addr',
             'port_state',
             'fixed_ips',
         )
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             'Port ID',
             'Server ID',
             'Network ID',
@@ -842,8 +842,13 @@ def take_action(self, parsed_args):
             **kwargs,
         )
 
-        columns = ('id', 'server id', 'volume id', 'device')
-        column_headers = ('ID', 'Server ID', 'Volume ID', 'Device')
+        columns: tuple[str, ...] = ('id', 'server id', 'volume id', 'device')
+        column_headers: tuple[str, ...] = (
+            'ID',
+            'Server ID',
+            'Volume ID',
+            'Device',
+        )
         if sdk_utils.supports_microversion(compute_client, '2.49'):
             columns += ('tag',)
             column_headers += ('Tag',)
@@ -2802,12 +2807,12 @@ def take_action(self, parsed_args):
                     msg % search_opts['changes-since']
                 )
 
-        columns = (
+        columns: tuple[str, ...] = (
             'id',
             'name',
             'status',
         )
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             'ID',
             'Name',
             'Status',

openstackclient/compute/v2/server_event.py

@@ -220,13 +220,13 @@ def take_action(self, parsed_args):
 
         data = compute_client.server_actions(server_id, **kwargs)
 
-        columns = (
+        columns: tuple[str, ...] = (
             'request_id',
             'server_id',
             'action',
             'start_time',
         )
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             'Request ID',
             'Server ID',
             'Action',

openstackclient/compute/v2/server_group.py

@@ -216,12 +216,12 @@ def take_action(self, parsed_args):
         if sdk_utils.supports_microversion(compute_client, '2.64'):
             policy_key = 'Policy'
 
-        columns = (
+        columns: tuple[str, ...] = (
             'id',
             'name',
             policy_key.lower(),
         )
-        column_headers = (
+        column_headers: tuple[str, ...] = (
             'ID',
             'Name',
             policy_key,