X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/0d68c45dd6c904fcbddf58901fa61d03c7dae8c3..2ee88aeb76a2430ec0c7f86629bf66cfd0b6f564:/lib/objects.py diff --git a/lib/objects.py b/lib/objects.py index 89473fe..51ef992 100644 --- a/lib/objects.py +++ b/lib/objects.py @@ -37,7 +37,39 @@ from ganeti import constants __all__ = ["ConfigObject", "ConfigData", "NIC", "Disk", "Instance", - "OS", "Node", "Cluster"] + "OS", "Node", "Cluster", "FillDict"] + +def FillDict(defaults_dict, custom_dict): + """Basic function to apply settings on top a default dict. + + @type defaults_dict: dict + @param defaults_dict: dictionary holding the default values + @type custom_dict: dict + @param custom_dict: dictionary holding customized value + @rtype: dict + @return: dict with the 'full' values + + """ + ret_dict = copy.deepcopy(defaults_dict) + ret_dict.update(custom_dict) + return ret_dict + + +def UpgradeGroupedParams(target, defaults): + """Update all groups for the target parameter. + + @type target: dict of dicts + @param target: {group: {parameter: value}} + @type defaults: dict + @param defaults: default parameter values + + """ + if target is None: + target = {constants.PP_DEFAULT: defaults} + else: + for group in target: + target[group] = FillDict(defaults, target[group]) + return target class ConfigObject(object): @@ -58,6 +90,7 @@ class ConfigObject(object): def __init__(self, **kwargs): for k, v in kwargs.iteritems(): setattr(self, k, v) + self.UpgradeConfig() def __getattr__(self, name): if name not in self.__slots__: @@ -157,6 +190,15 @@ class ConfigObject(object): """Implement __repr__ for ConfigObjects.""" return repr(self.ToDict()) + def UpgradeConfig(self): + """Fill defaults for missing configuration values. + + This method will be called at object init time, and its implementation will + be object dependent. + + """ + pass + class TaggableObject(ConfigObject): """An generic class supporting tags. @@ -179,7 +221,7 @@ class TaggableObject(ConfigObject): constants.MAX_TAG_LEN) if not tag: raise errors.TagError("Tags cannot be empty") - if not re.match("^[ \w.+*/:-]+$", tag): + if not re.match("^[\w.+*/:-]+$", tag): raise errors.TagError("Tag contains invalid characters") def GetTags(self): @@ -268,7 +310,35 @@ class ConfigData(ConfigObject): class NIC(ConfigObject): """Config object representing a network card.""" - __slots__ = ["mac", "ip", "bridge"] + __slots__ = ["mac", "ip", "bridge", "nicparams"] + + @classmethod + def CheckParameterSyntax(cls, nicparams): + """Check the given parameters for validity. + + @type nicparams: dict + @param nicparams: dictionary with parameter names/value + @raise errors.ConfigurationError: when a parameter is not valid + + """ + if nicparams[constants.NIC_MODE] not in constants.NIC_VALID_MODES: + err = "Invalid nic mode: %s" % nicparams[constants.NIC_MODE] + raise errors.ConfigurationError(err) + + if (nicparams[constants.NIC_MODE] is constants.NIC_MODE_BRIDGED and + not nicparams[constants.NIC_LINK]): + err = "Missing bridged nic link" + raise errors.ConfigurationError(err) + + def UpgradeConfig(self): + """Fill defaults for missing configuration values. + + """ + if self.nicparams is None: + self.nicparams = {} + if self.bridge is not None: + self.nicparams[constants.NIC_MODE] = constants.NIC_MODE_BRIDGED + self.nicparams[constants.NIC_LINK] = self.bridge class Disk(ConfigObject): @@ -494,9 +564,21 @@ class Disk(ConfigObject): val += ", not visible" else: val += ", visible as /dev/%s" % self.iv_name - val += ", size=%dm)>" % self.size + if isinstance(self.size, int): + val += ", size=%dm)>" % self.size + else: + val += ", size='%s')>" % (self.size,) return val + def Verify(self): + """Checks that this disk is correctly configured. + + """ + errors = [] + if self.mode not in constants.DISK_ACCESS_SET: + errors.append("Disk access mode '%s' is invalid" % (self.mode, )) + return errors + class Instance(TaggableObject): """Config object representing an instance.""" @@ -689,6 +771,7 @@ class Node(TaggableObject): "serial_no", "master_candidate", "offline", + "drained", ] @@ -711,9 +794,34 @@ class Cluster(TaggableObject): "enabled_hypervisors", "hvparams", "beparams", + "nicparams", "candidate_pool_size", + "modify_etc_hosts", ] + def UpgradeConfig(self): + """Fill defaults for missing configuration values. + + """ + if self.hvparams is None: + self.hvparams = constants.HVC_DEFAULTS + else: + for hypervisor in self.hvparams: + self.hvparams[hypervisor] = FillDict( + constants.HVC_DEFAULTS[hypervisor], self.hvparams[hypervisor]) + + self.beparams = UpgradeGroupedParams(self.beparams, + constants.BEC_DEFAULTS) + migrate_default_bridge = not self.nicparams + self.nicparams = UpgradeGroupedParams(self.nicparams, + constants.NICC_DEFAULTS) + if migrate_default_bridge: + self.nicparams[constants.PP_DEFAULT][constants.NIC_LINK] = \ + self.default_bridge + + if self.modify_etc_hosts is None: + self.modify_etc_hosts = True + def ToDict(self): """Custom function for cluster. @@ -732,22 +840,6 @@ class Cluster(TaggableObject): obj.tcpudp_port_pool = set(obj.tcpudp_port_pool) return obj - @staticmethod - def FillDict(defaults_dict, custom_dict): - """Basic function to apply settings on top a default dict. - - @type defaults_dict: dict - @param defaults_dict: dictionary holding the default values - @type custom_dict: dict - @param custom_dict: dictionary holding customized value - @rtype: dict - @return: dict with the 'full' values - - """ - ret_dict = copy.deepcopy(defaults_dict) - ret_dict.update(custom_dict) - return ret_dict - def FillHV(self, instance): """Fill an instance's hvparams dict. @@ -758,7 +850,7 @@ class Cluster(TaggableObject): the cluster defaults """ - return self.FillDict(self.hvparams.get(instance.hypervisor, {}), + return FillDict(self.hvparams.get(instance.hypervisor, {}), instance.hvparams) def FillBE(self, instance): @@ -771,8 +863,8 @@ class Cluster(TaggableObject): the cluster defaults """ - return self.FillDict(self.beparams.get(constants.BEGR_DEFAULT, {}), - instance.beparams) + return FillDict(self.beparams.get(constants.PP_DEFAULT, {}), + instance.beparams) class SerializableConfigParser(ConfigParser.SafeConfigParser):