diff --git a/senlinclient/plugin.py b/senlinclient/plugin.py index a56ee84d..6936d1d7 100644 --- a/senlinclient/plugin.py +++ b/senlinclient/plugin.py @@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__) DEFAULT_CLUSTERING_API_VERSION = '1' API_VERSION_OPTION = 'os_clustering_api_version' API_NAME = 'clustering' -CURRENT_API_VERSION = '1.13' +CURRENT_API_VERSION = '1.14' def _make_key(service_type, key): diff --git a/senlinclient/tests/functional/test_actions.py b/senlinclient/tests/functional/test_actions.py index 7752276f..5a1afbf0 100644 --- a/senlinclient/tests/functional/test_actions.py +++ b/senlinclient/tests/functional/test_actions.py @@ -19,6 +19,7 @@ class ActionTest(base.OpenStackClientTestBase): def test_action_list(self): result = self.openstack('cluster action list') action_list = self.parser.listing(result) - self.assertTableStruct(action_list, ['id', 'name', 'action', 'status', - 'target_id', 'depends_on', - 'depended_by', 'created_at']) + self.assertTableStruct(action_list, + ['id', 'name', 'action', 'status', + 'target_id', 'depends_on', 'cluster_id', + 'depended_by', 'created_at']) diff --git a/senlinclient/tests/unit/v1/test_action.py b/senlinclient/tests/unit/v1/test_action.py index 34fb9b3f..ca77e2de 100644 --- a/senlinclient/tests/unit/v1/test_action.py +++ b/senlinclient/tests/unit/v1/test_action.py @@ -30,7 +30,7 @@ class TestAction(fakes.TestClusteringv1): class TestActionList(TestAction): columns = ['id', 'name', 'action', 'status', 'target_id', 'depends_on', - 'depended_by', 'created_at'] + 'depended_by', 'created_at', 'cluster_id'] defaults = { 'global_project': False, 'marker': None, @@ -43,6 +43,7 @@ class TestActionList(TestAction): self.cmd = osc_action.ListAction(self.app, None) fake_action = mock.Mock( action="NODE_CREATE", + cluster_id="FAKE_CLUSTER_ID", cause="RPC Request", created_at="2015-12-04T04:54:41", depended_by=[], @@ -140,6 +141,7 @@ class TestActionShow(TestAction): self.cmd = osc_action.ShowAction(self.app, None) fake_action = mock.Mock( action="NODE_CREATE", + cluster_id="FAKE_CLUSTER_ID", cause="RPC Request", created_at="2015-12-04T04:54:41", depended_by=[], @@ -183,6 +185,7 @@ class TestActionUpdate(TestAction): self.cmd = osc_action.UpdateAction(self.app, None) fake_action = mock.Mock( action="NODE_CREATE", + cluster_id="FAKE_CLUSTER_ID", cause="RPC Request", created_at="2015-12-04T04:54:41", depended_by=[], diff --git a/senlinclient/v1/action.py b/senlinclient/v1/action.py index 852223e1..e0244242 100644 --- a/senlinclient/v1/action.py +++ b/senlinclient/v1/action.py @@ -82,7 +82,7 @@ class ListAction(command.Lister): senlin_client = self.app.client_manager.clustering columns = ['id', 'name', 'action', 'status', 'target_id', 'depends_on', - 'depended_by', 'created_at'] + 'depended_by', 'created_at', 'cluster_id'] queries = { 'sort': parsed_args.sort,