KVM: Add auxiliary functions to handle tap devices

[ganeti-local] / lib / cmdlib.py

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 361dc30..8bd6d64 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -872,7 +872,7 @@ def _NICListToTuple(lu, nics):
   """Build a list of nic information tuples.
 
   This list is suitable to be passed to _BuildInstanceHookEnv or as a return
   """Build a list of nic information tuples.
 
   This list is suitable to be passed to _BuildInstanceHookEnv or as a return

-  value in LUQueryInstanceData.
+  value in LUInstanceQueryData.

 
   @type lu:  L{LogicalUnit}
   @param lu: the logical unit on whose behalf we execute
 
   @type lu:  L{LogicalUnit}
   @param lu: the logical unit on whose behalf we execute

@@ -1089,7 +1089,7 @@ def _CheckIAllocatorOrNode(lu, iallocator_slot, node_slot):
                                  " iallocator.")
 
 
                                  " iallocator.")
 
 

-class LUPostInitCluster(LogicalUnit):
+class LUClusterPostInit(LogicalUnit):

   """Logical unit for running hooks after cluster initialization.
 
   """
   """Logical unit for running hooks after cluster initialization.
 
   """

@@ -1111,7 +1111,7 @@ class LUPostInitCluster(LogicalUnit):
     return True
 
 
     return True
 
 

-class LUDestroyCluster(LogicalUnit):
+class LUClusterDestroy(LogicalUnit):

   """Logical unit for destroying the cluster.
 
   """
   """Logical unit for destroying the cluster.
 
   """

@@ -1167,7 +1167,7 @@ class LUDestroyCluster(LogicalUnit):
 
 
 def _VerifyCertificate(filename):
 
 
 def _VerifyCertificate(filename):

-  """Verifies a certificate for LUVerifyCluster.
+  """Verifies a certificate for LUClusterVerify.

 
   @type filename: string
   @param filename: Path to PEM file
 
   @type filename: string
   @param filename: Path to PEM file

@@ -1177,7 +1177,7 @@ def _VerifyCertificate(filename):
     cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
                                            utils.ReadFile(filename))
   except Exception, err: # pylint: disable-msg=W0703
     cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM,
                                            utils.ReadFile(filename))
   except Exception, err: # pylint: disable-msg=W0703

-    return (LUVerifyCluster.ETYPE_ERROR,
+    return (LUClusterVerify.ETYPE_ERROR,

             "Failed to load X509 certificate %s: %s" % (filename, err))
 
   (errcode, msg) = \
             "Failed to load X509 certificate %s: %s" % (filename, err))
 
   (errcode, msg) = \

@@ -1192,14 +1192,14 @@ def _VerifyCertificate(filename):
   if errcode is None:
     return (None, fnamemsg)
   elif errcode == utils.CERT_WARNING:
   if errcode is None:
     return (None, fnamemsg)
   elif errcode == utils.CERT_WARNING:

-    return (LUVerifyCluster.ETYPE_WARNING, fnamemsg)
+    return (LUClusterVerify.ETYPE_WARNING, fnamemsg)

   elif errcode == utils.CERT_ERROR:
   elif errcode == utils.CERT_ERROR:

-    return (LUVerifyCluster.ETYPE_ERROR, fnamemsg)
+    return (LUClusterVerify.ETYPE_ERROR, fnamemsg)

 
   raise errors.ProgrammerError("Unhandled certificate error code %r" % errcode)
 
 
 
   raise errors.ProgrammerError("Unhandled certificate error code %r" % errcode)
 
 

-class LUVerifyCluster(LogicalUnit):
+class LUClusterVerify(LogicalUnit):

   """Verifies the cluster status.
 
   """
   """Verifies the cluster status.
 
   """

@@ -2381,7 +2381,7 @@ class LUVerifyCluster(LogicalUnit):
       return lu_result
 
 
       return lu_result
 
 

-class LUVerifyDisks(NoHooksLU):
+class LUClusterVerifyDisks(NoHooksLU):

   """Verifies the cluster disks status.
 
   """
   """Verifies the cluster disks status.
 
   """

@@ -2456,7 +2456,7 @@ class LUVerifyDisks(NoHooksLU):
     return result
 
 
     return result
 
 

