Merge "Remove 'states' field from OSC CLI output"
This commit is contained in:
@@ -424,6 +424,7 @@ class CreateBaremetalNode(command.ShowOne):
|
|||||||
node.pop('links', None)
|
node.pop('links', None)
|
||||||
node.pop('ports', None)
|
node.pop('ports', None)
|
||||||
node.pop('portgroups', None)
|
node.pop('portgroups', None)
|
||||||
|
node.pop('states', None)
|
||||||
|
|
||||||
node.setdefault('chassis_uuid', '')
|
node.setdefault('chassis_uuid', '')
|
||||||
|
|
||||||
@@ -1112,6 +1113,7 @@ class ShowBaremetalNode(command.ShowOne):
|
|||||||
node.pop("links", None)
|
node.pop("links", None)
|
||||||
node.pop("ports", None)
|
node.pop("ports", None)
|
||||||
node.pop('portgroups', None)
|
node.pop('portgroups', None)
|
||||||
|
node.pop('states', None)
|
||||||
|
|
||||||
if not fields or 'chassis_uuid' in fields:
|
if not fields or 'chassis_uuid' in fields:
|
||||||
node.setdefault('chassis_uuid', '')
|
node.setdefault('chassis_uuid', '')
|
||||||
|
|||||||
@@ -330,6 +330,7 @@ class TestBaremetalCreate(TestBaremetal):
|
|||||||
collist = copy.copy(self.collist)
|
collist = copy.copy(self.collist)
|
||||||
self.assertEqual(collist, columns)
|
self.assertEqual(collist, columns)
|
||||||
self.assertNotIn('ports', columns)
|
self.assertNotIn('ports', columns)
|
||||||
|
self.assertNotIn('states', columns)
|
||||||
|
|
||||||
datalist = copy.copy(self.datalist)
|
datalist = copy.copy(self.datalist)
|
||||||
self.assertEqual(datalist, tuple(data))
|
self.assertEqual(datalist, tuple(data))
|
||||||
@@ -2036,6 +2037,7 @@ class TestBaremetalShow(TestBaremetal):
|
|||||||
)
|
)
|
||||||
self.assertEqual(collist, columns)
|
self.assertEqual(collist, columns)
|
||||||
self.assertNotIn('ports', columns)
|
self.assertNotIn('ports', columns)
|
||||||
|
self.assertNotIn('states', columns)
|
||||||
datalist = (
|
datalist = (
|
||||||
baremetal_fakes.baremetal_chassis_uuid_empty,
|
baremetal_fakes.baremetal_chassis_uuid_empty,
|
||||||
baremetal_fakes.baremetal_instance_uuid,
|
baremetal_fakes.baremetal_instance_uuid,
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- Hides 'states' field in 'node create' and 'node show'
|
||||||
|
OSC subcommands output because this field is not meant
|
||||||
|
to be present in the output.
|
||||||
Reference in New Issue
Block a user