utils.log: Split formatter building into separate function

[ganeti-local] / lib / objects.py

diff --git a/lib/objects.py b/lib/objects.py
index c2804bc..fff304b 100644 (file)
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -1,7 +1,7 @@
 #
 #
 
 #
 #
 

-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Google Inc.

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

@@ -528,6 +528,28 @@ class Disk(ConfigObject):
             # be different)
     return result
 
             # be different)
     return result
 

+  def ComputeGrowth(self, amount):
+    """Compute the per-VG growth requirements.
+
+    This only works for VG-based disks.
+
+    @type amount: integer
+    @param amount: the desired increase in (user-visible) disk space
+    @rtype: dict
+    @return: a dictionary of volume-groups and the required size
+
+    """
+    if self.dev_type == constants.LD_LV:
+      return {self.logical_id[0]: amount}
+    elif self.dev_type == constants.LD_DRBD8:
+      if self.children:
+        return self.children[0].ComputeGrowth(amount)
+      else:
+        return {}
+    else:
+      # Other disk types do not require VG space
+      return {}
+

   def RecordGrow(self, amount):
     """Update the size of this disk after growth.
 
   def RecordGrow(self, amount):
     """Update the size of this disk after growth.
 

@@ -808,7 +830,7 @@ class Instance(TaggableObject):
                                  errors.ECODE_INVAL)
     except IndexError:
       raise errors.OpPrereqError("Invalid disk index: %d (instace has disks"
                                  errors.ECODE_INVAL)
     except IndexError:
       raise errors.OpPrereqError("Invalid disk index: %d (instace has disks"

-                                 " 0 to %d" % (idx, len(self.disks)),
+                                 " 0 to %d" % (idx, len(self.disks) - 1),

                                  errors.ECODE_INVAL)
 
   def ToDict(self):
                                  errors.ECODE_INVAL)
 
   def ToDict(self):

@@ -931,6 +953,7 @@ class Node(TaggableObject):
     "master_capable",
     "vm_capable",
     "ndparams",
     "master_capable",
     "vm_capable",
     "ndparams",

+    "powered",

     ] + _TIMESTAMPS + _UUID
 
   def UpgradeConfig(self):
     ] + _TIMESTAMPS + _UUID
 
   def UpgradeConfig(self):

@@ -948,6 +971,9 @@ class Node(TaggableObject):
     if self.ndparams is None:
       self.ndparams = {}
 
     if self.ndparams is None:
       self.ndparams = {}
 

+    if self.powered is None:
+      self.powered = True
+

 
 class NodeGroup(ConfigObject):
   """Config object representing a node group."""
 
 class NodeGroup(ConfigObject):
   """Config object representing a node group."""

@@ -956,6 +982,7 @@ class NodeGroup(ConfigObject):
     "members",
     "ndparams",
     "serial_no",
     "members",
     "ndparams",
     "serial_no",

+    "alloc_policy",

     ] + _TIMESTAMPS + _UUID
 
   def ToDict(self):
     ] + _TIMESTAMPS + _UUID
 
   def ToDict(self):

@@ -990,6 +1017,9 @@ class NodeGroup(ConfigObject):
     if self.serial_no is None:
       self.serial_no = 1
 
     if self.serial_no is None:
       self.serial_no = 1
 

+    if self.alloc_policy is None:
+      self.alloc_policy = constants.ALLOC_POLICY_PREFERRED
+

     # We only update mtime, and not ctime, since we would not be able to provide
     # a correct value for creation time.
     if self.mtime is None:
     # We only update mtime, and not ctime, since we would not be able to provide
     # a correct value for creation time.
     if self.mtime is None:

@@ -1012,7 +1042,7 @@ class NodeGroup(ConfigObject):
     @param ndparams: the dict to fill
     @rtype: dict
     @return: a copy of the passed in ndparams with missing keys filled
     @param ndparams: the dict to fill
     @rtype: dict
     @return: a copy of the passed in ndparams with missing keys filled

-        from the cluster defaults
+        from the node group defaults

 
     """
     return FillDict(self.ndparams, ndparams)
 
     """
     return FillDict(self.ndparams, ndparams)