-class LURepairDiskSizes(NoHooksLU):
+class LUClusterRepairDiskSizes(NoHooksLU):

   """Verifies the cluster disks sizes.
 
   """
   """Verifies the cluster disks sizes.
 
   """

@@ -2571,7 +2571,7 @@ class LURepairDiskSizes(NoHooksLU):
     return changed
 
 
     return changed
 
 

-class LURenameCluster(LogicalUnit):
+class LUClusterRename(LogicalUnit):

   """Rename the cluster.
 
   """
   """Rename the cluster.
 
   """

@@ -2649,7 +2649,7 @@ class LURenameCluster(LogicalUnit):
     return clustername
 
 
     return clustername
 
 

-class LUSetClusterParams(LogicalUnit):
+class LUClusterSetParams(LogicalUnit):

   """Change the parameters of the cluster.
 
   """
   """Change the parameters of the cluster.
 
   """

@@ -3044,7 +3044,7 @@ def _RedistributeAncillaryFiles(lu, additional_nodes=None, additional_vm=True):
     _UploadHelper(lu, vm_nodes, fname)
 
 
     _UploadHelper(lu, vm_nodes, fname)
 
 

-class LURedistributeConfig(NoHooksLU):
+class LUClusterRedistConf(NoHooksLU):

   """Force the redistribution of cluster configuration.
 
   This is a very simple LU.
   """Force the redistribution of cluster configuration.
 
   This is a very simple LU.

@@ -3295,7 +3295,7 @@ class LUOobCommand(NoHooksLU):
 
 
 
 
 
 

-class LUDiagnoseOS(NoHooksLU):
+class LUOsDiagnose(NoHooksLU):

   """Logical unit for OS diagnose/query.
 
   """
   """Logical unit for OS diagnose/query.
 
   """

@@ -3429,7 +3429,7 @@ class LUDiagnoseOS(NoHooksLU):
     return output
 
 
     return output
 
 

-class LURemoveNode(LogicalUnit):
+class LUNodeRemove(LogicalUnit):

   """Logical unit for removing a node.
 
   """
   """Logical unit for removing a node.
 
   """

@@ -3598,7 +3598,7 @@ class _NodeQuery(_QueryBase):
                                oob_support, lu.cfg.GetClusterInfo())
 
 
                                oob_support, lu.cfg.GetClusterInfo())
 
 

-class LUQueryNodes(NoHooksLU):
+class LUNodeQuery(NoHooksLU):

   """Logical unit for querying nodes.
 
   """
   """Logical unit for querying nodes.
 
   """

@@ -3616,7 +3616,7 @@ class LUQueryNodes(NoHooksLU):
     return self.nq.OldStyleQuery(self)
 
 
     return self.nq.OldStyleQuery(self)
 
 

-class LUQueryNodeVolumes(NoHooksLU):
+class LUNodeQueryvols(NoHooksLU):

   """Logical unit for getting volumes on node(s).
 
   """
   """Logical unit for getting volumes on node(s).
 
   """

@@ -3694,7 +3694,7 @@ class LUQueryNodeVolumes(NoHooksLU):
     return output
 
 
     return output
 
 

-class LUQueryNodeStorage(NoHooksLU):
+class LUNodeQueryStorage(NoHooksLU):

   """Logical unit for getting information on storage units on node(s).
 
   """
   """Logical unit for getting information on storage units on node(s).
 
   """

@@ -3887,7 +3887,7 @@ class LUQueryFields(NoHooksLU):
     return self.qcls.FieldsQuery(self.op.fields)
 
 
     return self.qcls.FieldsQuery(self.op.fields)
 
 

-class LUModifyNodeStorage(NoHooksLU):
+class LUNodeModifyStorage(NoHooksLU):

   """Logical unit for modifying a storage volume on a node.
 
   """
   """Logical unit for modifying a storage volume on a node.
 
   """

@@ -3929,7 +3929,7 @@ class LUModifyNodeStorage(NoHooksLU):
                  (self.op.name, self.op.node_name))
 
 
                  (self.op.name, self.op.node_name))
 
 

-class LUAddNode(LogicalUnit):
+class LUNodeAdd(LogicalUnit):

   """Logical unit for adding node to the cluster.
 
   """
   """Logical unit for adding node to the cluster.
 
   """

