Merge branch 'stable-2.6'

[ganeti-local] / lib / confd / server.py

diff --git a/lib/confd/server.py b/lib/confd/server.py
index 607a8dc..d0a3461 100644 (file)
--- a/lib/confd/server.py
+++ b/lib/confd/server.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2009, Google Inc.
+# Copyright (C) 2009 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
@@ -52,6 +52,9 @@ class ConfdProcessor(object):
     constants.CONFD_REQ_NODE_PIP_BY_INSTANCE_IP:
       querylib.InstanceIpToNodePrimaryIpQuery,
     constants.CONFD_REQ_CLUSTER_MASTER: querylib.ClusterMasterQuery,
+    constants.CONFD_REQ_NODE_PIP_LIST: querylib.NodesPipsQuery,
+    constants.CONFD_REQ_MC_PIP_LIST: querylib.MasterCandidatesPipsQuery,
+    constants.CONFD_REQ_INSTANCES_IPS_LIST: querylib.InstancesIpsQuery,
     }
 
   def __init__(self):
@@ -59,7 +62,7 @@ class ConfdProcessor(object):
 
     """
     self.disabled = True
-    self.hmac_key = utils.ReadFile(constants.HMAC_CLUSTER_KEY)
+    self.hmac_key = utils.ReadFile(constants.CONFD_HMAC_KEY)
     self.reader = None
     assert \
       not constants.CONFD_REQS.symmetric_difference(self.DISPATCH_TABLE), \
@@ -89,7 +92,7 @@ class ConfdProcessor(object):
 
     """
     if self.disabled:
-      logging.debug('Confd is disabled. Ignoring query.')
+      logging.debug("Confd is disabled. Ignoring query.")
       return
     try:
       request = self.ExtractRequest(payload_in)
@@ -97,7 +100,7 @@ class ConfdProcessor(object):
       payload_out = self.PackReply(reply, rsalt)
       return payload_out
     except errors.ConfdRequestError, err:
-      logging.info('Ignoring broken query from %s:%d: %s' % (ip, port, err))
+      logging.info("Ignoring broken query from %s:%d: %s", ip, port, err)
       return None
 
   def ExtractRequest(self, payload):
@@ -107,7 +110,7 @@ class ConfdProcessor(object):
 
     """
     current_time = time.time()
-    logging.debug("Extracting request with size: %d" % (len(payload)))
+    logging.debug("Extracting request with size: %d", len(payload))
     try:
       (message, salt) = serializer.LoadSigned(payload, self.hmac_key)
     except errors.SignatureError, err:
@@ -127,7 +130,7 @@ class ConfdProcessor(object):
     try:
       request = objects.ConfdRequest.FromDict(message)
     except AttributeError, err:
-      raise errors.ConfdRequestError('%s' % err)
+      raise errors.ConfdRequestError(str(err))
 
     return request
 
@@ -139,7 +142,7 @@ class ConfdProcessor(object):
     @return: tuple of reply and salt to add to the signature
 
     """
-    logging.debug("Processing request: %s" % request)
+    logging.debug("Processing request: %s", request)
     if request.protocol != constants.CONFD_PROTOCOL_VERSION:
       msg = "wrong protocol version %d" % request.protocol
       raise errors.ConfdRequestError(msg)
@@ -162,7 +165,7 @@ class ConfdProcessor(object):
               serial=self.reader.GetConfigSerialNo(),
               )
 
-    logging.debug("Sending reply: %s" % reply)
+    logging.debug("Sending reply: %s", reply)
 
     return (reply, rsalt)