cli: Pass options in {Add,Remove}Tags

[ganeti-local] / scripts / gnt-backup

diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index a1bb6e6..877933a 100755 (executable)
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 
 #!/usr/bin/python
 #
 

-# Copyright (C) 2006, 2007 Google Inc.
+# Copyright (C) 2006, 2007, 2010 Google Inc.

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

@@ -18,10 +18,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 

+"""Backup related commands"""

 
 

-# pylint: disable-msg=W0401,W0614
+# pylint: disable-msg=W0401,W0613,W0614,C0103

 # W0401: Wildcard import ganeti.cli
 # W0401: Wildcard import ganeti.cli

+# W0613: Unused argument, since all functions follow the same API

 # W0614: Unused import %s from wildcard import (since we need cli)
 # W0614: Unused import %s from wildcard import (since we need cli)

+# C0103: Invalid name gnt-backup

 
 import sys
 
 
 import sys
 

@@ -29,7 +32,6 @@ from ganeti.cli import *
 from ganeti import opcodes
 from ganeti import constants
 from ganeti import errors
 from ganeti import opcodes
 from ganeti import constants
 from ganeti import errors

-from ganeti import utils

 
 
 _VALUE_TRUE = "true"
 
 
 _VALUE_TRUE = "true"

@@ -70,124 +72,30 @@ def ExportInstance(opts, args):
   @return: the desired exit code
 
   """
   @return: the desired exit code
 
   """

+  ignore_remove_failures = opts.ignore_remove_failures
+
+  if not opts.node:
+    raise errors.OpPrereqError("Target node must be specified",
+                               errors.ECODE_INVAL)
+

   op = opcodes.OpExportInstance(instance_name=args[0],
                                 target_node=opts.node,
   op = opcodes.OpExportInstance(instance_name=args[0],
                                 target_node=opts.node,

-                                shutdown=opts.shutdown)
-
-  fin_resu, dlist = SubmitOpCode(op)
-  if not isinstance(dlist, list):
-    ToStderr("Cannot parse execution results")
-    return 1
-  tot_dsk = len(dlist)
-  # TODO: handle diskless instances
-  if dlist.count(False) == 0:
-    # all OK
-    rcode = 0
-  elif dlist.count(True) == 0:
-    ToStderr("Error: No disks were backed up successfully."
-             " The export doesn't have any valid data,"
-             " it is recommended to retry the operation.")
-    rcode = 1
-  else:
-    ToStderr("Partial export failure: %d disks backed up, %d disks failed.",
-             dlist.count(True), dlist.count(False))
-    rcode = 2
-  if not fin_resu:
-    rcode = 1
-  return rcode
+                                shutdown=opts.shutdown,
+                                shutdown_timeout=opts.shutdown_timeout,
+                                remove_instance=opts.remove_instance,
+                                ignore_remove_failures=ignore_remove_failures)
+
+  SubmitOpCode(op, opts=opts)
+  return 0
+

 
 def ImportInstance(opts, args):
   """Add an instance to the cluster.
 
 
 def ImportInstance(opts, args):
   """Add an instance to the cluster.
 

-  @param opts: the command line options selected by the user
-  @type args: list
-  @param args: should contain only one element, the new instance name
-  @rtype: int
-  @return: the desired exit code
+  This is just a wrapper over GenericInstanceCreate.

 
   """
 
   """

