openstack/python-senlinclient
Code Issues Proposed changes

Change default API version to 1.14

Browse Source 
Depends-On: https://review.opendev.org/699650
Change-Id: I6c7cbf884317313f217538b6916b63770ea3a337
This commit is contained in:
Bo Tran 2019-11-26 16:04:25 +07:00
parent 852a0f4cc6
commit be73aeed39
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
senlinclient/plugin.py
View File

@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__)
DEFAULT_CLUSTERING_API_VERSION = '1' DEFAULT_CLUSTERING_API_VERSION = '1'
API_VERSION_OPTION = 'os_clustering_api_version' API_VERSION_OPTION = 'os_clustering_api_version'
API_NAME = 'clustering' API_NAME = 'clustering'
CURRENT_API_VERSION = '1.13' CURRENT_API_VERSION = '1.14'
def _make_key(service_type, key): def _make_key(service_type, key):

7
senlinclient/tests/functional/test_actions.py
View File

@ -19,6 +19,7 @@ class ActionTest(base.OpenStackClientTestBase):
def test_action_list(self): def test_action_list(self):
result = self.openstack('cluster action list') result = self.openstack('cluster action list')
action_list = self.parser.listing(result) action_list = self.parser.listing(result)
self.assertTableStruct(action_list, ['id', 'name', 'action', 'status', self.assertTableStruct(action_list,
'target_id', 'depends_on', ['id', 'name', 'action', 'status',
'depended_by', 'created_at']) 'target_id', 'depends_on', 'cluster_id',
'depended_by', 'created_at'])

5
senlinclient/tests/unit/v1/test_action.py
View File

@ -30,7 +30,7 @@ class TestAction(fakes.TestClusteringv1):
class TestActionList(TestAction): class TestActionList(TestAction):
columns = ['id', 'name', 'action', 'status', 'target_id', 'depends_on', columns = ['id', 'name', 'action', 'status', 'target_id', 'depends_on',
'depended_by', 'created_at'] 'depended_by', 'created_at', 'cluster_id']
defaults = { defaults = {
'global_project': False, 'global_project': False,
'marker': None, 'marker': None,
@ -43,6 +43,7 @@ class TestActionList(TestAction):
self.cmd = osc_action.ListAction(self.app, None) self.cmd = osc_action.ListAction(self.app, None)
fake_action = mock.Mock( fake_action = mock.Mock(
action="NODE_CREATE", action="NODE_CREATE",
cluster_id="FAKE_CLUSTER_ID",
cause="RPC Request", cause="RPC Request",
created_at="2015-12-04T04:54:41", created_at="2015-12-04T04:54:41",
depended_by=[], depended_by=[],
@ -140,6 +141,7 @@ class TestActionShow(TestAction):
self.cmd = osc_action.ShowAction(self.app, None) self.cmd = osc_action.ShowAction(self.app, None)
fake_action = mock.Mock( fake_action = mock.Mock(
action="NODE_CREATE", action="NODE_CREATE",
cluster_id="FAKE_CLUSTER_ID",
cause="RPC Request", cause="RPC Request",
created_at="2015-12-04T04:54:41", created_at="2015-12-04T04:54:41",
depended_by=[], depended_by=[],
@ -183,6 +185,7 @@ class TestActionUpdate(TestAction):
self.cmd = osc_action.UpdateAction(self.app, None) self.cmd = osc_action.UpdateAction(self.app, None)
fake_action = mock.Mock( fake_action = mock.Mock(
action="NODE_CREATE", action="NODE_CREATE",
cluster_id="FAKE_CLUSTER_ID",
cause="RPC Request", cause="RPC Request",
created_at="2015-12-04T04:54:41", created_at="2015-12-04T04:54:41",
depended_by=[], depended_by=[],

2
senlinclient/v1/action.py
View File

@ -82,7 +82,7 @@ class ListAction(command.Lister):
senlin_client = self.app.client_manager.clustering senlin_client = self.app.client_manager.clustering
columns = ['id', 'name', 'action', 'status', 'target_id', 'depends_on', columns = ['id', 'name', 'action', 'status', 'target_id', 'depends_on',
'depended_by', 'created_at'] 'depended_by', 'created_at', 'cluster_id']
queries = { queries = {
'sort': parsed_args.sort, 'sort': parsed_args.sort,