Merge "identity: Use previous naming for 'service show' fields"

Zuul · openstack-gerrit · commit 0d570cd66a7a · 2024-08-12T16:01:30.000Z
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
@@ -37,11 +37,11 @@ def _format_service(service):
         'description',
     )
     column_headers = (
-        'ID',
-        'Name',
-        'Type',
-        'Enabled',
-        'Description',
+        'id',
+        'name',
+        'type',
+        'enabled',
+        'description',
     )
 
     return (
diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py
@@ -48,7 +48,7 @@ class IdentityTests(base.TestCase):
         'parent_id',
     ]
     ROLE_FIELDS = ['id', 'name', 'domain_id', 'description']
-    SERVICE_FIELDS = ['ID', 'Enabled', 'Name', 'Type', 'Description']
+    SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description']
     REGION_FIELDS = ['description', 'enabled', 'parent_region', 'region']
     ENDPOINT_FIELDS = [
         'id',
@@ -376,7 +376,7 @@ def _create_dummy_service(self, add_clean_up=True):
         if add_clean_up:
             service = self.parse_show_as_object(raw_output)
             self.addCleanup(
-                self.openstack, 'service delete %s' % service['ID']
+                self.openstack, 'service delete %s' % service['id']
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.SERVICE_FIELDS)
diff --git a/openstackclient/tests/functional/identity/v3/test_limit.py b/openstackclient/tests/functional/identity/v3/test_limit.py
@@ -32,7 +32,7 @@ def test_limit_create_with_service_name(self):
 
         raw_output = self.openstack('service show %s' % service_id)
         items = self.parse_show(raw_output)
-        service_name = self._extract_value_from_items('Name', items)
+        service_name = self._extract_value_from_items('name', items)
 
         project_name = self._create_dummy_project()
         raw_output = self.openstack('project show %s' % project_name)
@@ -73,7 +73,7 @@ def test_limit_create_with_project_name(self):
 
         raw_output = self.openstack('service show %s' % service_id)
         items = self.parse_show(raw_output)
-        service_name = self._extract_value_from_items('Name', items)
+        service_name = self._extract_value_from_items('name', items)
 
         project_name = self._create_dummy_project()
 
diff --git a/openstackclient/tests/functional/identity/v3/test_registered_limit.py b/openstackclient/tests/functional/identity/v3/test_registered_limit.py
@@ -29,7 +29,7 @@ def test_registered_limit_create_with_service_id(self):
             'service show' ' %(service_name)s' % {'service_name': service_name}
         )
         service_items = self.parse_show(raw_output)
-        service_id = self._extract_value_from_items('ID', service_items)
+        service_id = self._extract_value_from_items('id', service_items)
 
         raw_output = self.openstack(
             'registered limit create'
diff --git a/openstackclient/tests/functional/identity/v3/test_service.py b/openstackclient/tests/functional/identity/v3/test_service.py
@@ -61,9 +61,9 @@ def test_service_set(self):
         raw_output = self.openstack('service show %s' % new_service_name)
         # assert service details
         service = self.parse_show_as_object(raw_output)
-        self.assertEqual(new_service_type, service['Type'])
-        self.assertEqual(new_service_name, service['Name'])
-        self.assertEqual(new_service_description, service['Description'])
+        self.assertEqual(new_service_type, service['type'])
+        self.assertEqual(new_service_name, service['name'])
+        self.assertEqual(new_service_description, service['description'])
 
     def test_service_show(self):
         service_name = self._create_dummy_service()
diff --git a/openstackclient/tests/unit/identity/v3/test_service.py b/openstackclient/tests/unit/identity/v3/test_service.py
@@ -24,11 +24,11 @@
 
 class TestServiceCreate(identity_fakes.TestIdentityv3):
     columns = (
-        'ID',
-        'Name',
-        'Type',
-        'Enabled',
-        'Description',
+        'id',
+        'name',
+        'type',
+        'enabled',
+        'description',
     )
 
     def setUp(self):
@@ -455,7 +455,7 @@ def test_service_show(self):
             self.service.name, ignore_missing=False
         )
 
-        collist = ('ID', 'Name', 'Type', 'Enabled', 'Description')
+        collist = ('id', 'name', 'type', 'enabled', 'description')
         self.assertEqual(collist, columns)
         datalist = (
             self.service.id,

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ def test_registered_limit_create_with_service_id(self):`
`29`	`29`	`'service show' ' %(service_name)s' % {'service_name': service_name}`
`30`	`30`	`)`
`31`	`31`	`service_items = self.parse_show(raw_output)`
`32`		`- service_id = self._extract_value_from_items('ID', service_items)`
	`32`	`+ service_id = self._extract_value_from_items('id', service_items)`
`33`	`33`
`34`	`34`	`raw_output = self.openstack(`
`35`	`35`	`'registered limit create'`