@@ -4191,7 +4191,7 @@ class LUAddNode(LogicalUnit):
       self.context.AddNode(new_node, self.proc.GetECId())
 
 
       self.context.AddNode(new_node, self.proc.GetECId())
 
 

-class LUSetNodeParams(LogicalUnit):
+class LUNodeSetParams(LogicalUnit):

   """Modifies the parameters of a node.
 
   @cvar _F2R: a dictionary from tuples of flags (mc, drained, offline)
   """Modifies the parameters of a node.
 
   @cvar _F2R: a dictionary from tuples of flags (mc, drained, offline)

@@ -4484,7 +4484,7 @@ class LUSetNodeParams(LogicalUnit):
     return result
 
 
     return result
 
 

-class LUPowercycleNode(NoHooksLU):
+class LUNodePowercycle(NoHooksLU):

   """Powercycles a node.
 
   """
   """Powercycles a node.
 
   """

@@ -4516,7 +4516,7 @@ class LUPowercycleNode(NoHooksLU):
     return result.payload
 
 
     return result.payload
 
 

-class LUQueryClusterInfo(NoHooksLU):
+class LUClusterQuery(NoHooksLU):

   """Query cluster configuration.
 
   """
   """Query cluster configuration.
 
   """

@@ -4582,7 +4582,7 @@ class LUQueryClusterInfo(NoHooksLU):
     return result
 
 
     return result
 
 

-class LUQueryConfigValues(NoHooksLU):
+class LUClusterConfigQuery(NoHooksLU):

   """Return configuration values.
 
   """
   """Return configuration values.
 
   """

@@ -4621,7 +4621,7 @@ class LUQueryConfigValues(NoHooksLU):
     return values
 
 
     return values
 
 

-class LUActivateInstanceDisks(NoHooksLU):
+class LUInstanceActivateDisks(NoHooksLU):

   """Bring up an instance's disks.
 
   """
   """Bring up an instance's disks.
 
   """

@@ -4763,7 +4763,7 @@ def _StartInstanceDisks(lu, instance, force):
     raise errors.OpExecError("Disk consistency error")
 
 
     raise errors.OpExecError("Disk consistency error")
 
 

-class LUDeactivateInstanceDisks(NoHooksLU):
+class LUInstanceDeactivateDisks(NoHooksLU):

   """Shutdown an instance's disks.
 
   """
   """Shutdown an instance's disks.
 
   """

@@ -4948,7 +4948,7 @@ def _CheckNodesFreeDiskOnVG(lu, nodenames, vg, requested):
                                  errors.ECODE_NORES)
 
 
                                  errors.ECODE_NORES)
 
 

-class LUStartupInstance(LogicalUnit):
+class LUInstanceStartup(LogicalUnit):

   """Starts an instance.
 
   """
   """Starts an instance.
 
   """

@@ -5049,7 +5049,7 @@ class LUStartupInstance(LogicalUnit):
         raise errors.OpExecError("Could not start instance: %s" % msg)
 
 
         raise errors.OpExecError("Could not start instance: %s" % msg)
 
 

-class LURebootInstance(LogicalUnit):
+class LUInstanceReboot(LogicalUnit):

   """Reboot an instance.
 
   """
   """Reboot an instance.
 
   """

@@ -5124,7 +5124,7 @@ class LURebootInstance(LogicalUnit):
     self.cfg.MarkInstanceUp(instance.name)
 
 
     self.cfg.MarkInstanceUp(instance.name)
 
 

-class LUShutdownInstance(LogicalUnit):
+class LUInstanceShutdown(LogicalUnit):

   """Shutdown an instance.
 
   """
   """Shutdown an instance.
 
   """

@@ -5186,7 +5186,7 @@ class LUShutdownInstance(LogicalUnit):
       _ShutdownInstanceDisks(self, instance)
 
 
       _ShutdownInstanceDisks(self, instance)
 
 

-class LUReinstallInstance(LogicalUnit):
+class LUInstanceReinstall(LogicalUnit):

   """Reinstall an instance.
 
   """
   """Reinstall an instance.
 
   """

