Revision 18337ca9

b/qa/ganeti-qa.py
157 157
  if qa_config.TestEnabled('instance-reboot'):
158 158
    RunTest(qa_instance.TestInstanceReboot, instance)
159 159

  
160
  if qa_config.TestEnabled('instance-rename'):
161
    RunTest(qa_instance.TestInstanceShutdown, instance)
162
    RunTest(qa_instance.TestInstanceRename, instance)
163
    RunTest(qa_instance.TestInstanceStartup, instance)
164

  
160 165
  if qa_config.TestEnabled('tags'):
161 166
    RunTest(qa_tags.TestInstanceTags, instance)
162 167

  
b/qa/qa-sample.json
62 62
    "instance-add-plain-disk": true,
63 63
    "instance-add-drbd-disk": true,
64 64

  
65
    "instance-list": true,
65
    "instance-automatic-restart": false,
66
    "instance-consecutive-failures": false,
67
    "instance-export": true,
66 68
    "instance-failover": true,
69
    "instance-import": true,
67 70
    "instance-info": true,
71
    "instance-list": true,
68 72
    "instance-modify": true,
69
    "instance-export": true,
70
    "instance-import": true,
71
    "instance-reinstall": true,
72 73
    "instance-reboot": true,
74
    "instance-reinstall": true,
75
    "instance-rename": true,
73 76
    "instance-shutdown": true,
74
    "instance-automatic-restart": false,
75
    "instance-consecutive-failures": false,
76 77

  
77 78
    "# This test might fail with certain hypervisor types, depending": null,
78 79
    "# on whether they support the `gnt-instance console' command.": null,
b/qa/qa_instance.py
127 127
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
128 128

  
129 129

  
130
def TestInstanceRename(instance):
131
  """gnt-instance rename"""
132
  master = qa_config.GetMasterNode()
133

  
134
  rename_source = instance['name']
135
  rename_target = qa_config.get('rename', None)
136
  if rename_target is None:
137
    print qa_utils.FormatError('"rename" entry is missing')
138
    return
139

  
140
  for name1, name2 in [(rename_source, rename_target),
141
                       (rename_target, rename_source)]:
142
    cmd = ['gnt-instance', 'rename', name1, name2]
143
    AssertEqual(StartSSH(master['primary'],
144
                         utils.ShellQuoteArgs(cmd)).wait(), 0)
145

  
146

  
130 147
def TestInstanceFailover(instance):
131 148
  """gnt-instance failover"""
132 149
  master = qa_config.GetMasterNode()

Also available in: Unified diff