-  instance = args[0]
-
-  (pnode, snode) = SplitNodeOption(opts.node)
-
-  hypervisor = None
-  hvparams = {}
-  if opts.hypervisor:
-    hypervisor, hvparams = opts.hypervisor
-
-  if opts.nics:
-    try:
-      nic_max = max(int(nidx[0])+1 for nidx in opts.nics)
-    except ValueError, err:
-      raise errors.OpPrereqError("Invalid NIC index passed: %s" % str(err))
-    nics = [{}] * nic_max
-    for nidx, ndict in opts.nics:
-      nidx = int(nidx)
-      if not isinstance(ndict, dict):
-        msg = "Invalid nic/%d value: expected dict, got %s" % (nidx, ndict)
-        raise errors.OpPrereqError(msg)
-      nics[nidx] = ndict
-  elif opts.no_nics:
-    # no nics
-    nics = []
-  else:
-    # default of one nic, all auto
-    nics = [{}]
-
-  if opts.disk_template == constants.DT_DISKLESS:
-    if opts.disks or opts.sd_size is not None:
-      raise errors.OpPrereqError("Diskless instance but disk"
-                                 " information passed")
-    disks = []
-  else:
-    if not opts.disks and not opts.sd_size:
-      raise errors.OpPrereqError("No disk information specified")
-    if opts.disks and opts.sd_size is not None:
-      raise errors.OpPrereqError("Please use either the '--disk' or"
-                                 " '-s' option")
-    if opts.sd_size is not None:
-      opts.disks = [(0, {"size": opts.sd_size})]
-    try:
-      disk_max = max(int(didx[0])+1 for didx in opts.disks)
-    except ValueError, err:
-      raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err))
-    disks = [{}] * disk_max
-    for didx, ddict in opts.disks:
-      didx = int(didx)
-      if not isinstance(ddict, dict):
-        msg = "Invalid disk/%d value: expected dict, got %s" % (didx, ddict)
-        raise errors.OpPrereqError(msg)
-      elif "size" not in ddict:
-        raise errors.OpPrereqError("Missing size for disk %d" % didx)
-      try:
-        ddict["size"] = utils.ParseUnit(ddict["size"])
-      except ValueError, err:
-        raise errors.OpPrereqError("Invalid disk size for disk %d: %s" %
-                                   (didx, err))
-      disks[didx] = ddict
-
-  utils.ForceDictType(opts.beparams, constants.BES_PARAMETER_TYPES)
-  utils.ForceDictType(hvparams, constants.HVS_PARAMETER_TYPES)
-
-  op = opcodes.OpCreateInstance(instance_name=instance,
-                                disk_template=opts.disk_template,
-                                disks=disks,
-                                nics=nics,
-                                mode=constants.INSTANCE_IMPORT,
-                                pnode=pnode, snode=snode,
-                                ip_check=opts.ip_check,
-                                start=False,
-                                src_node=opts.src_node, src_path=opts.src_dir,
-                                wait_for_sync=opts.wait_for_sync,
-                                file_storage_dir=opts.file_storage_dir,
-                                file_driver=opts.file_driver,
-                                iallocator=opts.iallocator,
-                                hypervisor=hypervisor,
-                                hvparams=hvparams,
-                                beparams=opts.beparams)
-
-  SubmitOpCode(op)
-  return 0
+  return GenericInstanceCreate(constants.INSTANCE_IMPORT, opts, args)

 
 
 def RemoveExport(opts, args):
 
 
 def RemoveExport(opts, args):

@@ -201,75 +109,55 @@ def RemoveExport(opts, args):
   @return: the desired exit code
 
   """
   @return: the desired exit code
 
   """

