LGTM, thanks.
On Mon, Oct 7, 2013 at 4:38 PM, Jose A. Lopes <[email protected]> wrote: > Add SSCONF related constants to the Haskell to Python constant generation. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > lib/constants.py | 85 +++++++++++++++-------------------- > src/Ganeti/HsConstants.hs | 112 > ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 149 insertions(+), 48 deletions(-) > > diff --git a/lib/constants.py b/lib/constants.py > index 73068f2..004ed8a 100644 > --- a/lib/constants.py > +++ b/lib/constants.py > @@ -1175,54 +1175,43 @@ RSS_DESCRIPTION = _constants.RSS_DESCRIPTION > MAX_NICS = _constants.MAX_NICS > MAX_DISKS = _constants.MAX_DISKS > > -# SSCONF file prefix > -SSCONF_FILEPREFIX = "ssconf_" > -# SSCONF keys > -SS_CLUSTER_NAME = "cluster_name" > -SS_CLUSTER_TAGS = "cluster_tags" > -SS_FILE_STORAGE_DIR = "file_storage_dir" > -SS_SHARED_FILE_STORAGE_DIR = "shared_file_storage_dir" > -SS_MASTER_CANDIDATES = "master_candidates" > -SS_MASTER_CANDIDATES_IPS = "master_candidates_ips" > -SS_MASTER_IP = "master_ip" > -SS_MASTER_NETDEV = "master_netdev" > -SS_MASTER_NETMASK = "master_netmask" > -SS_MASTER_NODE = "master_node" > -SS_NODE_LIST = "node_list" > -SS_NODE_PRIMARY_IPS = "node_primary_ips" > -SS_NODE_SECONDARY_IPS = "node_secondary_ips" > -SS_OFFLINE_NODES = "offline_nodes" > -SS_ONLINE_NODES = "online_nodes" > -SS_PRIMARY_IP_FAMILY = "primary_ip_family" > -SS_INSTANCE_LIST = "instance_list" > -SS_RELEASE_VERSION = "release_version" > -SS_HYPERVISOR_LIST = "hypervisor_list" > -SS_MAINTAIN_NODE_HEALTH = "maintain_node_health" > -SS_UID_POOL = "uid_pool" > -SS_NODEGROUPS = "nodegroups" > -SS_NETWORKS = "networks" > - > -# This is not a complete SSCONF key, but the prefix for the hypervisor > keys > -SS_HVPARAMS_PREF = "hvparams_" > - > -# Hvparams keys: > -SS_HVPARAMS_XEN_PVM = SS_HVPARAMS_PREF + HT_XEN_PVM > -SS_HVPARAMS_XEN_FAKE = SS_HVPARAMS_PREF + HT_FAKE > -SS_HVPARAMS_XEN_HVM = SS_HVPARAMS_PREF + HT_XEN_HVM > -SS_HVPARAMS_XEN_KVM = SS_HVPARAMS_PREF + HT_KVM > -SS_HVPARAMS_XEN_CHROOT = SS_HVPARAMS_PREF + HT_CHROOT > -SS_HVPARAMS_XEN_LXC = SS_HVPARAMS_PREF + HT_LXC > - > -VALID_SS_HVPARAMS_KEYS = compat.UniqueFrozenset([ > - SS_HVPARAMS_XEN_PVM, > - SS_HVPARAMS_XEN_FAKE, > - SS_HVPARAMS_XEN_HVM, > - SS_HVPARAMS_XEN_KVM, > - SS_HVPARAMS_XEN_CHROOT, > - SS_HVPARAMS_XEN_LXC, > - ]) > - > -SS_FILE_PERMS = 0444 > +SSCONF_FILEPREFIX = _constants.SSCONF_FILEPREFIX > + > +SS_CLUSTER_NAME = _constants.SS_CLUSTER_NAME > +SS_CLUSTER_TAGS = _constants.SS_CLUSTER_TAGS > +SS_FILE_STORAGE_DIR = _constants.SS_FILE_STORAGE_DIR > +SS_SHARED_FILE_STORAGE_DIR = _constants.SS_SHARED_FILE_STORAGE_DIR > +SS_MASTER_CANDIDATES = _constants.SS_MASTER_CANDIDATES > +SS_MASTER_CANDIDATES_IPS = _constants.SS_MASTER_CANDIDATES_IPS > +SS_MASTER_IP = _constants.SS_MASTER_IP > +SS_MASTER_NETDEV = _constants.SS_MASTER_NETDEV > +SS_MASTER_NETMASK = _constants.SS_MASTER_NETMASK > +SS_MASTER_NODE = _constants.SS_MASTER_NODE > +SS_NODE_LIST = _constants.SS_NODE_LIST > +SS_NODE_PRIMARY_IPS = _constants.SS_NODE_PRIMARY_IPS > +SS_NODE_SECONDARY_IPS = _constants.SS_NODE_SECONDARY_IPS > +SS_OFFLINE_NODES = _constants.SS_OFFLINE_NODES > +SS_ONLINE_NODES = _constants.SS_ONLINE_NODES > +SS_PRIMARY_IP_FAMILY = _constants.SS_PRIMARY_IP_FAMILY > +SS_INSTANCE_LIST = _constants.SS_INSTANCE_LIST > +SS_RELEASE_VERSION = _constants.SS_RELEASE_VERSION > +SS_HYPERVISOR_LIST = _constants.SS_HYPERVISOR_LIST > +SS_MAINTAIN_NODE_HEALTH = _constants.SS_MAINTAIN_NODE_HEALTH > +SS_UID_POOL = _constants.SS_UID_POOL > +SS_NODEGROUPS = _constants.SS_NODEGROUPS > +SS_NETWORKS = _constants.SS_NETWORKS > + > +SS_HVPARAMS_PREF = _constants.SS_HVPARAMS_PREF > + > +SS_HVPARAMS_XEN_PVM = _constants.SS_HVPARAMS_XEN_PVM > +SS_HVPARAMS_XEN_FAKE = _constants.SS_HVPARAMS_XEN_FAKE > +SS_HVPARAMS_XEN_HVM = _constants.SS_HVPARAMS_XEN_HVM > +SS_HVPARAMS_XEN_KVM = _constants.SS_HVPARAMS_XEN_KVM > +SS_HVPARAMS_XEN_CHROOT = _constants.SS_HVPARAMS_XEN_CHROOT > +SS_HVPARAMS_XEN_LXC = _constants.SS_HVPARAMS_XEN_LXC > +VALID_SS_HVPARAMS_KEYS = _constants.VALID_SS_HVPARAMS_KEYS > + > +SS_FILE_PERMS = _constants.SS_FILE_PERMS > > # cluster wide default parameters > DEFAULT_ENABLED_HYPERVISOR = HT_XEN_PVM > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index 35cf467..feff86c 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -3302,6 +3302,118 @@ maxDisks = Types.maxDisks > maxNics :: Int > maxNics = Types.maxNics > > +-- | SSCONF file prefix > +ssconfFileprefix :: String > +ssconfFileprefix = "ssconf_" > + > +-- * SSCONF keys > + > +ssClusterName :: String > +ssClusterName = "cluster_name" > + > +ssClusterTags :: String > +ssClusterTags = "cluster_tags" > + > +ssFileStorageDir :: String > +ssFileStorageDir = "file_storage_dir" > + > +ssSharedFileStorageDir :: String > +ssSharedFileStorageDir = "shared_file_storage_dir" > + > +ssMasterCandidates :: String > +ssMasterCandidates = "master_candidates" > + > +ssMasterCandidatesIps :: String > +ssMasterCandidatesIps = "master_candidates_ips" > + > +ssMasterIp :: String > +ssMasterIp = "master_ip" > + > +ssMasterNetdev :: String > +ssMasterNetdev = "master_netdev" > + > +ssMasterNetmask :: String > +ssMasterNetmask = "master_netmask" > + > +ssMasterNode :: String > +ssMasterNode = "master_node" > + > +ssNodeList :: String > +ssNodeList = "node_list" > + > +ssNodePrimaryIps :: String > +ssNodePrimaryIps = "node_primary_ips" > + > +ssNodeSecondaryIps :: String > +ssNodeSecondaryIps = "node_secondary_ips" > + > +ssOfflineNodes :: String > +ssOfflineNodes = "offline_nodes" > + > +ssOnlineNodes :: String > +ssOnlineNodes = "online_nodes" > + > +ssPrimaryIpFamily :: String > +ssPrimaryIpFamily = "primary_ip_family" > + > +ssInstanceList :: String > +ssInstanceList = "instance_list" > + > +ssReleaseVersion :: String > +ssReleaseVersion = "release_version" > + > +ssHypervisorList :: String > +ssHypervisorList = "hypervisor_list" > + > +ssMaintainNodeHealth :: String > +ssMaintainNodeHealth = "maintain_node_health" > + > +ssUidPool :: String > +ssUidPool = "uid_pool" > + > +ssNodegroups :: String > +ssNodegroups = "nodegroups" > + > +ssNetworks :: String > +ssNetworks = "networks" > + > +-- | This is not a complete SSCONF key, but the prefix for the > +-- hypervisor keys > +ssHvparamsPref :: String > +ssHvparamsPref = "hvparams_" > + > +-- * Hvparams keys > + > +ssHvparamsXenChroot :: String > +ssHvparamsXenChroot = ssHvparamsPref ++ htChroot > + > +ssHvparamsXenFake :: String > +ssHvparamsXenFake = ssHvparamsPref ++ htFake > + > +ssHvparamsXenHvm :: String > +ssHvparamsXenHvm = ssHvparamsPref ++ htXenHvm > + > +ssHvparamsXenKvm :: String > +ssHvparamsXenKvm = ssHvparamsPref ++ htKvm > + > +ssHvparamsXenLxc :: String > +ssHvparamsXenLxc = ssHvparamsPref ++ htLxc > + > +ssHvparamsXenPvm :: String > +ssHvparamsXenPvm = ssHvparamsPref ++ htXenPvm > + > +validSsHvparamsKeys :: FrozenSet String > +validSsHvparamsKeys = > + ConstantUtils.mkSet [ssHvparamsXenChroot, > + ssHvparamsXenLxc, > + ssHvparamsXenFake, > + ssHvparamsXenHvm, > + ssHvparamsXenKvm, > + ssHvparamsXenPvm] > + > +ssFilePerms :: Int > +ssFilePerms = 0o444 > + > -- * Confd > > confdProtocolVersion :: Int > -- > 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
