QA: remove the --default-hypervisor option

[ganeti-local] / lib / ssconf.py

diff --git a/lib/ssconf.py b/lib/ssconf.py
index 630a3f6..5f59c44 100644 (file)
--- a/lib/ssconf.py
+++ b/lib/ssconf.py
@@ -28,6 +28,7 @@ configuration data, which is mostly static and available to all nodes.
 
 import sys
 import re
+import os
 
 from ganeti import errors
 from ganeti import constants
@@ -52,12 +53,39 @@ class SimpleConfigReader(object):
 
     """
     self._file_name = file_name
-    self.Reload()
+    self._last_inode = None
+    self._last_mtime = None
+    self._last_size = None
+    # we need a forced reload at class init time, to initialize _last_*
+    self._Load(force=True)
 
-  def Reload(self):
-    """Reloads the config file.
+  def _Load(self, force=False):
+    """Loads (or reloads) the config file.
+
+    @type force: boolean
+    @param force: whether to force the reload without checking the mtime
+    @rtype: boolean
+    @return: boolean values that says whether we reloaded the configuration or not
+             (because we decided it was already up-to-date)
 
     """
+    cfg_stat = os.stat(self._file_name)
+    inode = cfg_stat.st_ino
+    mtime = cfg_stat.st_mtime
+    size = cfg_stat.st_size
+
+    reload = False
+    if force or inode != self._last_inode or \
+       mtime > self._last_mtime or \
+       size != self._last_size:
+      self._last_inode = inode
+      self._last_mtime = mtime
+      self._last_size = size
+      reload = True
+
+    if not reload:
+      return False
+
     try:
       self._config_data = serializer.Load(utils.ReadFile(self._file_name))
     except IOError, err:
@@ -67,6 +95,19 @@ class SimpleConfigReader(object):
       raise errors.ConfigurationError("Cannot load config file %s: %s" %
                                       (self._file_name, err))
 
+    self._ip_to_instance = {}
+    for iname in self._config_data['instances']:
+      instance = self._config_data['instances'][iname]
+      for nic in instance['nics']:
+        if 'ip' in nic and nic['ip']:
+          self._ip_to_instance[nic['ip']] = iname
+
+    return True
+
+  # Clients can request a reload of the config file, so we export our internal
+  # _Load function as Reload.
+  Reload = _Load
+
   def GetClusterName(self):
     return self._config_data["cluster"]["cluster_name"]
 
@@ -91,6 +132,60 @@ class SimpleConfigReader(object):
   def GetNodeList(self):
     return self._config_data["nodes"].keys()
 
+  def GetConfigSerialNo(self):
+    return self._config_data["serial_no"]
+
+  def GetClusterSerialNo(self):
+    return self._config_data["cluster"]["serial_no"]
+
+  def GetNodeStatusFlags(self, node):
+    """Get a node's status flags
+
+    @type node: string
+    @param node: node name
+    @rtype: (bool, bool, bool)
+    @return: (master_candidate, drained, offline) (or None if no such node)
+
+    """
+    if node not in self._config_data["nodes"]:
+      return None
+
+    master_candidate = self._config_data["nodes"][node]["master_candidate"]
+    drained = self._config_data["nodes"][node]["drained"]
+    offline = self._config_data["nodes"][node]["offline"]
+    return master_candidate, drained, offline
+
+  def GetInstanceByIp(self, ip):
+    if ip not in self._ip_to_instance:
+      return None
+    return self._ip_to_instance[ip]
+
+  def GetNodePrimaryIp(self, node):
+    """Get a node's primary ip
+
+    @type node: string
+    @param node: node name
+    @rtype: string, or None
+    @return: node's primary ip, or None if no such node
+
+    """
+    if node not in self._config_data["nodes"]:
+      return None
+    return self._config_data["nodes"][node]["primary_ip"]
+
+  def GetInstancePrimaryNode(self, instance):
+    """Get an instance's primary node
+
+    @type instance: string
+    @param instance: instance name
+    @rtype: string, or None
+    @return: primary node, or None if no such instance
+
+    """
+    if instance not in self._config_data["instances"]:
+      return None
+    return self._config_data["instances"][instance]["primary_node"]
+
 
 class SimpleStore(object):
   """Interface to static cluster data.