From fbb056867337f72f4aafae4123509ba3632a4a6d Mon Sep 17 00:00:00 2001 From: "Jose A. Lopes" Date: Wed, 6 Nov 2013 11:34:44 +0100 Subject: [PATCH] Hs2Py constants: additional module luxi Add constants from additional modules ('ganeti.luxi') to the Haskell to Python constant generation. Signed-off-by: Jose A. Lopes Reviewed-by: Klaus Aehlig --- autotools/convert-constants | 2 - lib/luxi.py | 91 ++++++++++++--------------------- src/Ganeti/HsConstants.hs | 116 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 61 deletions(-) diff --git a/autotools/convert-constants b/autotools/convert-constants index 40e14b1..8ec64a8 100755 --- a/autotools/convert-constants +++ b/autotools/convert-constants @@ -27,7 +27,6 @@ import types from ganeti import compat from ganeti import errors -from ganeti import luxi from ganeti import qlang from ganeti import jstore @@ -299,7 +298,6 @@ def Convert(module, prefix): def main(): - print Convert(luxi, "luxi") print Convert(qlang, "qlang") print Convert(errors, "errors") print Convert(jstore, "jstore") diff --git a/lib/luxi.py b/lib/luxi.py index 29f3aef..c78de95 100644 --- a/lib/luxi.py +++ b/lib/luxi.py @@ -35,7 +35,6 @@ import time import errno import logging -from ganeti import compat from ganeti import serializer from ganeti import constants from ganeti import errors @@ -44,64 +43,38 @@ from ganeti import objects from ganeti import pathutils -KEY_METHOD = "method" -KEY_ARGS = "args" -KEY_SUCCESS = "success" -KEY_RESULT = "result" -KEY_VERSION = "version" - -REQ_SUBMIT_JOB = "SubmitJob" -REQ_SUBMIT_JOB_TO_DRAINED_QUEUE = "SubmitJobToDrainedQueue" -REQ_SUBMIT_MANY_JOBS = "SubmitManyJobs" -REQ_WAIT_FOR_JOB_CHANGE = "WaitForJobChange" -REQ_CANCEL_JOB = "CancelJob" -REQ_ARCHIVE_JOB = "ArchiveJob" -REQ_CHANGE_JOB_PRIORITY = "ChangeJobPriority" -REQ_AUTO_ARCHIVE_JOBS = "AutoArchiveJobs" -REQ_QUERY = "Query" -REQ_QUERY_FIELDS = "QueryFields" -REQ_QUERY_JOBS = "QueryJobs" -REQ_QUERY_INSTANCES = "QueryInstances" -REQ_QUERY_NODES = "QueryNodes" -REQ_QUERY_GROUPS = "QueryGroups" -REQ_QUERY_NETWORKS = "QueryNetworks" -REQ_QUERY_EXPORTS = "QueryExports" -REQ_QUERY_CONFIG_VALUES = "QueryConfigValues" -REQ_QUERY_CLUSTER_INFO = "QueryClusterInfo" -REQ_QUERY_TAGS = "QueryTags" -REQ_SET_DRAIN_FLAG = "SetDrainFlag" -REQ_SET_WATCHER_PAUSE = "SetWatcherPause" - -#: List of all LUXI requests -REQ_ALL = compat.UniqueFrozenset([ - REQ_ARCHIVE_JOB, - REQ_AUTO_ARCHIVE_JOBS, - REQ_CANCEL_JOB, - REQ_CHANGE_JOB_PRIORITY, - REQ_QUERY, - REQ_QUERY_CLUSTER_INFO, - REQ_QUERY_CONFIG_VALUES, - REQ_QUERY_EXPORTS, - REQ_QUERY_FIELDS, - REQ_QUERY_GROUPS, - REQ_QUERY_INSTANCES, - REQ_QUERY_JOBS, - REQ_QUERY_NODES, - REQ_QUERY_NETWORKS, - REQ_QUERY_TAGS, - REQ_SET_DRAIN_FLAG, - REQ_SET_WATCHER_PAUSE, - REQ_SUBMIT_JOB, - REQ_SUBMIT_JOB_TO_DRAINED_QUEUE, - REQ_SUBMIT_MANY_JOBS, - REQ_WAIT_FOR_JOB_CHANGE, - ]) - -DEF_CTMO = 10 -DEF_RWTO = 60 - -# WaitForJobChange timeout -WFJC_TIMEOUT = (DEF_RWTO - 1) / 2 +KEY_METHOD = constants.LUXI_KEY_METHOD +KEY_ARGS = constants.LUXI_KEY_ARGS +KEY_SUCCESS = constants.LUXI_KEY_SUCCESS +KEY_RESULT = constants.LUXI_KEY_RESULT +KEY_VERSION = constants.LUXI_KEY_VERSION + +REQ_SUBMIT_JOB = constants.LUXI_REQ_SUBMIT_JOB +REQ_SUBMIT_JOB_TO_DRAINED_QUEUE = constants.LUXI_REQ_SUBMIT_JOB_TO_DRAINED_QUEUE +REQ_SUBMIT_MANY_JOBS = constants.LUXI_REQ_SUBMIT_MANY_JOBS +REQ_WAIT_FOR_JOB_CHANGE = constants.LUXI_REQ_WAIT_FOR_JOB_CHANGE +REQ_CANCEL_JOB = constants.LUXI_REQ_CANCEL_JOB +REQ_ARCHIVE_JOB = constants.LUXI_REQ_ARCHIVE_JOB +REQ_CHANGE_JOB_PRIORITY = constants.LUXI_REQ_CHANGE_JOB_PRIORITY +REQ_AUTO_ARCHIVE_JOBS = constants.LUXI_REQ_AUTO_ARCHIVE_JOBS +REQ_QUERY = constants.LUXI_REQ_QUERY +REQ_QUERY_FIELDS = constants.LUXI_REQ_QUERY_FIELDS +REQ_QUERY_JOBS = constants.LUXI_REQ_QUERY_JOBS +REQ_QUERY_INSTANCES = constants.LUXI_REQ_QUERY_INSTANCES +REQ_QUERY_NODES = constants.LUXI_REQ_QUERY_NODES +REQ_QUERY_GROUPS = constants.LUXI_REQ_QUERY_GROUPS +REQ_QUERY_NETWORKS = constants.LUXI_REQ_QUERY_NETWORKS +REQ_QUERY_EXPORTS = constants.LUXI_REQ_QUERY_EXPORTS +REQ_QUERY_CONFIG_VALUES = constants.LUXI_REQ_QUERY_CONFIG_VALUES +REQ_QUERY_CLUSTER_INFO = constants.LUXI_REQ_QUERY_CLUSTER_INFO +REQ_QUERY_TAGS = constants.LUXI_REQ_QUERY_TAGS +REQ_SET_DRAIN_FLAG = constants.LUXI_REQ_SET_DRAIN_FLAG +REQ_SET_WATCHER_PAUSE = constants.LUXI_REQ_SET_WATCHER_PAUSE +REQ_ALL = constants.LUXI_REQ_ALL + +DEF_CTMO = constants.LUXI_DEF_CTMO +DEF_RWTO = constants.LUXI_DEF_RWTO +WFJC_TIMEOUT = constants.LUXI_WFJC_TIMEOUT class ProtocolError(errors.LuxiError): diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs index 891c393..4b4cd83 100644 --- a/src/Ganeti/HsConstants.hs +++ b/src/Ganeti/HsConstants.hs @@ -4314,3 +4314,119 @@ diskRemoveRetryInterval = 3 uuidRegex :: String uuidRegex = "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" + +-- * Luxi constants + +luxiKeyMethod :: String +luxiKeyMethod = "method" + +luxiKeyArgs :: String +luxiKeyArgs = "args" + +luxiKeySuccess :: String +luxiKeySuccess = "success" + +luxiKeyResult :: String +luxiKeyResult = "result" + +luxiKeyVersion :: String +luxiKeyVersion = "version" + +luxiReqSubmitJob :: String +luxiReqSubmitJob = "SubmitJob" + +luxiReqSubmitJobToDrainedQueue :: String +luxiReqSubmitJobToDrainedQueue = "SubmitJobToDrainedQueue" + +luxiReqSubmitManyJobs :: String +luxiReqSubmitManyJobs = "SubmitManyJobs" + +luxiReqWaitForJobChange :: String +luxiReqWaitForJobChange = "WaitForJobChange" + +luxiReqCancelJob :: String +luxiReqCancelJob = "CancelJob" + +luxiReqArchiveJob :: String +luxiReqArchiveJob = "ArchiveJob" + +luxiReqChangeJobPriority :: String +luxiReqChangeJobPriority = "ChangeJobPriority" + +luxiReqAutoArchiveJobs :: String +luxiReqAutoArchiveJobs = "AutoArchiveJobs" + +luxiReqQuery :: String +luxiReqQuery = "Query" + +luxiReqQueryFields :: String +luxiReqQueryFields = "QueryFields" + +luxiReqQueryJobs :: String +luxiReqQueryJobs = "QueryJobs" + +luxiReqQueryInstances :: String +luxiReqQueryInstances = "QueryInstances" + +luxiReqQueryNodes :: String +luxiReqQueryNodes = "QueryNodes" + +luxiReqQueryGroups :: String +luxiReqQueryGroups = "QueryGroups" + +luxiReqQueryNetworks :: String +luxiReqQueryNetworks = "QueryNetworks" + +luxiReqQueryExports :: String +luxiReqQueryExports = "QueryExports" + +luxiReqQueryConfigValues :: String +luxiReqQueryConfigValues = "QueryConfigValues" + +luxiReqQueryClusterInfo :: String +luxiReqQueryClusterInfo = "QueryClusterInfo" + +luxiReqQueryTags :: String +luxiReqQueryTags = "QueryTags" + +luxiReqSetDrainFlag :: String +luxiReqSetDrainFlag = "SetDrainFlag" + +luxiReqSetWatcherPause :: String +luxiReqSetWatcherPause = "SetWatcherPause" + +luxiReqAll :: FrozenSet String +luxiReqAll = + ConstantUtils.mkSet + [ luxiReqArchiveJob + , luxiReqAutoArchiveJobs + , luxiReqCancelJob + , luxiReqChangeJobPriority + , luxiReqQuery + , luxiReqQueryClusterInfo + , luxiReqQueryConfigValues + , luxiReqQueryExports + , luxiReqQueryFields + , luxiReqQueryGroups + , luxiReqQueryInstances + , luxiReqQueryJobs + , luxiReqQueryNodes + , luxiReqQueryNetworks + , luxiReqQueryTags + , luxiReqSetDrainFlag + , luxiReqSetWatcherPause + , luxiReqSubmitJob + , luxiReqSubmitJobToDrainedQueue + , luxiReqSubmitManyJobs + , luxiReqWaitForJobChange + ] + +luxiDefCtmo :: Int +luxiDefCtmo = 10 + +luxiDefRwto :: Int +luxiDefRwto = 60 + +-- | 'WaitForJobChange' timeout +luxiWfjcTimeout :: Int +luxiWfjcTimeout = (luxiDefRwto - 1) `div` 2 -- 1.7.10.4