Revision 5d640672 qa/qa_instance.py

b/qa/qa_instance.py
21 21
"""
22 22

  
23 23
from ganeti import utils
24
from ganeti import constants
24 25

  
25 26
import qa_config
27
import qa_utils
26 28

  
27 29
from qa_utils import AssertEqual, StartSSH
28 30

  
29 31

  
32
def _GetGenericAddParameters():
33
  return ['--os-size=%s' % qa_config.get('os-size'),
34
          '--swap-size=%s' % qa_config.get('swap-size'),
35
          '--memory=%s' % qa_config.get('mem')]
36

  
37

  
30 38
def _DiskTest(node, args):
31 39
  master = qa_config.GetMasterNode()
32 40

  
33 41
  instance = qa_config.AcquireInstance()
34 42
  try:
35
    cmd = ['gnt-instance', 'add',
36
           '--os-type=%s' % qa_config.get('os'),
37
           '--os-size=%s' % qa_config.get('os-size'),
38
           '--swap-size=%s' % qa_config.get('swap-size'),
39
           '--memory=%s' % qa_config.get('mem'),
40
           '--node=%s' % node['primary']]
43
    cmd = (['gnt-instance', 'add',
44
            '--os-type=%s' % qa_config.get('os'),
45
            '--node=%s' % node['primary']] +
46
           _GetGenericAddParameters())
41 47
    if args:
42 48
      cmd += args
43 49
    cmd.append(instance['name'])
......
112 118
  cmd = ['gnt-instance', 'info', instance['name']]
113 119
  AssertEqual(StartSSH(master['primary'],
114 120
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
121

  
122

  
123
def TestInstanceExport(instance, node):
124
  """gnt-backup export"""
125
  master = qa_config.GetMasterNode()
126

  
127
  cmd = ['gnt-backup', 'export', '-n', node['primary'], instance['name']]
128
  AssertEqual(StartSSH(master['primary'],
129
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
130

  
131
  return qa_utils.ResolveInstanceName(instance)
132

  
133

  
134
def TestInstanceImport(node, newinst, expnode, name):
135
  """gnt-backup import"""
136
  master = qa_config.GetMasterNode()
137

  
138
  cmd = (['gnt-backup', 'import',
139
          '--disk-template=plain',
140
          '--no-ip-check',
141
          '--src-node=%s' % expnode['primary'],
142
          '--src-dir=%s/%s' % (constants.EXPORT_DIR, name),
143
          '--node=%s' % node['primary']] +
144
         _GetGenericAddParameters())
145
  cmd.append(newinst['name'])
146
  AssertEqual(StartSSH(master['primary'],
147
                       utils.ShellQuoteArgs(cmd)).wait(), 0)

Also available in: Unified diff