From b8481ebf90680096fc53efe49370589a723a96e5 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Tue, 24 Jul 2012 13:13:06 +0100
Subject: [PATCH] rapi client: accept arbitrary shutdown arguments
The "ignore_offline_nodes" parameter is unsupported. Rather than
explicitely adding it, just pass all keyword arguments in the body of
the query, and rapi on the other side will do the right thing.
Supports for old arguments that were passed via the query is unchanged.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/rapi/client.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/rapi/client.py b/lib/rapi/client.py
index b5a4df530..d8bc5eb93 100644
--- a/lib/rapi/client.py
+++ b/lib/rapi/client.py
@@ -923,7 +923,8 @@ class GanetiRapiClient(object): # pylint: disable=R0904
("/%s/instances/%s/reboot" %
(GANETI_RAPI_VERSION, instance)), query, None)
- def ShutdownInstance(self, instance, dry_run=False, no_remember=False):
+ def ShutdownInstance(self, instance, dry_run=False, no_remember=False,
+ **kwargs):
"""Shuts down an instance.
@type instance: str
@@ -937,12 +938,14 @@ class GanetiRapiClient(object): # pylint: disable=R0904
"""
query = []
+ body = kwargs
+
_AppendDryRunIf(query, dry_run)
_AppendIf(query, no_remember, ("no-remember", 1))
return self._SendRequest(HTTP_PUT,
("/%s/instances/%s/shutdown" %
- (GANETI_RAPI_VERSION, instance)), query, None)
+ (GANETI_RAPI_VERSION, instance)), query, body)
def StartupInstance(self, instance, dry_run=False, no_remember=False):
"""Starts up an instance.
--
GitLab