From e2baac279652ce53d39f1b0953c731a77c189faa Mon Sep 17 00:00:00 2001 From: Eric Kao Date: Tue, 25 Jul 2017 20:50:36 -0700 Subject: [PATCH] Set default max-width to 80 everywhere Openstack client now defaults to unlimited max-width instead of the previous fit-to-terminal width. As a result, many commands have very wide and unreadable output. This change fixes the issue by setting a default max width of 80 (traditional terminal width). User still has the option to set a different max-width or specify --fit-width to fit to terminal width. Change-Id: I5898639942bd4eb17b69c403277b46eb69951265 --- congressclient/osc/v1/api_versions.py | 3 +++ congressclient/osc/v1/datasource.py | 24 ++++++++++++++++++++++++ congressclient/osc/v1/driver.py | 9 +++++++++ congressclient/osc/v1/policy.py | 27 +++++++++++++++++++++++++++ 4 files changed, 63 insertions(+) diff --git a/congressclient/osc/v1/api_versions.py b/congressclient/osc/v1/api_versions.py index 89ac4e9..c544b60 100644 --- a/congressclient/osc/v1/api_versions.py +++ b/congressclient/osc/v1/api_versions.py @@ -30,6 +30,9 @@ class ListAPIVersions(lister.Lister): return super(ListAPIVersions, self).get_parser(prog_name) def take_action(self, parsed_args): + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.list_api_versions()['versions'] # sort API by id diff --git a/congressclient/osc/v1/datasource.py b/congressclient/osc/v1/datasource.py index 7e84c41..f42dfa6 100644 --- a/congressclient/osc/v1/datasource.py +++ b/congressclient/osc/v1/datasource.py @@ -35,6 +35,9 @@ class ListDatasources(lister.Lister): return parser def take_action(self, parsed_args): + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.list_datasources()['results'] # Type is always None, so disabling it for now. @@ -61,6 +64,9 @@ class ListDatasourceTables(lister.Lister): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient name_or_id = parsed_args.datasource_name data = client.list_datasource_tables(name_or_id)['results'] @@ -87,6 +93,9 @@ class ShowDatasourceStatus(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient datasource_id = parsed_args.datasource_name data = client.list_datasource_status(datasource_id) @@ -142,6 +151,9 @@ class ShowDatasourceSchema(lister.Lister): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient datasource_id = parsed_args.datasource_name data = client.show_datasource_schema(datasource_id) @@ -175,6 +187,9 @@ class ShowDatasourceTableSchema(lister.Lister): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient datasource_id = parsed_args.datasource_name data = client.show_datasource_table_schema( @@ -205,6 +220,9 @@ class ListDatasourceRows(lister.Lister): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient datasource_id = parsed_args.datasource_name results = client.list_datasource_rows(datasource_id, @@ -238,6 +256,9 @@ class ShowDatasourceTable(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.show_datasource_table(parsed_args.datasource_name, parsed_args.table_id) @@ -274,6 +295,9 @@ class CreateDatasource(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient body = {'name': parsed_args.name, 'driver': parsed_args.driver, diff --git a/congressclient/osc/v1/driver.py b/congressclient/osc/v1/driver.py index 51598bd..d48c26c 100644 --- a/congressclient/osc/v1/driver.py +++ b/congressclient/osc/v1/driver.py @@ -32,6 +32,9 @@ class ListDrivers(lister.Lister): return parser def take_action(self, parsed_args): + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.list_drivers()['results'] columns = ['id', 'description'] @@ -57,6 +60,9 @@ class ShowDriverConfig(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.show_driver( parsed_args.driver) @@ -86,6 +92,9 @@ class ShowDriverSchema(lister.Lister): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.show_driver( parsed_args.driver) diff --git a/congressclient/osc/v1/policy.py b/congressclient/osc/v1/policy.py index ed99dd2..e52ab75 100644 --- a/congressclient/osc/v1/policy.py +++ b/congressclient/osc/v1/policy.py @@ -80,6 +80,9 @@ class CreatePolicyRule(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient body = {'rule': parsed_args.rule} if parsed_args.rule_name: @@ -224,6 +227,9 @@ class ListPolicyTables(lister.Lister): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.list_policy_tables(parsed_args.policy_name)['results'] columns = ['id'] @@ -244,6 +250,9 @@ class ListPolicy(lister.Lister): return parser def take_action(self, parsed_args): + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.list_policy()['results'] columns = ['id', 'name', 'owner_id', 'kind', 'description'] @@ -285,6 +294,9 @@ class CreatePolicy(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient body = {'name': parsed_args.policy_name, 'description': parsed_args.description, @@ -309,6 +321,9 @@ class CreatePolicyFromFile(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient with open(parsed_args.policy_file_path, "r") as stream: policies = yaml.load_all(stream) @@ -376,6 +391,9 @@ class ListPolicyRows(lister.Lister): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient answer = client.list_policy_rows(parsed_args.policy_name, parsed_args.table, @@ -412,6 +430,9 @@ class ShowPolicyRule(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient results = client.list_policy_rules(parsed_args.policy_name) rule_id = utils.get_resource_id_from_name( @@ -440,6 +461,9 @@ class ShowPolicyTable(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient data = client.show_policy_table(parsed_args.policy_name, parsed_args.table_id) @@ -462,6 +486,9 @@ class ShowPolicy(show.ShowOne): def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) + # set default max-width + if parsed_args.max_width == 0: + parsed_args.max_width = 80 client = self.app.client_manager.congressclient results = client.list_policy() policy_id = utils.get_resource_id_from_name(