Revision da2d02e7

b/doc/design-2.2.rst
720 720
preseeded into a given state.
721 721

  
722 722
For the hidden OSes, they are fully functional except that they are not
723
returned in the default OS list (as computed via ``OpDiagnoseOS``),
723
returned in the default OS list (as computed via ``OpOsDiagnose``),
724 724
unless the hidden state is requested.
725 725

  
726 726
For the blacklisted OSes, they are also not shown (unless the
b/lib/client/gnt_instance.py
458 458

  
459 459
  # second, if requested, ask for an OS
460 460
  if opts.select_os is True:
461
    op = opcodes.OpDiagnoseOS(output_fields=["name", "variants"], names=[])
461
    op = opcodes.OpOsDiagnose(output_fields=["name", "variants"], names=[])
462 462
    result = SubmitOpCode(op, opts=opts)
463 463

  
464 464
    if not result:
b/lib/client/gnt_os.py
42 42
  @return: the desired exit code
43 43

  
44 44
  """
45
  op = opcodes.OpDiagnoseOS(output_fields=["name", "variants"], names=[])
45
  op = opcodes.OpOsDiagnose(output_fields=["name", "variants"], names=[])
46 46
  result = SubmitOpCode(op, opts=opts)
47 47

  
48 48
  if not result:
......
77 77
  @return: the desired exit code
78 78

  
79 79
  """
80
  op = opcodes.OpDiagnoseOS(output_fields=["name", "valid", "variants",
80
  op = opcodes.OpOsDiagnose(output_fields=["name", "valid", "variants",
81 81
                                           "parameters", "api_versions",
82 82
                                           "blacklisted", "hidden"],
83 83
                            names=[])
......
146 146
  @return: the desired exit code
147 147

  
148 148
  """
149
  op = opcodes.OpDiagnoseOS(output_fields=["name", "valid", "variants",
149
  op = opcodes.OpOsDiagnose(output_fields=["name", "valid", "variants",
150 150
                                           "node_status", "hidden",
151 151
                                           "blacklisted"], names=[])
152 152
  result = SubmitOpCode(op, opts=opts)
b/lib/cmdlib.py
3295 3295

  
3296 3296

  
3297 3297

  
3298
class LUDiagnoseOS(NoHooksLU):
3298
class LUOsDiagnose(NoHooksLU):
3299 3299
  """Logical unit for OS diagnose/query.
3300 3300

  
3301 3301
  """
b/lib/opcodes.py
1079 1079

  
1080 1080

  
1081 1081
# OS opcodes
1082
class OpDiagnoseOS(OpCode):
1082
class OpOsDiagnose(OpCode):
1083 1083
  """Compute the list of guest operating systems."""
1084 1084
  OP_ID = "OP_OS_DIAGNOSE"
1085 1085
  OP_PARAMS = [
b/lib/rapi/rlib2.py
160 160

  
161 161
    """
162 162
    cl = baserlib.GetClient()
163
    op = opcodes.OpDiagnoseOS(output_fields=["name", "variants"], names=[])
163
    op = opcodes.OpOsDiagnose(output_fields=["name", "variants"], names=[])
164 164
    job_id = baserlib.SubmitJob([op], cl)
165 165
    # we use custom feedback function, instead of print we log the status
166 166
    result = cli.PollJob(job_id, cl, feedback_fn=baserlib.FeedbackFn)
b/tools/burnin
510 510
      Err(msg, exit_code=err_code)
511 511
    self.nodes = [data[0] for data in result if not (data[1] or data[2])]
512 512

  
513
    op_diagnose = opcodes.OpDiagnoseOS(output_fields=["name",
513
    op_diagnose = opcodes.OpOsDiagnose(output_fields=["name",
514 514
                                                      "variants",
515 515
                                                      "hidden"],
516 516
                                       names=[])

Also available in: Unified diff