Revision 2cfbc784 lib/bootstrap.py

b/lib/bootstrap.py
318 318
    ipcls = netutils.IPAddress.GetClassFromIpVersion(primary_ip_version)
319 319
  except errors.ProgrammerError:
320 320
    raise errors.OpPrereqError("Invalid primary ip version: %d." %
321
                               primary_ip_version)
321
                               primary_ip_version, errors.ECODE_INVAL)
322 322

  
323 323
  hostname = netutils.GetHostname(family=ipcls.family)
324 324
  if not ipcls.IsValid(hostname.ip):
325 325
    raise errors.OpPrereqError("This host's IP (%s) is not a valid IPv%d"
326
                               " address." % (hostname.ip, primary_ip_version))
326
                               " address." % (hostname.ip, primary_ip_version),
327
                               errors.ECODE_INVAL)
327 328

  
328 329
  if ipcls.IsLoopback(hostname.ip):
329 330
    raise errors.OpPrereqError("This host's IP (%s) resolves to a loopback"
......
363 364
  if master_netmask is not None:
364 365
    if not ipcls.ValidateNetmask(master_netmask):
365 366
      raise errors.OpPrereqError("CIDR netmask (%s) not valid for IPv%s " %
366
                                  (master_netmask, primary_ip_version))
367
                                  (master_netmask, primary_ip_version),
368
                                 errors.ECODE_INVAL)
367 369
  else:
368 370
    master_netmask = ipcls.iplen
369 371

  
......
461 463
      unknown_params = param_keys - default_param_keys
462 464
      raise errors.OpPrereqError("Invalid parameters for disk template %s:"
463 465
                                 " %s" % (template,
464
                                          utils.CommaJoin(unknown_params)))
466
                                          utils.CommaJoin(unknown_params)),
467
                                 errors.ECODE_INVAL)
465 468
    utils.ForceDictType(dt_params, constants.DISK_DT_TYPES)
466 469
  try:
467 470
    utils.VerifyDictOptions(diskparams, constants.DISK_DT_DEFAULTS)

Also available in: Unified diff