X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/d693c8647cc89694ba61bd48bb74f967fbe3bc5a..087ed2edee08da7bd3c4872cabde13c57585ca5a:/lib/objects.py diff --git a/lib/objects.py b/lib/objects.py index 9e098dd..e2154db 100644 --- a/lib/objects.py +++ b/lib/objects.py @@ -285,8 +285,8 @@ class TaggableObject(ConfigObject): class ConfigData(ConfigObject): """Top-level config object.""" - __slots__ = ["version", "cluster", "nodes", "instances", "serial_no"] + \ - _TIMESTAMPS + __slots__ = (["version", "cluster", "nodes", "instances", "serial_no"] + + _TIMESTAMPS) def ToDict(self): """Custom function for top-level config data. @@ -828,12 +828,11 @@ class Cluster(TaggableObject): # default_hypervisor is just the first enabled one in 2.1 if self.default_hypervisor is not None: - self.enabled_hypervisors = [self.default_hypervisor] + \ + self.enabled_hypervisors = ([self.default_hypervisor] + [hvname for hvname in self.enabled_hypervisors - if hvname != self.default_hypervisor] + if hvname != self.default_hypervisor]) self.default_hypervisor = None - def ToDict(self): """Custom function for cluster.