@@ -5272,7 +5272,7 @@ class LUReinstallInstance(LogicalUnit):
       _ShutdownInstanceDisks(self, inst)
 
 
       _ShutdownInstanceDisks(self, inst)
 
 

-class LURecreateInstanceDisks(LogicalUnit):
+class LUInstanceRecreateDisks(LogicalUnit):

   """Recreate an instance's missing disks.
 
   """
   """Recreate an instance's missing disks.
 
   """

@@ -5332,7 +5332,7 @@ class LURecreateInstanceDisks(LogicalUnit):
     _CreateDisks(self, self.instance, to_skip=to_skip)
 
 
     _CreateDisks(self, self.instance, to_skip=to_skip)
 
 

-class LURenameInstance(LogicalUnit):
+class LUInstanceRename(LogicalUnit):

   """Rename an instance.
 
   """
   """Rename an instance.
 
   """

@@ -5437,7 +5437,7 @@ class LURenameInstance(LogicalUnit):
     return inst.name
 
 
     return inst.name
 
 

-class LURemoveInstance(LogicalUnit):
+class LUInstanceRemove(LogicalUnit):

   """Remove an instance.
 
   """
   """Remove an instance.
 
   """

@@ -5520,7 +5520,7 @@ def _RemoveInstance(lu, feedback_fn, instance, ignore_failures):
   lu.remove_locks[locking.LEVEL_INSTANCE] = instance.name
 
 
   lu.remove_locks[locking.LEVEL_INSTANCE] = instance.name
 
 

-class LUQueryInstances(NoHooksLU):
+class LUInstanceQuery(NoHooksLU):

   """Logical unit for querying instances.
 
   """
   """Logical unit for querying instances.
 
   """

@@ -5541,7 +5541,7 @@ class LUQueryInstances(NoHooksLU):
     return self.iq.OldStyleQuery(self)
 
 
     return self.iq.OldStyleQuery(self)
 
 

-class LUFailoverInstance(LogicalUnit):
+class LUInstanceFailover(LogicalUnit):

   """Failover an instance.
 
   """
   """Failover an instance.
 
   """

@@ -5688,7 +5688,7 @@ class LUFailoverInstance(LogicalUnit):
                                  (instance.name, target_node, msg))
 
 
                                  (instance.name, target_node, msg))
 
 

-class LUMigrateInstance(LogicalUnit):
+class LUInstanceMigrate(LogicalUnit):

   """Migrate an instance.
 
   This is migration without shutting down, compared to the failover,
   """Migrate an instance.
 
   This is migration without shutting down, compared to the failover,

@@ -5737,7 +5737,7 @@ class LUMigrateInstance(LogicalUnit):
     return env, nl, nl_post
 
 
     return env, nl, nl_post
 
 

-class LUMoveInstance(LogicalUnit):
+class LUInstanceMove(LogicalUnit):

   """Move an instance by data-copying.
 
   """
   """Move an instance by data-copying.
 
   """

@@ -5912,7 +5912,7 @@ class LUMoveInstance(LogicalUnit):
                                  (instance.name, target_node, msg))
 
 
                                  (instance.name, target_node, msg))
 
 

-class LUMigrateNode(LogicalUnit):
+class LUNodeMigrate(LogicalUnit):

   """Migrate all instances from a node.
 
   """
   """Migrate all instances from a node.
 
   """

@@ -6608,7 +6608,7 @@ def _CreateDisks(lu, instance, to_skip=None, target_node=None):
                  " node %s" % (file_storage_dir, pnode))
 
   # Note: this needs to be kept in sync with adding of disks in
                  " node %s" % (file_storage_dir, pnode))
 
   # Note: this needs to be kept in sync with adding of disks in

-  # LUSetInstanceParams
+  # LUInstanceSetParams

   for idx, device in enumerate(instance.disks):
     if to_skip and idx in to_skip:
       continue
   for idx, device in enumerate(instance.disks):
     if to_skip and idx in to_skip:
       continue

@@ -6775,7 +6775,7 @@ def _CheckOSParams(lu, required, nodenames, osname, osparams):
                  osname, node)
 
 
                  osname, node)
 
 

-class LUCreateInstance(LogicalUnit):
+class LUInstanceCreate(LogicalUnit):

   """Create an instance.
 
   """
   """Create an instance.
 
   """

