Revision 452913ed

b/qa/ganeti-qa.py
102 102
  if qa_config.TestEnabled('cluster-verify'):
103 103
    RunTest(qa_cluster.TestClusterVerify)
104 104

  
105
  if qa_config.TestEnabled('cluster-reserved-lvs'):
106
    RunTest(qa_cluster.TestClusterReservedLvs)
107

  
105 108
  if qa_config.TestEnabled('cluster-rename'):
106 109
    RunTest(qa_cluster.TestClusterRename)
107 110

  
b/qa/qa-sample.json
48 48
    "cluster-renew-crypto": true,
49 49
    "cluster-destroy": true,
50 50
    "cluster-rename": true,
51
    "cluster-reserved-lvs": true,
51 52

  
52 53
    "node-info": true,
53 54
    "node-volumes": true,
b/qa/qa_cluster.py
136 136
  AssertEqual(StartSSH(master['primary'],
137 137
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
138 138

  
139
def TestClusterReservedLvs():
140
  """gnt-cluster reserved lvs"""
141
  master = qa_config.GetMasterNode()
142
  CVERIFY = ['gnt-cluster', 'verify']
143
  for rcode, cmd in [
144
    (0, CVERIFY),
145
    (0, ['gnt-cluster', 'modify', '--reserved-lvs', '']),
146
    (0, ['lvcreate', '-L1G', '-nqa-test', 'xenvg']),
147
    (1, CVERIFY),
148
    (0, ['gnt-cluster', 'modify', '--reserved-lvs', 'qa-test,other-test']),
149
    (0, CVERIFY),
150
    (0, ['gnt-cluster', 'modify', '--reserved-lvs', 'qa-.*']),
151
    (0, CVERIFY),
152
    (0, ['gnt-cluster', 'modify', '--reserved-lvs', '']),
153
    (1, CVERIFY),
154
    (0, ['lvremove', '-f', 'xenvg/qa-test']),
155
    (0, CVERIFY),
156
    ]:
157
    AssertEqual(StartSSH(master['primary'],
158
                         utils.ShellQuoteArgs(cmd)).wait(), rcode)
159

  
139 160

  
140 161
def TestClusterInfo():
141 162
  """gnt-cluster info"""

Also available in: Unified diff