openstack/python-neutronclient
Code Issues Proposed changes

Merge "Make trunk commands handle timestamps for trunk resources"

Browse Source
This commit is contained in:
Jenkins
2016-09-01 01:51:57 +00:00
committed by Gerrit Code Review
parent fdc9f02de0 496969e05d
commit cccc7f7fb0
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neutronclient/osc/v2/trunk/network_trunk.py
View File

@@ -159,10 +159,14 @@ class ListNetworkTrunk(command.Lister):
headers += ( headers += (
'Status', 'Status',
'State', 'State',
'Created At',
'Updated At',
) )
columns += ( columns += (
'status', 'status',
'admin_state_up', 'admin_state_up',
'created_at',
'updated_at'
) )
return (headers, return (headers,
(utils.get_dict_properties( (utils.get_dict_properties(

8
neutronclient/tests/unit/osc/v2/trunk/test_network_trunk.py
View File

@@ -295,7 +295,9 @@ class TestShowNetworkTrunk(test_fakes.TestNeutronClientOSCV2):
class TestListNetworkTrunk(test_fakes.TestNeutronClientOSCV2): class TestListNetworkTrunk(test_fakes.TestNeutronClientOSCV2):
# Create trunks to be listed. # 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 = ( columns = (
'ID', 'ID',
@@ -306,6 +308,8 @@ class TestListNetworkTrunk(test_fakes.TestNeutronClientOSCV2):
columns_long = columns + ( columns_long = columns + (
'Status', 'Status',
'State', 'State',
'Created At',
'Updated At'
) )
data = [] data = []
for t in _trunks: for t in _trunks:
@@ -324,6 +328,8 @@ class TestListNetworkTrunk(test_fakes.TestNeutronClientOSCV2):
t['description'], t['description'],
t['status'], t['status'],
trunk._format_admin_state(t['admin_state_up']), trunk._format_admin_state(t['admin_state_up']),
'2001-01-01 00:00:00',
'2001-01-01 00:00:00',
)) ))
def setUp(self): def setUp(self):