Reformat and define exports in cmdlib/__init__.py

cmdlib/__init__.py now simply defines the interface of the cmdlib module
by importing all classes which should be visible to clients.

Also don't ignore C0302 (Too many lines in module) any more.

Signed-off-by: Thomas Thrainer <thomasth@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>

diff --git a/lib/cmdlib/__init__.py b/lib/cmdlib/__init__.py
index c0ea773..95f7713 100644 (file)
--- a/lib/cmdlib/__init__.py
+++ b/lib/cmdlib/__init__.py
@@ -19,62 +19,103 @@
 # 02110-1301, USA.
 
 
-"""Module implementing the master-side code."""
+"""Module implementing the master-side code.
 
-# pylint: disable=W0201,C0302
+This file only imports all LU's (and other classes) in order to re-export them
+to clients of cmdlib.
 
-# W0201 since most LU attributes are defined in CheckPrereq or similar
-# functions
+"""
 
-# C0302: since we have waaaay too many lines in this module
+from ganeti.cmdlib.base import \
+  LogicalUnit, \
+  NoHooksLU, \
+  ResultWithJobs
 
-from ganeti.cmdlib.base import ResultWithJobs, LogicalUnit, NoHooksLU, \
-  Tasklet, _QueryBase
-from ganeti.cmdlib.common import INSTANCE_DOWN, INSTANCE_ONLINE, \
-  INSTANCE_NOT_RUNNING, CAN_CHANGE_INSTANCE_OFFLINE, \
-  _ExpandInstanceName, _ExpandItemName, \
-  _ExpandNodeName, _ShareAll, _CheckNodeGroupInstances, _GetWantedNodes, \
-  _GetWantedInstances, _RunPostHook, _RedistributeAncillaryFiles, \
-  _MergeAndVerifyHvState, _MergeAndVerifyDiskState, _GetUpdatedIPolicy, \
-  _ComputeNewInstanceViolations, _GetUpdatedParams, _CheckOSParams, \
-  _CheckHVParams, _AdjustCandidatePool, _CheckNodePVs, \
-  _ComputeIPolicyInstanceViolation, _AnnotateDiskParams, _SupportsOob, \
-  _ComputeIPolicySpecViolation, _GetDefaultIAllocator, \
-  _CheckInstancesNodeGroups, _LoadNodeEvacResult, _MapInstanceDisksToNodes, \
-  _CheckInstanceNodeGroups, _CheckParamsNotGlobal, \
-  _IsExclusiveStorageEnabledNode, _CheckInstanceState, \
-  _CheckIAllocatorOrNode, _FindFaultyInstanceDisks, _CheckNodeOnline
-from ganeti.cmdlib.instance_utils import _AssembleInstanceDisks, \
-  _BuildInstanceHookEnvByObject, _GetClusterDomainSecret, \
-  _CheckNodeNotDrained, _RemoveDisks, _ShutdownInstanceDisks, \
-  _StartInstanceDisks, _RemoveInstance
-
-from ganeti.cmdlib.cluster import LUClusterActivateMasterIp, \
-  LUClusterDeactivateMasterIp, LUClusterConfigQuery, LUClusterDestroy, \
-  LUClusterPostInit, LUClusterQuery, LUClusterRedistConf, LUClusterRename, \
-  LUClusterRepairDiskSizes, LUClusterSetParams, LUClusterVerify, \
-  LUClusterVerifyConfig, LUClusterVerifyGroup, LUClusterVerifyDisks
-from ganeti.cmdlib.group import LUGroupAdd, LUGroupAssignNodes, \
-  LUGroupQuery, LUGroupSetParams, LUGroupRemove, LUGroupRename, \
-  LUGroupEvacuate, LUGroupVerifyDisks
-from ganeti.cmdlib.node import LUNodeAdd, LUNodeSetParams, \
-  LUNodePowercycle, LUNodeEvacuate, LUNodeMigrate, LUNodeModifyStorage, \
-  LUNodeQuery, LUNodeQueryvols, LUNodeQueryStorage, LUNodeRemove, \
+from ganeti.cmdlib.cluster import \
+  LUClusterActivateMasterIp, \
+  LUClusterDeactivateMasterIp, \
+  LUClusterConfigQuery, \
+  LUClusterDestroy, \
+  LUClusterPostInit, \
+  LUClusterQuery, \
+  LUClusterRedistConf, \
+  LUClusterRename, \
+  LUClusterRepairDiskSizes, \
+  LUClusterSetParams, \
+  LUClusterVerify, \
+  LUClusterVerifyConfig, \
+  LUClusterVerifyGroup, \
+  LUClusterVerifyDisks
+from ganeti.cmdlib.group import \
+  LUGroupAdd, \
+  LUGroupAssignNodes, \
+  LUGroupQuery, \
+  LUGroupSetParams, \
+  LUGroupRemove, \
+  LUGroupRename, \
+  LUGroupEvacuate, \
+  LUGroupVerifyDisks
+from ganeti.cmdlib.node import \
+  LUNodeAdd, \
+  LUNodeSetParams, \
+  LUNodePowercycle, \
+  LUNodeEvacuate, \
+  LUNodeMigrate, \
+  LUNodeModifyStorage, \
+  LUNodeQuery, \
+  LUNodeQueryvols, \
+  LUNodeQueryStorage, \
+  LUNodeRemove, \
   LURepairNodeStorage
