diff options
| -rw-r--r-- | heatclient/osc/v1/service.py | 4 | ||||
| -rw-r--r-- | heatclient/osc/v1/template.py | 4 | ||||
| -rw-r--r-- | heatclient/tests/functional/osc/v1/test_readonly.py | 4 | ||||
| -rw-r--r-- | heatclient/tests/unit/osc/v1/test_service.py | 4 | ||||
| -rw-r--r-- | heatclient/tests/unit/osc/v1/test_template.py | 6 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1643492-2d7537b55f347722.yaml | 8 |
6 files changed, 19 insertions, 11 deletions
diff --git a/heatclient/osc/v1/service.py b/heatclient/osc/v1/service.py index b6a148a..09dec4d 100644 --- a/heatclient/osc/v1/service.py +++ b/heatclient/osc/v1/service.py @@ -32,8 +32,8 @@ class ListService(command.Lister): self.log.debug("take_action(%s)", parsed_args) heat_client = self.app.client_manager.orchestration - columns = ['hostname', 'binary', 'engine_id', 'host', - 'topic', 'updated_at', 'status'] + columns = ['Hostname', 'Binary', 'Engine ID', 'Host', + 'Topic', 'Updated At', 'Status'] services = heat_client.services.list() return ( columns, diff --git a/heatclient/osc/v1/template.py b/heatclient/osc/v1/template.py index 20fc7d5..5aace44 100644 --- a/heatclient/osc/v1/template.py +++ b/heatclient/osc/v1/template.py @@ -37,7 +37,7 @@ class VersionList(command.Lister): client = self.app.client_manager.orchestration versions = client.template_versions.list() - fields = ['version', 'type'] + fields = ['Version', 'Type'] return ( fields, @@ -79,7 +79,7 @@ class FunctionList(command.Lister): msg = _('Template version not found: %s') % version raise exc.CommandError(msg) - fields = ['functions', 'description'] + fields = ['Functions', 'Description'] return ( fields, (utils.get_item_properties(s, fields) for s in functions) diff --git a/heatclient/tests/functional/osc/v1/test_readonly.py b/heatclient/tests/functional/osc/v1/test_readonly.py index 4ad38a6..0c88a29 100644 --- a/heatclient/tests/functional/osc/v1/test_readonly.py +++ b/heatclient/tests/functional/osc/v1/test_readonly.py @@ -75,13 +75,13 @@ class SimpleReadOnlyOpenStackClientTest(base.OpenStackClientTestBase): def test_openstack_template_version_list(self): ret = self.openstack('orchestration template version list') tmpl_types = self.parser.listing(ret) - self.assertTableStruct(tmpl_types, ['version', 'type']) + self.assertTableStruct(tmpl_types, ['Version', 'Type']) def test_openstack_template_function_list(self): ret = self.openstack('orchestration template function list ' 'heat_template_version.2015-10-15') tmpl_functions = self.parser.listing(ret) - self.assertTableStruct(tmpl_functions, ['functions', 'description']) + self.assertTableStruct(tmpl_functions, ['Functions', 'Description']) def test_openstack_resource_type_list(self): ret = self.openstack('orchestration resource type list') diff --git a/heatclient/tests/unit/osc/v1/test_service.py b/heatclient/tests/unit/osc/v1/test_service.py index 7fe6443..5f8573e 100644 --- a/heatclient/tests/unit/osc/v1/test_service.py +++ b/heatclient/tests/unit/osc/v1/test_service.py @@ -45,8 +45,8 @@ class TestServiceList(orchestration_fakes.TestOrchestrationv1): } ]} - columns = ['hostname', 'binary', 'engine_id', 'host', - 'topic', 'updated_at', 'status'] + columns = ['Hostname', 'Binary', 'Engine ID', 'Host', + 'Topic', 'Updated At', 'Status'] def setUp(self): super(TestServiceList, self).setUp() diff --git a/heatclient/tests/unit/osc/v1/test_template.py b/heatclient/tests/unit/osc/v1/test_template.py index 13c6a65..c9b67ca 100644 --- a/heatclient/tests/unit/osc/v1/test_template.py +++ b/heatclient/tests/unit/osc/v1/test_template.py @@ -46,7 +46,7 @@ class TestTemplateVersionList(TestTemplate): columns, data = self.cmd.take_action(parsed_args) - self.assertEqual(['version', 'type'], columns) + self.assertEqual(['Version', 'Type'], columns) self.assertEqual([('HOT123', 'hot'), ('CFN456', 'cfn')], list(data)) @@ -73,7 +73,7 @@ class TestTemplateFunctionList(TestTemplate): self.template_versions.get.return_value = [self.tv1, self.tv2] columns, data = self.cmd.take_action(parsed_args) - self.assertEqual(['functions', 'description'], columns) + self.assertEqual(['Functions', 'Description'], columns) self.assertEqual([('func1', 'Function 1'), ('func2', 'Function 2')], list(data)) @@ -84,7 +84,7 @@ class TestTemplateFunctionList(TestTemplate): self.tv_with_cf] columns, data = self.cmd.take_action(parsed_args) - self.assertEqual(['functions', 'description'], columns) + self.assertEqual(['Functions', 'Description'], columns) self.assertEqual([('func1', 'Function 1'), ('func2', 'Function 2'), ('condition func', 'Condition Function')], diff --git a/releasenotes/notes/bug-1643492-2d7537b55f347722.yaml b/releasenotes/notes/bug-1643492-2d7537b55f347722.yaml new file mode 100644 index 0000000..ffab3fd --- /dev/null +++ b/releasenotes/notes/bug-1643492-2d7537b55f347722.yaml @@ -0,0 +1,8 @@ +--- +other: + - | + Updated the Openstack orchestration Commands headers for + ``openstack orchestration service list``, + ``openstack orchestration template version list``, and + ``openstack orchestration template function list`` commands + [Bug `1643492 <https://bugs.launchpad.net/bugs/1643492>`_] |