openstack
/
senlin
Code Issues Proposed changes

RPC support for cluster-collect 

This patch adds RPC support to cluster-collect call.

Change-Id: I5c1a41d4bb25a49e27c39354cd3e86cde02dfbc1
This commit is contained in:
tengqm 2016-06-13 03:35:36 -04:00
parent 8f77706f13
commit cb04dd9259
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
senlin/rpc/client.py
View File

@ -21,7 +21,13 @@ from senlin.common import messaging
class EngineClient(object):
'''Client side of the senlin engine rpc API.'''
"""Client side of the senlin engine rpc API.
Version History:
1.0 - Initial version (Mitaka 1.0 release)
1.1 - Add cluster-collect call.
"""
BASE_RPC_API_VERSION = '1.0'
@ -163,16 +169,6 @@ class EngineClient(object):
identity=identity,
nodes=nodes))
def cluster_check(self, ctxt, identity, params=None):
return self.call(ctxt, self.make_msg('cluster_check',
identity=identity,
params=params))
def cluster_recover(self, ctxt, identity, params=None):
return self.call(ctxt, self.make_msg('cluster_recover',
identity=identity,
params=params))
def cluster_resize(self, ctxt, identity, adj_type=None, number=None,
min_size=None, max_size=None, min_step=None,
strict=True):
@ -209,6 +205,22 @@ class EngineClient(object):
self.make_msg('cluster_delete',
identity=identity))
def cluster_collect(self, ctxt, identity, path, project_safe=True):
return self.call(ctxt, self.make_msg('cluster_collect',
identity=identity, path=path,
project_safe=project_safe),
version='1.1')
def cluster_check(self, ctxt, identity, params=None):
return self.call(ctxt, self.make_msg('cluster_check',
identity=identity,
params=params))
def cluster_recover(self, ctxt, identity, params=None):
return self.call(ctxt, self.make_msg('cluster_recover',
identity=identity,
params=params))
def node_list(self, ctxt, cluster_id=None, limit=None, marker=None,
sort=None, filters=None, project_safe=True):
return self.call(ctxt,

5
senlin/tests/unit/test_rpc_client.py
View File

@ -275,6 +275,11 @@ class EngineRpcAPITestCase(base.SenlinTestCase):
def test_cluster_delete_call(self):
self._test_engine_api('cluster_delete', 'call', identity='a-cluster')
def test_cluster_collect(self):
self._test_engine_api('cluster_collect', 'call', identity='a-cluster',
path='astring', project_safe=True,
version='1.1')
def test_cluster_check(self):
self._test_engine_api('cluster_check', 'call', identity='a-cluster',
params=None)