@@ -7686,7 +7686,7 @@ class LUCreateInstance(LogicalUnit):
     return list(iobj.all_nodes)
 
 
     return list(iobj.all_nodes)
 
 

-class LUConnectConsole(NoHooksLU):
+class LUInstanceConsole(NoHooksLU):

   """Connect to an instance's console.
 
   This is somewhat special in that it returns the command line that
   """Connect to an instance's console.
 
   This is somewhat special in that it returns the command line that

@@ -7745,7 +7745,7 @@ class LUConnectConsole(NoHooksLU):
     return console.ToDict()
 
 
     return console.ToDict()
 
 

-class LUReplaceDisks(LogicalUnit):
+class LUInstanceReplaceDisks(LogicalUnit):

   """Replace the disks of an instance.
 
   """
   """Replace the disks of an instance.
 
   """

@@ -8545,7 +8545,7 @@ class LURepairNodeStorage(NoHooksLU):
                  (self.op.name, self.op.node_name))
 
 
                  (self.op.name, self.op.node_name))
 
 

-class LUNodeEvacuationStrategy(NoHooksLU):
+class LUNodeEvacStrategy(NoHooksLU):

   """Computes the node evacuation strategy.
 
   """
   """Computes the node evacuation strategy.
 
   """

@@ -8589,7 +8589,7 @@ class LUNodeEvacuationStrategy(NoHooksLU):
     return result
 
 
     return result
 
 

-class LUGrowDisk(LogicalUnit):
+class LUInstanceGrowDisk(LogicalUnit):

   """Grow a disk of an instance.
 
   """
   """Grow a disk of an instance.
 
   """

@@ -8685,7 +8685,7 @@ class LUGrowDisk(LogicalUnit):
                            " sync mode was requested.")
 
 
                            " sync mode was requested.")
 
 

-class LUQueryInstanceData(NoHooksLU):
+class LUInstanceQueryData(NoHooksLU):

   """Query runtime instance data.
 
   """
   """Query runtime instance data.
 
   """

@@ -8839,7 +8839,7 @@ class LUQueryInstanceData(NoHooksLU):
     return result
 
 
     return result
 
 

-class LUSetInstanceParams(LogicalUnit):
+class LUInstanceSetParams(LogicalUnit):

   """Modifies an instances's parameters.
 
   """
   """Modifies an instances's parameters.
 
   """

@@ -9494,7 +9494,7 @@ class LUSetInstanceParams(LogicalUnit):
     }
 
 
     }
 
 

-class LUQueryExports(NoHooksLU):
+class LUBackupQuery(NoHooksLU):

   """Query the exports list
 
   """
   """Query the exports list
 
   """

@@ -9753,7 +9753,7 @@ class LUBackupExport(LogicalUnit):
     nodelist.remove(self.dst_node.name)
 
     # on one-node clusters nodelist will be empty after the removal
     nodelist.remove(self.dst_node.name)
 
     # on one-node clusters nodelist will be empty after the removal

-    # if we proceed the backup would be removed because OpQueryExports
+    # if we proceed the backup would be removed because OpBackupQuery

     # substitutes an empty list with the full cluster node list.
     iname = self.instance.name
     if nodelist:
     # substitutes an empty list with the full cluster node list.
     iname = self.instance.name
     if nodelist:

@@ -9869,7 +9869,7 @@ class LUBackupExport(LogicalUnit):
     return fin_resu, dresults
 
 
     return fin_resu, dresults
 
 

-class LURemoveExport(NoHooksLU):
+class LUBackupRemove(NoHooksLU):

   """Remove exports related to the named instance.
 
   """
   """Remove exports related to the named instance.
 
   """

@@ -9916,7 +9916,7 @@ class LURemoveExport(NoHooksLU):
                   " Domain Name.")
 
 
                   " Domain Name.")
 
 

-class LUAddGroup(LogicalUnit):
+class LUGroupAdd(LogicalUnit):

   """Logical unit for creating node groups.
 
   """
   """Logical unit for creating node groups.
 
   """

