Revision 5b349fd1 tools/burnin

b/tools/burnin
36 36
from ganeti import cli
37 37
from ganeti import errors
38 38
from ganeti import utils
39
from ganeti import ssconf
40 39

  
41 40
from ganeti.confd import client as confd_client
42 41

  
......
266 265
    self.hvp = self.bep = None
267 266
    self.ParseOptions()
268 267
    self.cl = cli.GetClient()
269
    self.ss = ssconf.SimpleStore()
270 268
    self.GetState()
271 269

  
272 270
  def ClearFeedbackBuf(self):
......
885 883
    """
886 884
    Log("Checking confd results")
887 885

  
888
    hmac_key = utils.ReadFile(constants.CONFD_HMAC_KEY)
889
    mc_file = self.ss.KeyToFilename(constants.SS_MASTER_CANDIDATES_IPS)
890
    mc_list = utils.ReadFile(mc_file).splitlines()
891 886
    filter_callback = confd_client.ConfdFilterCallback(self.ConfdCallback)
892 887
    counting_callback = confd_client.ConfdCountingCallback(filter_callback)
893 888
    self.confd_counting_callback = counting_callback
894 889

  
895
    self.confd_client = confd_client.ConfdClient(hmac_key, mc_list,
896
                                                 counting_callback)
890
    self.confd_client = confd_client.GetConfdClient(counting_callback)
897 891

  
898 892
    req = confd_client.ConfdClientRequest(type=constants.CONFD_REQ_PING)
899 893
    self.DoConfdRequestReply(req)

Also available in: Unified diff