-from ganeti.cmdlib.instance import LUInstanceCreate, LUInstanceRename, \
-  LUInstanceRemove, LUInstanceMove, LUInstanceQuery, LUInstanceQueryData, \
-  LUInstanceRecreateDisks, LUInstanceGrowDisk, LUInstanceReplaceDisks, \
-  LUInstanceActivateDisks, LUInstanceDeactivateDisks, LUInstanceStartup, \
-  LUInstanceShutdown, LUInstanceReinstall, LUInstanceReboot, \
-  LUInstanceConsole, LUInstanceFailover, LUInstanceMigrate, \
-  LUInstanceMultiAlloc, LUInstanceSetParams, LUInstanceChangeGroup
-from ganeti.cmdlib.backup import LUBackupQuery, LUBackupPrepare, \
-  LUBackupExport, LUBackupRemove
-from ganeti.cmdlib.query import LUQuery, LUQueryFields
-from ganeti.cmdlib.operating_system import LUOsDiagnose
-from ganeti.cmdlib.tags import LUTagsGet, LUTagsSearch, LUTagsSet, LUTagsDel
-from ganeti.cmdlib.network import LUNetworkAdd, LUNetworkRemove, \
-  LUNetworkSetParams, LUNetworkQuery, LUNetworkConnect, LUNetworkDisconnect
-from ganeti.cmdlib.misc import LUOobCommand, LUExtStorageDiagnose, \
+from ganeti.cmdlib.instance import \
+  LUInstanceCreate, \
+  LUInstanceRename, \
+  LUInstanceRemove, \
+  LUInstanceMove, \
+  LUInstanceQuery, \
+  LUInstanceQueryData, \
+  LUInstanceStartup, \
+  LUInstanceShutdown, \
+  LUInstanceReinstall, \
+  LUInstanceReboot, \
+  LUInstanceConsole, \
+  LUInstanceFailover, \
+  LUInstanceMigrate, \
+  LUInstanceMultiAlloc, \
+  LUInstanceSetParams, \
+  LUInstanceChangeGroup, \
+  LUInstanceRecreateDisks, \
+  LUInstanceGrowDisk, \
+  LUInstanceReplaceDisks, \
+  LUInstanceActivateDisks, \
+  LUInstanceDeactivateDisks
+from ganeti.cmdlib.backup import \
+  LUBackupQuery, \
+  LUBackupPrepare, \
+  LUBackupExport, \
+  LUBackupRemove
+from ganeti.cmdlib.query import \
+  LUQuery, \
+  LUQueryFields
+from ganeti.cmdlib.operating_system import \
+  LUOsDiagnose
+from ganeti.cmdlib.tags import \
+  LUTagsGet, \
+  LUTagsSearch, \
+  LUTagsSet, \
+  LUTagsDel
+from ganeti.cmdlib.network import \
+  LUNetworkAdd, \
+  LUNetworkRemove, \
+  LUNetworkSetParams, \
+  LUNetworkQuery, \
+  LUNetworkConnect, \
+  LUNetworkDisconnect
+from ganeti.cmdlib.misc import \
+  LUOobCommand, \
+  LUExtStorageDiagnose, \
   LURestrictedCommand
-from ganeti.cmdlib.test import LUTestDelay, LUTestJqueue, LUTestAllocator
+from ganeti.cmdlib.test import \
+  LUTestDelay, \
+  LUTestJqueue, \
+  LUTestAllocator