@@ -9975,7 +9975,7 @@ class LUAddGroup(LogicalUnit):
     del self.remove_locks[locking.LEVEL_NODEGROUP]
 
 
     del self.remove_locks[locking.LEVEL_NODEGROUP]
 
 

-class LUAssignGroupNodes(NoHooksLU):
+class LUGroupAssignNodes(NoHooksLU):

   """Logical unit for assigning nodes to groups.
 
   """
   """Logical unit for assigning nodes to groups.
 
   """

@@ -10166,7 +10166,7 @@ class _GroupQuery(_QueryBase):
                                 group_to_nodes, group_to_instances)
 
 
                                 group_to_nodes, group_to_instances)
 
 

-class LUQueryGroups(NoHooksLU):
+class LUGroupQuery(NoHooksLU):

   """Logical unit for querying node groups.
 
   """
   """Logical unit for querying node groups.
 
   """

@@ -10182,7 +10182,7 @@ class LUQueryGroups(NoHooksLU):
     return self.gq.OldStyleQuery(self)
 
 
     return self.gq.OldStyleQuery(self)
 
 

-class LUSetGroupParams(LogicalUnit):
+class LUGroupSetParams(LogicalUnit):

   """Modifies the parameters of a node group.
 
   """
   """Modifies the parameters of a node group.
 
   """

@@ -10252,7 +10252,7 @@ class LUSetGroupParams(LogicalUnit):
 
 
 
 
 
 

-class LURemoveGroup(LogicalUnit):
+class LUGroupRemove(LogicalUnit):

   HPATH = "group-remove"
   HTYPE = constants.HTYPE_GROUP
   REQ_BGL = False
   HPATH = "group-remove"
   HTYPE = constants.HTYPE_GROUP
   REQ_BGL = False

@@ -10314,7 +10314,7 @@ class LURemoveGroup(LogicalUnit):
     self.remove_locks[locking.LEVEL_NODEGROUP] = self.group_uuid
 
 
     self.remove_locks[locking.LEVEL_NODEGROUP] = self.group_uuid
 
 

-class LURenameGroup(LogicalUnit):
+class LUGroupRename(LogicalUnit):

   HPATH = "group-rename"
   HTYPE = constants.HTYPE_GROUP
   REQ_BGL = False
   HPATH = "group-rename"
   HTYPE = constants.HTYPE_GROUP
   REQ_BGL = False

@@ -10414,7 +10414,7 @@ class TagsLU(NoHooksLU): # pylint: disable-msg=W0223
                                  str(self.op.kind), errors.ECODE_INVAL)
 
 
                                  str(self.op.kind), errors.ECODE_INVAL)
 
 

-class LUGetTags(TagsLU):
+class LUTagsGet(TagsLU):

   """Returns the tags of a given object.
 
   """
   """Returns the tags of a given object.
 
   """

@@ -10433,7 +10433,7 @@ class LUGetTags(TagsLU):
     return list(self.target.GetTags())
 
 
     return list(self.target.GetTags())
 
 

-class LUSearchTags(NoHooksLU):
+class LUTagsSearch(NoHooksLU):

   """Searches the tags for a given pattern.
 
   """
   """Searches the tags for a given pattern.
 
   """

@@ -10472,7 +10472,7 @@ class LUSearchTags(NoHooksLU):
     return results
 
 
     return results
 
 

-class LUAddTags(TagsLU):
+class LUTagsSet(TagsLU):

   """Sets a tag on a given object.
 
   """
   """Sets a tag on a given object.
 
   """

@@ -10500,7 +10500,7 @@ class LUAddTags(TagsLU):
     self.cfg.Update(self.target, feedback_fn)
 
 
     self.cfg.Update(self.target, feedback_fn)
 
 

-class LUDelTags(TagsLU):
+class LUTagsDel(TagsLU):

   """Delete a list of tags from a given object.
 
   """
   """Delete a list of tags from a given object.
 
   """

@@ -10582,7 +10582,7 @@ class LUTestDelay(NoHooksLU):
         self._TestDelay()
 
 
         self._TestDelay()
 
 

-class LUTestJobqueue(NoHooksLU):
+class LUTestJqueue(NoHooksLU):

   """Utility LU to test some aspects of the job queue.
 
   """
   """Utility LU to test some aspects of the job queue.
 
   """