Revision 92cb4940 qa/qa_cluster.py

b/qa/qa_cluster.py
58 58
    AssertEqual(qa_utils.GetCommandOutput(node["primary"], cmd), content)
59 59

  
60 60

  
61
# data for testing failures due to bad keys/values for disk parameters
62
_FAIL_PARAMS = ["nonexistent:resync-rate=1",
63
                "drbd:nonexistent=1",
64
                "drbd:resync-rate=invalid",
65
                ]
66

  
67

  
68
def TestClusterInitDisk():
69
  """gnt-cluster init -D"""
70
  name = qa_config.get("name")
71
  for param in _FAIL_PARAMS:
72
    AssertCommand(["gnt-cluster", "init", "-D", param, name], fail=True)
73

  
74

  
61 75
def TestClusterInit(rapi_user, rapi_secret):
62 76
  """gnt-cluster init"""
63
  # data for testing failures due to bad keys/values for disk parameters
64
  fail_params = ("-D nonexistent:resync-rate=1",
65
                 "-D drbd:nonexistent=1",
66
                 "-D drbd:resync-rate=invalid")
67

  
68 77
  master = qa_config.GetMasterNode()
69 78

  
70 79
  rapi_dir = os.path.dirname(constants.RAPI_USERS_FILE)
......
110 119
  if htype:
111 120
    cmd.append("--enabled-hypervisors=%s" % htype)
112 121

  
113
  # test gnt-cluster init failures due to bad keys/values in disk parameters
114
  for param in fail_params:
115
    cmd.extend([param, qa_config.get("name")])
116
    AssertCommand(cmd, fail=True)
117
    cmd.pop()
118
    cmd.pop()
119

  
120 122
  cmd.append(qa_config.get("name"))
121 123
  AssertCommand(cmd)
122 124

  
123 125
  cmd = ["gnt-cluster", "modify"]
124
  # test gnt-cluster modify failures due to bad keys/values in disk parameters
125
  for param in fail_params:
126
    cmd.append(param)
127
    AssertCommand(cmd, fail=True)
128
    cmd.pop()
129 126

  
130 127
  # hypervisor parameter modifications
131 128
  hvp = qa_config.get("hypervisor-parameters", {})
......
279 276
    AssertCommand(cmd, fail=fail)
280 277

  
281 278

  
279
def TestClusterModifyDisk():
280
  """gnt-cluster modify -D"""
281
  for param in _FAIL_PARAMS:
282
    AssertCommand(["gnt-cluster", "modify", "-D", param], fail=True)
283

  
284

  
282 285
def TestClusterModifyBe():
283 286
  """gnt-cluster modify -B"""
284 287
  for fail, cmd in [

Also available in: Unified diff