LGTM, thanks.
On Mon, Oct 7, 2013 at 4:37 PM, Jose A. Lopes <[email protected]> wrote: > Add script and action related constants to the Haskell to Python > constant generation. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > lib/constants.py | 80 ++++++++++++++++------------------------ > src/Ganeti/HsConstants.hs | 93 > +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 125 insertions(+), 48 deletions(-) > > diff --git a/lib/constants.py b/lib/constants.py > index 9f5d969..5f0c05e 100644 > --- a/lib/constants.py > +++ b/lib/constants.py > @@ -463,54 +463,38 @@ RPC_TMO_4HRS = _constants.RPC_TMO_4HRS > RPC_TMO_1DAY = _constants.RPC_TMO_1DAY > RPC_CONNECT_TIMEOUT = _constants.RPC_CONNECT_TIMEOUT > > -# os related constants > -OS_SCRIPT_CREATE = "create" > -OS_SCRIPT_IMPORT = "import" > -OS_SCRIPT_EXPORT = "export" > -OS_SCRIPT_RENAME = "rename" > -OS_SCRIPT_VERIFY = "verify" > -OS_SCRIPTS = compat.UniqueFrozenset([ > - OS_SCRIPT_CREATE, > - OS_SCRIPT_IMPORT, > - OS_SCRIPT_EXPORT, > - OS_SCRIPT_RENAME, > - OS_SCRIPT_VERIFY, > - ]) > - > -OS_API_FILE = "ganeti_api_version" > -OS_VARIANTS_FILE = "variants.list" > -OS_PARAMETERS_FILE = "parameters.list" > - > -OS_VALIDATE_PARAMETERS = "parameters" > -OS_VALIDATE_CALLS = compat.UniqueFrozenset([OS_VALIDATE_PARAMETERS]) > - > -# External Storage (ES) related constants > -ES_ACTION_CREATE = "create" > -ES_ACTION_REMOVE = "remove" > -ES_ACTION_GROW = "grow" > -ES_ACTION_ATTACH = "attach" > -ES_ACTION_DETACH = "detach" > -ES_ACTION_SETINFO = "setinfo" > -ES_ACTION_VERIFY = "verify" > - > -ES_SCRIPT_CREATE = ES_ACTION_CREATE > -ES_SCRIPT_REMOVE = ES_ACTION_REMOVE > -ES_SCRIPT_GROW = ES_ACTION_GROW > -ES_SCRIPT_ATTACH = ES_ACTION_ATTACH > -ES_SCRIPT_DETACH = ES_ACTION_DETACH > -ES_SCRIPT_SETINFO = ES_ACTION_SETINFO > -ES_SCRIPT_VERIFY = ES_ACTION_VERIFY > -ES_SCRIPTS = frozenset([ > - ES_SCRIPT_CREATE, > - ES_SCRIPT_REMOVE, > - ES_SCRIPT_GROW, > - ES_SCRIPT_ATTACH, > - ES_SCRIPT_DETACH, > - ES_SCRIPT_SETINFO, > - ES_SCRIPT_VERIFY > - ]) > - > -ES_PARAMETERS_FILE = "parameters.list" > +OS_SCRIPT_CREATE = _constants.OS_SCRIPT_CREATE > +OS_SCRIPT_IMPORT = _constants.OS_SCRIPT_IMPORT > +OS_SCRIPT_EXPORT = _constants.OS_SCRIPT_EXPORT > +OS_SCRIPT_RENAME = _constants.OS_SCRIPT_RENAME > +OS_SCRIPT_VERIFY = _constants.OS_SCRIPT_VERIFY > +OS_SCRIPTS = _constants.OS_SCRIPTS > + > +OS_API_FILE = _constants.OS_API_FILE > +OS_VARIANTS_FILE = _constants.OS_VARIANTS_FILE > +OS_PARAMETERS_FILE = _constants.OS_PARAMETERS_FILE > + > +OS_VALIDATE_PARAMETERS = _constants.OS_VALIDATE_PARAMETERS > +OS_VALIDATE_CALLS = _constants.OS_VALIDATE_CALLS > + > +ES_ACTION_CREATE = _constants.ES_ACTION_CREATE > +ES_ACTION_REMOVE = _constants.ES_ACTION_REMOVE > +ES_ACTION_GROW = _constants.ES_ACTION_GROW > +ES_ACTION_ATTACH = _constants.ES_ACTION_ATTACH > +ES_ACTION_DETACH = _constants.ES_ACTION_DETACH > +ES_ACTION_SETINFO = _constants.ES_ACTION_SETINFO > +ES_ACTION_VERIFY = _constants.ES_ACTION_VERIFY > + > +ES_SCRIPT_CREATE = _constants.ES_SCRIPT_CREATE > +ES_SCRIPT_REMOVE = _constants.ES_SCRIPT_REMOVE > +ES_SCRIPT_GROW = _constants.ES_SCRIPT_GROW > +ES_SCRIPT_ATTACH = _constants.ES_SCRIPT_ATTACH > +ES_SCRIPT_DETACH = _constants.ES_SCRIPT_DETACH > +ES_SCRIPT_SETINFO = _constants.ES_SCRIPT_SETINFO > +ES_SCRIPT_VERIFY = _constants.ES_SCRIPT_VERIFY > +ES_SCRIPTS = _constants.ES_SCRIPTS > + > +ES_PARAMETERS_FILE = _constants.ES_PARAMETERS_FILE > > # reboot types > INSTANCE_REBOOT_SOFT = _constants.INSTANCE_REBOOT_SOFT > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index 1483fe2..67e71e0 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -1200,6 +1200,99 @@ rpcTmo_1day = Types.rpcTimeoutToRaw OneDay > rpcConnectTimeout :: Int > rpcConnectTimeout = 5 > > +-- OS > + > +osScriptCreate :: String > +osScriptCreate = "create" > + > +osScriptExport :: String > +osScriptExport = "export" > + > +osScriptImport :: String > +osScriptImport = "import" > + > +osScriptRename :: String > +osScriptRename = "rename" > + > +osScriptVerify :: String > +osScriptVerify = "verify" > + > +osScripts :: [String] > +osScripts = [osScriptCreate, osScriptExport, osScriptImport, > osScriptRename, > + osScriptVerify] > + > +osApiFile :: String > +osApiFile = "ganeti_api_version" > + > +osVariantsFile :: String > +osVariantsFile = "variants.list" > + > +osParametersFile :: String > +osParametersFile = "parameters.list" > + > +osValidateParameters :: String > +osValidateParameters = "parameters" > + > +osValidateCalls :: FrozenSet String > +osValidateCalls = ConstantUtils.mkSet [osValidateParameters] > + > +-- | External Storage (ES) related constants > + > +esActionAttach :: String > +esActionAttach = "attach" > + > +esActionCreate :: String > +esActionCreate = "create" > + > +esActionDetach :: String > +esActionDetach = "detach" > + > +esActionGrow :: String > +esActionGrow = "grow" > + > +esActionRemove :: String > +esActionRemove = "remove" > + > +esActionSetinfo :: String > +esActionSetinfo = "setinfo" > + > +esActionVerify :: String > +esActionVerify = "verify" > + > +esScriptCreate :: String > +esScriptCreate = esActionCreate > + > +esScriptRemove :: String > +esScriptRemove = esActionRemove > + > +esScriptGrow :: String > +esScriptGrow = esActionGrow > + > +esScriptAttach :: String > +esScriptAttach = esActionAttach > + > +esScriptDetach :: String > +esScriptDetach = esActionDetach > + > +esScriptSetinfo :: String > +esScriptSetinfo = esActionSetinfo > + > +esScriptVerify :: String > +esScriptVerify = esActionVerify > + > +esScripts :: FrozenSet String > +esScripts = > + ConstantUtils.mkSet [esScriptAttach, > + esScriptCreate, > + esScriptDetach, > + esScriptGrow, > + esScriptRemove, > + esScriptSetinfo, > + esScriptVerify] > + > +esParametersFile :: String > +esParametersFile = "parameters.list" > + > -- * VTypes > > vtypeBool :: VType > -- > 1.8.4 > > -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
