Merge "Return the port column headers expected in the list command"

Zuul · openstack-gerrit · commit cf25526e9418 · 2025-04-01T10:48:10.000Z
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
@@ -943,15 +943,12 @@ def take_action(self, parsed_args):
                 for item in columns
             ]
 
-        headers, attrs = utils.calculate_header_and_attrs(
-            column_headers, columns, parsed_args
-        )
         return (
-            headers,
+            column_headers,
             (
                 utils.get_item_properties(
                     s,
-                    attrs,
+                    columns,
                     formatters=_list_formatters,
                 )
                 for s in data
diff --git a/openstackclient/tests/functional/network/v2/test_port.py b/openstackclient/tests/functional/network/v2/test_port.py
@@ -12,6 +12,8 @@
 
 import uuid
 
+from tempest.lib import exceptions as tempest_exc
+
 from openstackclient.tests.functional.network.v2 import common
 
 
@@ -162,8 +164,16 @@ def test_port_list(self):
         id_list = [p['ID'] for p in json_output]
         self.assertIn(id1, id_list)
         self.assertIn(id2, id_list)
-        # Check an unknown field exists
-        self.assertIn('device_id', json_output[0])
+        # Check an unknown field does not exist
+        self.assertNotIn('device_id', json_output[0])
+
+        # Test list with only unknown fields
+        exc = self.assertRaises(
+            tempest_exc.CommandFailed,
+            self.openstack,
+            'port list -c device_id',
+        )
+        self.assertIn("No recognized column names in ['device_id']", str(exc))
 
     def test_port_set(self):
         """Test create, set, show, delete"""

Original file line number	Diff line number	Diff line change
`@@ -943,15 +943,12 @@ def take_action(self, parsed_args):`
`943`	`943`	`for item in columns`
`944`	`944`	`]`
`945`	`945`
`946`		`- headers, attrs = utils.calculate_header_and_attrs(`
`947`		`- column_headers, columns, parsed_args`
`948`		`- )`
`949`	`946`	`return (`
`950`		`- headers,`
	`947`	`+ column_headers,`
`951`	`948`	`(`
`952`	`949`	`utils.get_item_properties(`
`953`	`950`	`s,`
`954`		`- attrs,`
	`951`	`+ columns,`
`955`	`952`	`formatters=_list_formatters,`
`956`	`953`	`)`
`957`	`954`	`for s in data`