Revision 02a5fe0e qa/qa_instance.py

b/qa/qa_instance.py
77 77
    AssertCommand(cmd)
78 78

  
79 79
    _CheckSsconfInstanceList(instance.name)
80
    qa_config.SetInstanceTemplate(instance, disk_template)
80
    instance.SetDiskTemplate(disk_template)
81 81

  
82 82
    return instance
83 83
  except:
......
177 177

  
178 178

  
179 179
def IsFailoverSupported(instance):
180
  templ = qa_config.GetInstanceTemplate(instance)
181
  return templ in constants.DTS_MIRRORED
180
  return instance.disk_template in constants.DTS_MIRRORED
182 181

  
183 182

  
184 183
def IsMigrationSupported(instance):
185
  templ = qa_config.GetInstanceTemplate(instance)
186
  return templ in constants.DTS_MIRRORED
184
  return instance.disk_template in constants.DTS_MIRRORED
187 185

  
188 186

  
189 187
def IsDiskReplacingSupported(instance):
190
  templ = qa_config.GetInstanceTemplate(instance)
191
  return templ == constants.DT_DRBD8
188
  return instance.disk_template == constants.DT_DRBD8
192 189

  
193 190

  
194 191
@InstanceCheck(None, INST_UP, RETURN_VALUE)
......
500 497
  """gnt-instance modify -t"""
501 498
  name = instance.name
502 499

  
503
  template = qa_config.GetInstanceTemplate(instance)
500
  template = instance.disk_template
504 501
  if template != constants.DT_DRBD8:
505 502
    print qa_utils.FormatInfo("Unsupported template %s, skipping conversion"
506 503
                              " test" % template)
......
697 694
         _GetGenericAddParameters(newinst, force_mac=constants.VALUE_GENERATE))
698 695
  cmd.append(newinst.name)
699 696
  AssertCommand(cmd)
700
  qa_config.SetInstanceTemplate(newinst, templ)
697
  newinst.SetDiskTemplate(templ)
701 698

  
702 699

  
703 700
def TestBackupList(expnode):

Also available in: Unified diff