Add the options attribute to cli.JobExecutor

[ganeti-local] / lib / rpc.py

diff --git a/lib/rpc.py b/lib/rpc.py
index 3c12e2a..d9114f1 100644 (file)
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -42,7 +42,8 @@ from ganeti import serializer
 from ganeti import constants
 from ganeti import errors
 
 from ganeti import constants
 from ganeti import errors
 

-import ganeti.http.client
+# pylint has a bug here, doesn't see this import
+import ganeti.http.client  # pylint: disable-msg=W0611

 
 
 # Module level variable
 
 
 # Module level variable

@@ -55,10 +56,12 @@ def Init():
   Must be called before using any RPC function.
 
   """
   Must be called before using any RPC function.
 
   """

-  global _http_manager
+  global _http_manager # pylint: disable-msg=W0603

 
   assert not _http_manager, "RPC module initialized more than once"
 
 
   assert not _http_manager, "RPC module initialized more than once"
 

+  http.InitSsl()
+

   _http_manager = http.client.HttpClientManager()
 
 
   _http_manager = http.client.HttpClientManager()
 
 

@@ -68,7 +71,7 @@ def Shutdown():
   Must be called before quitting the program.
 
   """
   Must be called before quitting the program.
 
   """

-  global _http_manager
+  global _http_manager # pylint: disable-msg=W0603

 
   if _http_manager:
     _http_manager.Shutdown()
 
   if _http_manager:
     _http_manager.Shutdown()

@@ -137,7 +140,7 @@ class RpcResult(object):
     else:
       return "No error information"
 
     else:
       return "No error information"
 

-  def Raise(self, msg, prereq=False):
+  def Raise(self, msg, prereq=False, ecode=None):

     """If the result has failed, raise an OpExecError.
 
     This is used so that LU code doesn't have to check for each
     """If the result has failed, raise an OpExecError.
 
     This is used so that LU code doesn't have to check for each

@@ -156,7 +159,11 @@ class RpcResult(object):
       ec = errors.OpPrereqError
     else:
       ec = errors.OpExecError
       ec = errors.OpPrereqError
     else:
       ec = errors.OpExecError

-    raise ec(msg)
+    if ecode is not None:
+      args = (msg, prereq)
+    else:
+      args = (msg, )
+    raise ec(*args) # pylint: disable-msg=W0142

 
 
 class Client:
 
 
 class Client:

@@ -569,23 +576,23 @@ class RpcRunner(object):
                                 [self._InstDict(inst), reboot_type,
                                  shutdown_timeout])
 
                                 [self._InstDict(inst), reboot_type,
                                  shutdown_timeout])
 

-  def call_instance_os_add(self, node, inst, reinstall):
+  def call_instance_os_add(self, node, inst, reinstall, debug):

     """Installs an OS on the given instance.
 
     This is a single-node call.
 
     """
     return self._SingleNodeCall(node, "instance_os_add",
     """Installs an OS on the given instance.
 
     This is a single-node call.
 
     """
     return self._SingleNodeCall(node, "instance_os_add",

-                                [self._InstDict(inst), reinstall])
+                                [self._InstDict(inst), reinstall, debug])

 
 

-  def call_instance_run_rename(self, node, inst, old_name):
+  def call_instance_run_rename(self, node, inst, old_name, debug):

     """Run the OS rename script for an instance.
 
     This is a single-node call.
 
     """
     return self._SingleNodeCall(node, "instance_run_rename",
     """Run the OS rename script for an instance.
 
     This is a single-node call.
 
     """
     return self._SingleNodeCall(node, "instance_run_rename",

-                                [self._InstDict(inst), old_name])
+                                [self._InstDict(inst), old_name, debug])

 
   def call_instance_info(self, node, instance, hname):
     """Returns information about a single instance.
 
   def call_instance_info(self, node, instance, hname):
     """Returns information about a single instance.

@@ -981,7 +988,7 @@ class RpcRunner(object):
     return self._SingleNodeCall(node, "blockdev_snapshot", [cf_bdev.ToDict()])
 
   def call_snapshot_export(self, node, snap_bdev, dest_node, instance,
     return self._SingleNodeCall(node, "blockdev_snapshot", [cf_bdev.ToDict()])
 
   def call_snapshot_export(self, node, snap_bdev, dest_node, instance,

-                           cluster_name, idx):
+                           cluster_name, idx, debug):

     """Request the export of a given snapshot.
 
     This is a single-node call.
     """Request the export of a given snapshot.
 
     This is a single-node call.

@@ -989,7 +996,8 @@ class RpcRunner(object):
     """
     return self._SingleNodeCall(node, "snapshot_export",
                                 [snap_bdev.ToDict(), dest_node,
     """
     return self._SingleNodeCall(node, "snapshot_export",
                                 [snap_bdev.ToDict(), dest_node,

-                                 self._InstDict(instance), cluster_name, idx])
+                                 self._InstDict(instance), cluster_name,
+                                 idx, debug])

 
   def call_finalize_export(self, node, instance, snap_disks):
     """Request the completion of an export operation.
 
   def call_finalize_export(self, node, instance, snap_disks):
     """Request the completion of an export operation.

@@ -1018,7 +1026,7 @@ class RpcRunner(object):
     return self._SingleNodeCall(node, "export_info", [path])
 
   def call_instance_os_import(self, node, inst, src_node, src_images,
     return self._SingleNodeCall(node, "export_info", [path])
 
   def call_instance_os_import(self, node, inst, src_node, src_images,

-                              cluster_name):
+                              cluster_name, debug):

     """Request the import of a backup into an instance.
 
     This is a single-node call.
     """Request the import of a backup into an instance.
 
     This is a single-node call.

@@ -1026,7 +1034,7 @@ class RpcRunner(object):
     """
     return self._SingleNodeCall(node, "instance_os_import",
                                 [self._InstDict(inst), src_node, src_images,
     """
     return self._SingleNodeCall(node, "instance_os_import",
                                 [self._InstDict(inst), src_node, src_images,

-                                 cluster_name])
+                                 cluster_name, debug])

 
   def call_export_list(self, node_list):
     """Gets the stored exports list.
 
   def call_export_list(self, node_list):
     """Gets the stored exports list.