Improve mon-collector drbd CLI handling

[ganeti-local] / lib / rpc_defs.py

diff --git a/lib/rpc_defs.py b/lib/rpc_defs.py
index 0b4f6a6..20c349a 100644 (file)
--- a/lib/rpc_defs.py
+++ b/lib/rpc_defs.py
@@ -61,7 +61,7 @@ ACCEPT_OFFLINE_NODE = object()
 (ED_OBJECT_DICT,
  ED_OBJECT_DICT_LIST,
  ED_INST_DICT,
- ED_INST_DICT_HVP_BEP,
+ ED_INST_DICT_HVP_BEP_DP,
  ED_NODE_TO_DISK_DICT,
  ED_INST_DICT_OSP_DP,
  ED_IMPEXP_IO,
@@ -70,7 +70,8 @@ ACCEPT_OFFLINE_NODE = object()
  ED_COMPRESS,
  ED_BLOCKDEV_RENAME,
  ED_DISKS_DICT_DP,
- ED_SINGLE_DISK_DICT_DP) = range(1, 14)
+ ED_SINGLE_DISK_DICT_DP,
+ ED_NIC_DICT) = range(1, 15)
 
 
 def _Prepare(calls):
@@ -263,7 +264,7 @@ _INSTANCE_CALLS = [
     ("instance", ED_INST_DICT, "Instance object"),
     ], None, _MigrationStatusPostProc, "Report migration status"),
   ("instance_start", SINGLE, None, constants.RPC_TMO_NORMAL, [
-    ("instance_hvp_bep", ED_INST_DICT_HVP_BEP, None),
+    ("instance_hvp_bep", ED_INST_DICT_HVP_BEP_DP, None),
     ("startup_paused", None, None),
     ], None, None, "Starts an instance"),
   ("instance_os_add", SINGLE, None, constants.RPC_TMO_1DAY, [
@@ -418,6 +419,10 @@ _BLOCKDEV_CALLS = [
     ], _BlockdevGetMirrorStatusMultiPreProc,
    _BlockdevGetMirrorStatusMultiPostProc,
     "Request status of (mirroring) devices from multiple nodes"),
+  ("blockdev_setinfo", SINGLE, None, constants.RPC_TMO_NORMAL, [
+    ("disk", ED_OBJECT_DICT, None),
+    ("info", None, None),
+    ], None, None, "Sets metadata information on a given block device"),
   ]
 
 _OS_CALLS = [
@@ -475,6 +480,9 @@ _MISC_CALLS = [
     ], None, None, "Modify hosts file with name"),
   ("drbd_helper", MULTI, None, constants.RPC_TMO_URGENT, [],
    None, None, "Gets DRBD helper"),
+  ("restricted_command", MULTI, None, constants.RPC_TMO_SLOW, [
+    ("cmd", None, "Command name"),
+    ], None, None, "Runs restricted command"),
   ("run_oob", SINGLE, None, constants.RPC_TMO_NORMAL, [
     ("oob_program", None, None),
     ("command", None, None),
@@ -497,6 +505,11 @@ _MISC_CALLS = [
     ("hvname", None, "Hypervisor name"),
     ("hvfull", None, "Parameters to be validated"),
     ], None, None, "Validate hypervisor params"),
+  ("get_watcher_pause", SINGLE, None, constants.RPC_TMO_URGENT, [],
+    None, None, "Get watcher pause end"),
+  ("set_watcher_pause", MULTI, None, constants.RPC_TMO_URGENT, [
+    ("until", None, None),
+    ], None, None, "Set watcher pause end"),
   ]
 
 CALLS = {
@@ -514,6 +527,9 @@ CALLS = {
     ("jobqueue_rename", MULTI, None, constants.RPC_TMO_URGENT, [
       ("rename", None, None),
       ], None, None, "Rename job queue file"),
+    ("jobqueue_set_drain_flag", MULTI, None, constants.RPC_TMO_URGENT, [
+      ("flag", None, None),
+      ], None, None, "Set job queue drain flag"),
     ]),
   "RpcClientBootstrap": _Prepare([
     ("node_start_master_daemons", SINGLE, None, constants.RPC_TMO_FAST, [