Revision 104f4ca1

b/lib/bootstrap.py
170 170
                               " entries: %s" % invalid_hvs,
171 171
                               errors.ECODE_INVAL)
172 172

  
173
  hostname = utils.HostInfo()
173
  hostname = utils.GetHostInfo()
174 174

  
175 175
  if hostname.ip.startswith("127."):
176 176
    raise errors.OpPrereqError("This host's IP resolves to the private"
......
184 184
                               " belong to this host. Aborting." %
185 185
                               hostname.ip, errors.ECODE_ENVIRON)
186 186

  
187
  clustername = utils.HostInfo(cluster_name)
187
  clustername = utils.GetHostInfo(cluster_name)
188 188

  
189 189
  if utils.TcpPing(clustername.ip, constants.DEFAULT_NODED_PORT,
190 190
                   timeout=5):
b/lib/cmdlib.py
1788 1788
    """Verify that the passed name is a valid one.
1789 1789

  
1790 1790
    """
1791
    hostname = utils.HostInfo(self.op.name)
1791
    hostname = utils.GetHostInfo(self.op.name)
1792 1792

  
1793 1793
    new_name = hostname.name
1794 1794
    self.ip = new_ip = hostname.ip
......
2843 2843
    node_name = self.op.node_name
2844 2844
    cfg = self.cfg
2845 2845

  
2846
    dns_data = utils.HostInfo(node_name)
2846
    dns_data = utils.GetHostInfo(node_name)
2847 2847

  
2848 2848
    node = dns_data.name
2849 2849
    primary_ip = self.op.primary_ip = dns_data.ip
......
4041 4041
    self.instance = instance
4042 4042

  
4043 4043
    # new name verification
4044
    name_info = utils.HostInfo(self.op.new_name)
4044
    name_info = utils.GetHostInfo(self.op.new_name)
4045 4045

  
4046 4046
    self.op.new_name = new_name = name_info.name
4047 4047
    instance_list = self.cfg.GetInstanceList()
......
5606 5606
    #### instance parameters check
5607 5607

  
5608 5608
    # instance name verification
5609
    hostname1 = utils.HostInfo(self.op.instance_name)
5609
    hostname1 = utils.GetHostInfo(self.op.instance_name)
5610 5610
    self.op.instance_name = instance_name = hostname1.name
5611 5611

  
5612 5612
    # this is just a preventive check, but someone might still add this
b/lib/errors.py
24 24

  
25 25
# OpPrereqError failure types
26 26

  
27
# resolver errors
28
ECODE_RESOLVER = "resolver_error"
27 29
# not enough resources (iallocator failure, disk space, memory, etc.)
28 30
ECODE_NORES = "insufficient_resources"
29 31
# wrong arguments (at syntax level)
b/lib/utils.py
590 590
    return result
591 591

  
592 592

  
593
def GetHostInfo(name=None):
594
  """Lookup host name and raise an OpPrereqError for failures"""
595

  
596
  try:
597
    return HostInfo(name)
598
  except errors.ResolverError, err:
599
    raise errors.OpPrereqError("The given name (%s) does not resolve: %s" %
600
                               (err[0], err[2]), errors.ECODE_RESOLVER)
601

  
602

  
593 603
def ListVolumeGroups():
594 604
  """List volume groups and their size
595 605

  
b/scripts/gnt-cluster
285 285

  
286 286
  cl = GetClient()
287 287

  
288
  myname = utils.HostInfo().name
288
  myname = utils.GetHostInfo().name
289 289

  
290 290
  cluster_name = cl.QueryConfigValues(["cluster_name"])[0]
291 291

  
b/scripts/gnt-node
130 130

  
131 131
  """
132 132
  cl = GetClient()
133
  dns_data = utils.HostInfo(args[0])
133
  dns_data = utils.GetHostInfo(args[0])
134 134
  node = dns_data.name
135 135
  readd = opts.readd
136 136

  

Also available in: Unified diff