Revision 2f4b4f78 qa/qa_tags.py

b/qa/qa_tags.py
20 20

  
21 21
"""
22 22

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

  
26
import qa_config
27
import qa_utils
28 25
import qa_rapi
29 26

  
30
from qa_utils import AssertEqual, StartSSH
27
from qa_utils import AssertCommand
31 28

  
32 29

  
33 30
_TEMP_TAG_NAMES = ["TEMP-Ganeti-QA-Tag%d" % i for i in range(3)]
......
44 41
  """Generic function for add-tags.
45 42

  
46 43
  """
47
  master = qa_config.GetMasterNode()
48

  
49 44
  def cmdfn(subcmd):
50 45
    cmd = [_KIND_TO_COMMAND[kind], subcmd]
51 46

  
......
54 49

  
55 50
    return cmd
56 51

  
57
  cmd = cmdfn('add-tags') + _TEMP_TAG_NAMES
58
  AssertEqual(StartSSH(master['primary'],
59
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
60

  
61
  cmd = cmdfn('list-tags')
62
  AssertEqual(StartSSH(master['primary'],
63
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
64

  
65
  cmd = ['gnt-cluster', 'search-tags', _TEMP_TAG_RE]
66
  AssertEqual(StartSSH(master['primary'],
67
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
68

  
69
  cmd = cmdfn('remove-tags') + _TEMP_TAG_NAMES
70
  AssertEqual(StartSSH(master['primary'],
71
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
52
  for cmd in [
53
    cmdfn("add-tags") + _TEMP_TAG_NAMES,
54
    cmdfn("list-tags"),
55
    ["gnt-cluster", "search-tags", _TEMP_TAG_RE],
56
    cmdfn("remove-tags") + _TEMP_TAG_NAMES,
57
    ]:
58
    AssertCommand(cmd)
72 59

  
73 60
  if qa_rapi.Enabled():
74 61
    qa_rapi.TestTags(kind, name, _TEMP_TAG_NAMES)

Also available in: Unified diff