/ - Diff - snf-ganeti - Greek Research and Technology Network's projects

       type
         the request type; this can be either ``allocate``, ``relocate``,
         ``change-group``, ``node-evacuate`` or ``multi-evacuate``. The
         ``change-group`` or ``node-evacuate``. The
         ``allocate`` request is used when a new instance needs to be placed
         on the cluster. The ``relocate`` request is used when an existing
         instance needs to be moved within its node group.
         The ``multi-evacuate`` protocol used to request that the script
         computes the optimal relocate solution for all secondary instances
         of the given nodes. It is now deprecated and should no longer be
         used.
         of the given nodes. It is now deprecated and needs only be
         implemented if backwards compatibility with Ganeti 2.4 and lower is
         needed.
         The ``change-group`` request is used to relocate multiple instances
         across multiple node groups. ``node-evacuate`` evacuates instances
-...
         should be considered for relocating instances to; type
         *list of strings*
     Finally, in the case of multi-evacuate, there's one single request
     argument (in addition to ``type``):
       evac_nodes
         the names of the nodes to be evacuated; type *list of strings*
     Response message
     ~~~~~~~~~~~~~~~~
-...
       serialized opcodes; see the :ref:`design document
       <multi-reloc-result>` for a detailed description
       for multi-evacuation mode, this is a list of lists; each element of
       the list is a list of instance name and the new secondary node
     .. note:: Current Ganeti version accepts either ``result`` or ``nodes``
        as a backwards-compatibility measure (older versions only supported
        ``nodes``)
-...
+        }
+      }
     Input message, node evacuation::
+      {
         "version": 2,
         ...
         "request": {
           "type": "multi-evacuate",
           "evac_nodes": [
             "node2"
           ],
+        }
+      }
     Response messages
     ~~~~~~~~~~~~~~~~~

b/lib/client/gnt_debug.py
163	163
164	164	op = opcodes.OpTestAllocator(mode=opts.mode,
165	165	name=args[0],
166		evac_nodes=args,
167	166	instances=args,
168	167	memory=opts.memory,
169	168	disks=disks,

         self.hypervisor = None
         self.relocate_from = None
         self.name = None
         self.evac_nodes = None
         self.instances = None
         self.evac_mode = None
         self.target_groups = []
-...
+          }
         return request
       def _AddEvacuateNodes(self):
         """Add evacuate nodes data to allocator structure.
         """
         request = {
           "evac_nodes": self.evac_nodes
+          }
         return request
       def _AddNodeEvacuate(self):
         """Get data for node-evacuate requests.
-...
           (_AddRelocateInstance,
            [("name", ht.TString), ("relocate_from", _STRING_LIST)],
            ht.TList),
         constants.IALLOCATOR_MODE_MEVAC:
           (_AddEvacuateNodes, [("evac_nodes", _STRING_LIST)],
            ht.TListOf(ht.TAnd(ht.TIsLength(2), _STRING_LIST))),
          constants.IALLOCATOR_MODE_NODE_EVAC:
           (_AddNodeEvacuate, [
             ("instances", _STRING_LIST),
-...
                                    (self._result_check, self.result),
                                    errors.ECODE_INVAL)
         if self.mode in (constants.IALLOCATOR_MODE_RELOC,
                          constants.IALLOCATOR_MODE_MEVAC):
         if self.mode == constants.IALLOCATOR_MODE_RELOC:
           node2group = dict((name, ndata["group"])
                             for (name, ndata) in self.in_data["nodes"].items())
-...
                                        " differ from original groups (%s)" %
                                        (utils.CommaJoin(result_groups),
                                         utils.CommaJoin(request_groups)))
           elif self.mode == constants.IALLOCATOR_MODE_MEVAC:
             request_groups = fn(self.evac_nodes)
             for (instance_name, secnode) in self.result:
               result_groups = fn([secnode])
               if result_groups != request_groups:
                 raise errors.OpExecError("Iallocator returned new secondary node"
                                          " '%s' (group '%s') for instance '%s'"
                                          " which is not in original group '%s'" %
                                          (secnode, utils.CommaJoin(result_groups),
                                           instance_name,
                                           utils.CommaJoin(request_groups)))
           else:
             raise errors.ProgrammerError("Unhandled mode '%s'" % self.mode)
-...
           self.op.name = fname
           self.relocate_from = \
               list(self.cfg.GetInstanceInfo(fname).secondary_nodes)
         elif self.op.mode == constants.IALLOCATOR_MODE_MEVAC:
           if not hasattr(self.op, "evac_nodes"):
             raise errors.OpPrereqError("Missing attribute 'evac_nodes' on"
                                        " opcode input", errors.ECODE_INVAL)
         elif self.op.mode in (constants.IALLOCATOR_MODE_CHG_GROUP,
                               constants.IALLOCATOR_MODE_NODE_EVAC):
           if not self.op.instances:
-...
                            name=self.op.name,
                            relocate_from=list(self.relocate_from),
+                           )
         elif self.op.mode == constants.IALLOCATOR_MODE_MEVAC:
           ial = IAllocator(self.cfg, self.rpc,
                            mode=self.op.mode,
                            evac_nodes=self.op.evac_nodes)
         elif self.op.mode == constants.IALLOCATOR_MODE_CHG_GROUP:
           ial = IAllocator(self.cfg, self.rpc,
                            mode=self.op.mode,

       ])
     IALLOCATOR_MODE_ALLOC = "allocate"
     IALLOCATOR_MODE_RELOC = "relocate"
     IALLOCATOR_MODE_MEVAC = "multi-evacuate"
     IALLOCATOR_MODE_CHG_GROUP = "change-group"
     IALLOCATOR_MODE_NODE_EVAC = "node-evacuate"
     VALID_IALLOCATOR_MODES = frozenset([
       IALLOCATOR_MODE_ALLOC,
       IALLOCATOR_MODE_RELOC,
       IALLOCATOR_MODE_MEVAC,
       IALLOCATOR_MODE_CHG_GROUP,
       IALLOCATOR_MODE_NODE_EVAC,
       ])

         ("vcpus", None, ht.TOr(ht.TNone, ht.TPositiveInt), None),
         ("os", None, ht.TMaybeString, None),
         ("disk_template", None, ht.TMaybeString, None),
         ("evac_nodes", None, ht.TOr(ht.TNone, ht.TListOf(ht.TNonEmptyString)),
          None),
         ("instances", None, ht.TOr(ht.TNone, ht.TListOf(ht.TNonEmptyString)),
          None),
         ("evac_mode", None,

Synnefo » snf-ganeti

Revision f0edfcf6