openstack/deb-python-senlinclient
Code Issues Proposed changes

Merge "Add "cluster_id" column to openstack cluster event list"

Browse Source
This commit is contained in:
Jenkins
2016-11-17 05:08:07 +00:00
committed by Gerrit Code Review
parent ee3f3e8c22 2c67978ec9
commit 0941e5a902
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
senlinclient/tests/unit/v1/test_event.py
View File

@@ -30,7 +30,7 @@ class TestEvent(fakes.TestClusteringv1):
class TestEventList(TestEvent):
columns = ['id', 'generated_at', 'obj_type', 'obj_id', 'obj_name',
'action', 'status', 'status_reason', 'level']
'action', 'status', 'level', 'cluster_id']
response = {"events": [
{
@@ -43,7 +43,7 @@ class TestEventList(TestEvent):
"obj_type": "NODE",
"project": "6e18cc2bdbeb48a5b3cad2dc499f6804",
"status": "CREATING",
"status_reason": "Initializing",
"cluster_id": "f23ff00c-ec4f-412d-bd42-7f6e209819cb",
"generated_at": "2015-03-05T08:53:15",
"user": "a21ded6060534d99840658a777c2af5a"
}
@@ -144,7 +144,7 @@ class TestEventShow(TestEvent):
"obj_type": "NODE",
"project": "6e18cc2bdbeb48a5b3cad2dc499f6804",
"status": "CREATING",
"status_reason": "Initializing",
"cluster_id": "f23ff00c-ec4f-412d-bd42-7f6e209819cb",
"generated_at": "2015-03-05T08:53:15",
"user": "a21ded6060534d99840658a777c2af5a"
}}

2
senlinclient/v1/event.py
View File

@@ -80,7 +80,7 @@ class ListEvent(command.Lister):
senlin_client = self.app.client_manager.clustering
columns = ['id', 'generated_at', 'obj_type', 'obj_id', 'obj_name',
'action', 'status', 'status_reason', 'level']
'action', 'status', 'level', 'cluster_id']
queries = {
'sort': parsed_args.sort,
'limit': parsed_args.limit,