From 496969e05ddcbcfdfeb4ff5941e37209c56846cb Mon Sep 17 00:00:00 2001 From: Armando Migliaccio Date: Mon, 29 Aug 2016 23:09:47 -0700 Subject: [PATCH] Make trunk commands handle timestamps for trunk resources Partial-implements: blueprint vlan-aware-vms Change-Id: I853ae5d01401cf9df429b2e3f4565c2aef8a34dd --- neutronclient/osc/v2/trunk/network_trunk.py | 4 ++++ .../tests/unit/osc/v2/trunk/test_network_trunk.py | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/neutronclient/osc/v2/trunk/network_trunk.py b/neutronclient/osc/v2/trunk/network_trunk.py index 5ba9b9a03..70f791fd8 100644 --- a/neutronclient/osc/v2/trunk/network_trunk.py +++ b/neutronclient/osc/v2/trunk/network_trunk.py @@ -159,10 +159,14 @@ class ListNetworkTrunk(command.Lister): headers += ( 'Status', 'State', + 'Created At', + 'Updated At', ) columns += ( 'status', 'admin_state_up', + 'created_at', + 'updated_at' ) return (headers, (utils.get_dict_properties( diff --git a/neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py b/neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py index ee16fd028..d9658156b 100644 --- a/neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py +++ b/neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py @@ -295,7 +295,9 @@ class TestShowNetworkTrunk(test_fakes.TestNeutronClientOSCV2): class TestListNetworkTrunk(test_fakes.TestNeutronClientOSCV2): # Create trunks to be listed. - _trunks = fakes.FakeTrunk.create_trunks(count=3) + _trunks = fakes.FakeTrunk.create_trunks( + {'created_at': '2001-01-01 00:00:00', + 'updated_at': '2001-01-01 00:00:00'}, count=3) columns = ( 'ID', @@ -306,6 +308,8 @@ class TestListNetworkTrunk(test_fakes.TestNeutronClientOSCV2): columns_long = columns + ( 'Status', 'State', + 'Created At', + 'Updated At' ) data = [] for t in _trunks: @@ -324,6 +328,8 @@ class TestListNetworkTrunk(test_fakes.TestNeutronClientOSCV2): t['description'], t['status'], trunk._format_admin_state(t['admin_state_up']), + '2001-01-01 00:00:00', + '2001-01-01 00:00:00', )) def setUp(self):