Verify: make skipping checks possible

[ganeti-local] / scripts / gnt-backup

diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index aba46a4..e5a5742 100755 (executable)
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -38,14 +38,16 @@ def PrintExportList(opts, args):
     nothing
 
   """
-
   op = opcodes.OpQueryExports(nodes=opts.nodes)
   exports = SubmitOpCode(op)
   for node in exports:
     print ("Node: %s" % node)
     print ("Exports:")
-    for instance_name in exports[node]:
-      print ("\t%s" % instance_name)
+    if isinstance(exports[node], list):
+      for instance_name in exports[node]:
+        print ("\t%s" % instance_name)
+    else:
+      print ("  Could not get exports list")
 
 
 def ExportInstance(opts, args):
@@ -65,6 +67,7 @@ def ExportInstance(opts, args):
 
   SubmitOpCode(op)
 
+
 def ImportInstance(opts, args):
   """Add an instance to the cluster.
 
@@ -83,32 +86,31 @@ def ImportInstance(opts, args):
     1 in case of error, 0 otherwise
 
   """
-
   instance = args[0]
 
+  (pnode, snode) = SplitNodeOption(opts.node)
+
   op = opcodes.OpCreateInstance(instance_name=instance, mem_size=opts.mem,
                                 disk_size=opts.size, swap_size=opts.swap,
                                 disk_template=opts.disk_template,
-                                mode=constants.INSTANCE_IMPORT, pnode=opts.node,
-                                snode=opts.snode, vcpus=opts.vcpus,
+                                mode=constants.INSTANCE_IMPORT,
+                                pnode=pnode, snode=snode,
+                                vcpus=opts.vcpus, ip_check=opts.ip_check,
                                 ip=opts.ip, bridge=opts.bridge, start=False,
                                 src_node=opts.src_node, src_path=opts.src_dir,
-                                wait_for_sync=opts.wait_for_sync)
+                                wait_for_sync=opts.wait_for_sync, mac="auto")
   SubmitOpCode(op)
   return 0
 
 
-# options used in more than one cmd
-node_opt = make_option("-n", "--node", dest="node", help="Target node",
-                       metavar="<node>")
-force_opt = make_option("-f", "--force", dest="force", action="store_true",
-                        default=False, help="Force the operation")
-
 # this is defined separately due to readability only
 import_opts = [
   DEBUG_OPT,
-  node_opt,
-  cli_option("-s", "--os-size", dest="size", help="Disk size",
+  make_option("-n", "--node", dest="node",
+              help="Target node and optional secondary node",
+              metavar="<pnode>[:<snode>]"),
+  cli_option("-s", "--os-size", dest="size", help="Disk size, in MiB unless"
+             " a suffix is used",
              default=20 * 1024, type="unit", metavar="<size>"),
   cli_option("--swap-size", dest="swap", help="Swap size",
              default=4 * 1024, type="unit", metavar="<size>"),
@@ -117,16 +119,13 @@ import_opts = [
   make_option("-p", "--cpu", dest="vcpus", help="Number of virtual CPUs",
               default=1, type="int", metavar="<PROC>"),
   make_option("-t", "--disk-template", dest="disk_template",
-              help="Custom disk setup (diskless, plain, local_raid1 or"
-              " remote_raid1)", default=None, metavar="TEMPL"),
+              help="Custom disk setup (diskless, plain, local_raid1,"
+              " remote_raid1 or drbd)", default=None, metavar="TEMPL"),
   make_option("-i", "--ip", dest="ip",
               help="IP address ('none' [default], 'auto', or specify address)",
               default='none', type="string", metavar="<ADDRESS>"),
   make_option("--no-wait-for-sync", dest="wait_for_sync", default=True,
               action="store_false", help="Don't wait for sync (DANGEROUS!)"),
-  make_option("--secondary-node", dest="snode",
-              help="Secondary node for remote_raid1 disk layout",
-              metavar="<node>"),
   make_option("-b", "--bridge", dest="bridge",
               help="Bridge to connect this instance to",
               default=None, metavar="<bridge>"),
@@ -134,27 +133,31 @@ import_opts = [
               metavar="<node>"),
   make_option("--src-dir", dest="src_dir", help="Source directory",
               metavar="<dir>"),
+  make_option("--no-ip-check", dest="ip_check", default=True,
+              action="store_false", help="Don't check that the instance's IP"
+              " is alive"),
   ]
 
-
 commands = {
   'list': (PrintExportList, ARGS_NONE,
            [DEBUG_OPT,
-            make_option("--nodes", dest="nodes", default=[], action="append",
-                        help="List only backups stored on these nodes"),
+            make_option("--node", dest="nodes", default=[], action="append",
+                        help="List only backups stored on this node"
+                             " (can be used multiple times)"),
             ],
            "", "Lists instance exports available in the ganeti cluster"),
   'export': (ExportInstance, ARGS_ONE,
-             [node_opt, DEBUG_OPT, force_opt,
+             [DEBUG_OPT, FORCE_OPT,
+              make_option("-n", "--node", dest="node", help="Target node",
+                          metavar="<node>"),
               make_option("","--noshutdown", dest="shutdown",
                           action="store_false", default=True,
                           help="Don't shutdown the instance (unsafe)"), ],
-             "[opts...] <name>",
+             "-n <target_node> [opts...] <name>",
              "Exports an instance to an image"),
   'import': (ImportInstance, ARGS_ONE, import_opts, "[opts...] <name>",
              "Imports an instance from an exported image"),
   }
 
 if __name__ == '__main__':
-  retcode = GenericMain(commands)
-  sys.exit(retcode)
+  sys.exit(GenericMain(commands))