Merge "Followup: Reduce LOC in volume v3 service"

This commit is contained in:
Zuul 2024-07-23 12:58:00 +00:00 committed by Gerrit Code Review
commit c47ccb9721

View File

@ -25,30 +25,21 @@ class ListService(service_v2.ListService):
def take_action(self, parsed_args): def take_action(self, parsed_args):
service_client = self.app.client_manager.volume service_client = self.app.client_manager.volume
if parsed_args.long: columns = [
columns = [ "Binary",
"Binary", "Host",
"Host", "Zone",
"Zone", "Status",
"Status", "State",
"State", "Updated At",
"Updated At", ]
"Disabled Reason",
]
else:
columns = [
"Binary",
"Host",
"Zone",
"Status",
"State",
"Updated At",
]
if service_client.api_version >= api_versions.APIVersion('3.7'): if service_client.api_version >= api_versions.APIVersion('3.7'):
columns.append("Cluster") columns.append("Cluster")
if service_client.api_version >= api_versions.APIVersion('3.49'): if service_client.api_version >= api_versions.APIVersion('3.49'):
columns.append("Backend State") columns.append("Backend State")
if parsed_args.long:
columns.append("Disabled Reason")
data = service_client.services.list( data = service_client.services.list(
parsed_args.host, parsed_args.service parsed_args.host, parsed_args.service