From 54d4c13b03a2742fe021b40beef3e5dccec5df79 Mon Sep 17 00:00:00 2001 From: Michael Hanselmann Date: Wed, 26 Jan 2011 19:09:28 +0100 Subject: [PATCH] RAPI client: Wrap /2/redistribute-config resource MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Hanselmann Reviewed-by: René Nussbaumer --- lib/rapi/client.py | 12 +++++++++++- test/ganeti.rapi.client_unittest.py | 7 +++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/rapi/client.py b/lib/rapi/client.py index 467dec9..51582ca 100644 --- a/lib/rapi/client.py +++ b/lib/rapi/client.py @@ -236,7 +236,7 @@ def GenericCurlConfig(verbose=False, use_signal=False, return _ConfigCurl -class GanetiRapiClient(object): +class GanetiRapiClient(object): # pylint: disable-msg=R0904 """Ganeti RAPI client. """ @@ -481,6 +481,16 @@ class GanetiRapiClient(object): return self._SendRequest(HTTP_GET, "/%s/info" % GANETI_RAPI_VERSION, None, None) + def RedistributeConfig(self): + """Tells the cluster to redistribute its configuration files. + + @return: job id + + """ + return self._SendRequest(HTTP_PUT, + "/%s/redistribute-config" % GANETI_RAPI_VERSION, + None, None) + def ModifyCluster(self, **kwargs): """Modifies cluster parameters. diff --git a/test/ganeti.rapi.client_unittest.py b/test/ganeti.rapi.client_unittest.py index d03b393..fc63d00 100755 --- a/test/ganeti.rapi.client_unittest.py +++ b/test/ganeti.rapi.client_unittest.py @@ -1078,6 +1078,13 @@ class GanetiRapiClientTests(testutils.GanetiTestCase): self.assertEqual(data["maintain_node_health"], mnh) self.assertEqual(self.rapi.CountPending(), 0) + def testRedistributeConfig(self): + self.rapi.AddResponse("3364") + job_id = self.client.RedistributeConfig() + self.assertEqual(job_id, 3364) + self.assertItems([]) + self.assertHandler(rlib2.R_2_redist_config) + def testGrowInstanceDisk(self): for idx, wait_for_sync in enumerate([None, False, True]): amount = 128 + (512 * idx) -- 1.7.10.4