-  instance = args[0]

   op = opcodes.OpRemoveExport(instance_name=args[0])
 
   op = opcodes.OpRemoveExport(instance_name=args[0])
 

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

   return 0
 
 
 # this is defined separately due to readability only
 import_opts = [
   return 0
 
 
 # this is defined separately due to readability only
 import_opts = [

-  DEBUG_OPT,
-  cli_option("-n", "--node", dest="node",
-             help="Target node and optional secondary node",
-             metavar="<pnode>[:<snode>]",
-             completion_suggest=OPT_COMPL_INST_ADD_NODES),

   BACKEND_OPT,
   BACKEND_OPT,

+  DISK_OPT,

   DISK_TEMPLATE_OPT,
   DISK_TEMPLATE_OPT,

-  cli_option("--disk", help="Disk information",
-             default=[], dest="disks",
-             action="append",
-             type="identkeyval"),
-  cli_option("-s", "--os-size", dest="sd_size", help="Disk size for a"
-             " single-disk configuration, when not using the --disk option,"
-             " in MiB unless a suffix is used",
-             default=None, type="unit", metavar="<size>"),
-  cli_option("--net", help="NIC information",
-             default=[], dest="nics",
-             action="append",
-             type="identkeyval"),
-  NONICS_OPT,
-  NWSYNC_OPT,
-  cli_option("--src-node", dest="src_node", help="Source node",
-             metavar="<node>",
-             completion_suggest=OPT_COMPL_ONE_NODE),
-  cli_option("--src-dir", dest="src_dir", help="Source directory",
-             metavar="<dir>"),
-  NOIPCHECK_OPT,
-  IALLOCATOR_OPT,

   FILESTORE_DIR_OPT,
   FILESTORE_DRIVER_OPT,
   HYPERVISOR_OPT,
   FILESTORE_DIR_OPT,
   FILESTORE_DRIVER_OPT,
   HYPERVISOR_OPT,

+  IALLOCATOR_OPT,
+  IDENTIFY_DEFAULTS_OPT,
+  NET_OPT,
+  NODE_PLACEMENT_OPT,
+  NOIPCHECK_OPT,
+  NONAMECHECK_OPT,
+  NONICS_OPT,
+  NWSYNC_OPT,
+  OSPARAMS_OPT,
+  OS_SIZE_OPT,
+  SRC_DIR_OPT,
+  SRC_NODE_OPT,
+  SUBMIT_OPT,
+  DRY_RUN_OPT,

   ]
 
   ]
 

+

 commands = {
 commands = {

-  'list': (PrintExportList, ARGS_NONE,
-           [DEBUG_OPT,
-            cli_option("--node", dest="nodes", default=[], action="append",
-                       help="List only backups stored on this node"
-                            " (can be used multiple times)",
-                       completion_suggest=OPT_COMPL_ONE_NODE),
-            ],
-           "", "Lists instance exports available in the ganeti cluster"),
-  'export': (ExportInstance, ARGS_ONE_INSTANCE,
-             [DEBUG_OPT, FORCE_OPT,
-              cli_option("-n", "--node", dest="node", help="Target node",
-                         metavar="<node>",
-                         completion_suggest=OPT_COMPL_ONE_NODE),
-              cli_option("","--noshutdown", dest="shutdown",
-                         action="store_false", default=True,
-                         help="Don't shutdown the instance (unsafe)"), ],
-             "-n <target_node> [opts...] <name>",
-             "Exports an instance to an image"),
-  'import': (ImportInstance, ARGS_ONE_INSTANCE, import_opts,
-             ("[...] -t disk-type -n node[:secondary-node]"
-              " <name>"),
-             "Imports an instance from an exported image"),
-  'remove': (RemoveExport, [ArgUnknown(min=1, max=1)],
-             [DEBUG_OPT],
-             "<name>",
-             "Remove exports of named instance from the filesystem."),
+  'list': (
+    PrintExportList, ARGS_NONE,
+    [NODE_LIST_OPT],
+    "", "Lists instance exports available in the ganeti cluster"),
+  'export': (
+    ExportInstance, ARGS_ONE_INSTANCE,
+    [FORCE_OPT, SINGLE_NODE_OPT, NOSHUTDOWN_OPT, SHUTDOWN_TIMEOUT_OPT,
+     REMOVE_INSTANCE_OPT, IGNORE_REMOVE_FAILURES_OPT, DRY_RUN_OPT],
+    "-n <target_node> [opts...] <name>",
+    "Exports an instance to an image"),
+  'import': (
+    ImportInstance, ARGS_ONE_INSTANCE, import_opts,
+    "[...] -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],
+    "<name>", "Remove exports of named instance from the filesystem."),

   }
 
 
   }