@@ -1332,6 +1362,7 @@ class ImportExportOptions(ConfigObject):
   @ivar compress: Compression method (one of L{constants.IEC_ALL})
   @ivar magic: Used to ensure the connection goes to the right disk
   @ivar ipv6: Whether to use IPv6
   @ivar compress: Compression method (one of L{constants.IEC_ALL})
   @ivar magic: Used to ensure the connection goes to the right disk
   @ivar ipv6: Whether to use IPv6

+  @ivar connect_timeout: Number of seconds for establishing connection

 
   """
   __slots__ = [
 
   """
   __slots__ = [

@@ -1340,6 +1371,7 @@ class ImportExportOptions(ConfigObject):
     "compress",
     "magic",
     "ipv6",
     "compress",
     "magic",
     "ipv6",

+    "connect_timeout",

     ]
 
 
     ]
 
 

@@ -1380,7 +1412,7 @@ class ConfdReply(ConfigObject):
 class QueryFieldDefinition(ConfigObject):
   """Object holding a query field definition.
 
 class QueryFieldDefinition(ConfigObject):
   """Object holding a query field definition.
 

-  @ivar name: Field name as a regular expression
+  @ivar name: Field name

   @ivar title: Human-readable title
   @ivar kind: Field type
 
   @ivar title: Human-readable title
   @ivar kind: Field type
 

@@ -1392,6 +1424,106 @@ class QueryFieldDefinition(ConfigObject):
     ]
 
 
     ]
 
 

+class _QueryResponseBase(ConfigObject):
+  __slots__ = [
+    "fields",
+    ]
+
+  def ToDict(self):
+    """Custom function for serializing.
+
+    """
+    mydict = super(_QueryResponseBase, self).ToDict()
+    mydict["fields"] = self._ContainerToDicts(mydict["fields"])
+    return mydict
+
+  @classmethod
+  def FromDict(cls, val):
+    """Custom function for de-serializing.
+
+    """
+    obj = super(_QueryResponseBase, cls).FromDict(val)
+    obj.fields = cls._ContainerFromDicts(obj.fields, list, QueryFieldDefinition)
+    return obj
+
+
+class QueryRequest(ConfigObject):
+  """Object holding a query request.
+
+  """
+  __slots__ = [
+    "what",
+    "fields",
+    "filter",
+    ]
+
+
+class QueryResponse(_QueryResponseBase):
+  """Object holding the response to a query.
+
+  @ivar fields: List of L{QueryFieldDefinition} objects
+  @ivar data: Requested data
+
+  """
+  __slots__ = [
+    "data",
+    ]
+
+
+class QueryFieldsRequest(ConfigObject):
+  """Object holding a request for querying available fields.
+
+  """
+  __slots__ = [
+    "what",
+    "fields",
+    ]
+
+
+class QueryFieldsResponse(_QueryResponseBase):
+  """Object holding the response to a query for fields.
+
+  @ivar fields: List of L{QueryFieldDefinition} objects
+
+  """
+  __slots__ = [
+    ]
+
+
+class InstanceConsole(ConfigObject):
+  """Object describing how to access the console of an instance.
+
+  """
+  __slots__ = [
+    "instance",
+    "kind",
+    "message",
+    "host",
+    "port",
+    "user",
+    "command",
+    "display",
+    ]
+
+  def Validate(self):
+    """Validates contents of this object.
+
+    """
+    assert self.kind in constants.CONS_ALL, "Unknown console type"
+    assert self.instance, "Missing instance name"
+    assert self.message or self.kind in [constants.CONS_SSH, constants.CONS_VNC]
+    assert self.host or self.kind == constants.CONS_MESSAGE
+    assert self.port or self.kind in [constants.CONS_MESSAGE,
+                                      constants.CONS_SSH]
+    assert self.user or self.kind in [constants.CONS_MESSAGE,
+                                      constants.CONS_VNC]
+    assert self.command or self.kind in [constants.CONS_MESSAGE,
+                                         constants.CONS_VNC]
+    assert self.display or self.kind in [constants.CONS_MESSAGE,
+                                         constants.CONS_SSH]
+    return True
+
+

 class SerializableConfigParser(ConfigParser.SafeConfigParser):
   """Simple wrapper over ConfigParse that allows serialization.
 
 class SerializableConfigParser(ConfigParser.SafeConfigParser):
   """Simple wrapper over ConfigParse that allows serialization.