gnt-backup: Add "--submit" to two commands

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/lib/client/gnt_backup.py b/lib/client/gnt_backup.py
index 10cfabc..35190bb 100644 (file)
--- a/lib/client/gnt_backup.py
+++ b/lib/client/gnt_backup.py
@@ -80,7 +80,7 @@ def ExportInstance(opts, args):
                               remove_instance=opts.remove_instance,
                               ignore_remove_failures=ignore_remove_failures)
 
                               remove_instance=opts.remove_instance,
                               ignore_remove_failures=ignore_remove_failures)
 

-  SubmitOpCode(op, opts=opts)
+  SubmitOrSend(op, opts)

   return 0
 
 
   return 0
 
 

@@ -106,7 +106,7 @@ def RemoveExport(opts, args):
   """
   op = opcodes.OpBackupRemove(instance_name=args[0])
 
   """
   op = opcodes.OpBackupRemove(instance_name=args[0])
 

-  SubmitOpCode(op, opts=opts)
+  SubmitOrSend(op, opts)

   return 0
 
 
   return 0
 
 

@@ -128,7 +128,7 @@ commands = {
     ExportInstance, ARGS_ONE_INSTANCE,
     [FORCE_OPT, SINGLE_NODE_OPT, NOSHUTDOWN_OPT, SHUTDOWN_TIMEOUT_OPT,
      REMOVE_INSTANCE_OPT, IGNORE_REMOVE_FAILURES_OPT, DRY_RUN_OPT,
     ExportInstance, ARGS_ONE_INSTANCE,
     [FORCE_OPT, SINGLE_NODE_OPT, NOSHUTDOWN_OPT, SHUTDOWN_TIMEOUT_OPT,
      REMOVE_INSTANCE_OPT, IGNORE_REMOVE_FAILURES_OPT, DRY_RUN_OPT,

-     PRIORITY_OPT],
+     PRIORITY_OPT, SUBMIT_OPT],

     "-n <target_node> [opts...] <name>",
     "Exports an instance to an image"),
   "import": (
     "-n <target_node> [opts...] <name>",
     "Exports an instance to an image"),
   "import": (

@@ -136,7 +136,8 @@ commands = {
     "[...] -t disk-type -n node[:secondary-node] <name>",
     "Imports an instance from an exported image"),
   "remove": (
     "[...] -t disk-type -n node[:secondary-node] <name>",
     "Imports an instance from an exported image"),
   "remove": (

-    RemoveExport, [ArgUnknown(min=1, max=1)], [DRY_RUN_OPT, PRIORITY_OPT],
+    RemoveExport, [ArgUnknown(min=1, max=1)],
+    [DRY_RUN_OPT, PRIORITY_OPT, SUBMIT_OPT],

     "<name>", "Remove exports of named instance from the filesystem."),
   }
 
     "<name>", "Remove exports of named instance from the filesystem."),
   }
 

diff --git a/man/gnt-backup.rst b/man/gnt-backup.rst
index 7994bd3..4dd66df 100644 (file)
--- a/man/gnt-backup.rst
+++ b/man/gnt-backup.rst
@@ -24,8 +24,9 @@ COMMANDS
 EXPORT
 ~~~~~~
 
 EXPORT
 ~~~~~~
 

-**export** {-n *node*} [\--shutdown-timeout=*N*] [\--noshutdown]
-[\--remove-instance] [\--ignore-remove-failures] {*instance*}
+| **export** {-n *node*} [\--shutdown-timeout=*N*] [\--noshutdown]
+| [\--remove-instance] [\--ignore-remove-failures] [\--submit]
+| {*instance*}

 
 Exports an instance to the target node. All the instance data and
 its configuration will be exported under the
 
 Exports an instance to the target node. All the instance data and
 its configuration will be exported under the

@@ -53,6 +54,9 @@ execution (and will be stored in the job log). It is recommended
 that for any non-zero exit code, the backup is considered invalid,
 and retried.
 
 that for any non-zero exit code, the backup is considered invalid,
 and retried.
 

+See **ganeti(7)** for a description of ``--submit`` and other common
+options.
+

 Example::
 
     # gnt-backup export -n node1.example.com instance3.example.com
 Example::
 
     # gnt-backup export -n node1.example.com instance3.example.com

@@ -71,6 +75,7 @@ IMPORT
 | [-t [diskless | plain | drbd | file]]
 | [\--identify-defaults]
 | [\--ignore-ipolicy]
 | [-t [diskless | plain | drbd | file]]
 | [\--identify-defaults]
 | [\--ignore-ipolicy]

+| [\--submit]

 | {*instance*}
 
 Imports a new instance from an export residing on *source-node* in
 | {*instance*}
 
 Imports a new instance from an export residing on *source-node* in

@@ -205,6 +210,9 @@ value matches the current cluster default and mark it as such
 affect the hypervisor, backend and NIC parameters, both read from
 the export file and passed in via the command line.
 
 affect the hypervisor, backend and NIC parameters, both read from
 the export file and passed in via the command line.
 

+See **ganeti(7)** for a description of ``--submit`` and other common
+options.
+

 Example for identical instance import::
 
     # gnt-backup import -n node1.example.com instance3.example.com
 Example for identical instance import::
 
     # gnt-backup import -n node1.example.com instance3.example.com