Revision e42b5307

b/qa/qa_cluster.py
51 51
                content)
52 52

  
53 53

  
54
@qa_utils.DefineHook('cluster-init')
54 55
def TestClusterInit():
55 56
  """gnt-cluster init"""
56 57
  master = qa_config.GetMasterNode()
......
71 72
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
72 73

  
73 74

  
75
@qa_utils.DefineHook('cluster-verify')
74 76
def TestClusterVerify():
75 77
  """gnt-cluster verify"""
76 78
  master = qa_config.GetMasterNode()
......
80 82
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
81 83

  
82 84

  
85
@qa_utils.DefineHook('cluster-info')
83 86
def TestClusterInfo():
84 87
  """gnt-cluster info"""
85 88
  master = qa_config.GetMasterNode()
......
89 92
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
90 93

  
91 94

  
95
@qa_utils.DefineHook('cluster-getmaster')
92 96
def TestClusterGetmaster():
93 97
  """gnt-cluster getmaster"""
94 98
  master = qa_config.GetMasterNode()
......
98 102
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
99 103

  
100 104

  
105
@qa_utils.DefineHook('cluster-version')
101 106
def TestClusterVersion():
102 107
  """gnt-cluster version"""
103 108
  master = qa_config.GetMasterNode()
......
107 112
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
108 113

  
109 114

  
115
@qa_utils.DefineHook('cluster-burnin')
110 116
def TestClusterBurnin():
111 117
  """Burnin"""
112 118
  master = qa_config.GetMasterNode()
......
143 149
      qa_config.ReleaseInstance(inst)
144 150

  
145 151

  
152
@qa_utils.DefineHook('cluster-master-failover')
146 153
def TestClusterMasterFailover():
147 154
  """gnt-cluster masterfailover"""
148 155
  master = qa_config.GetMasterNode()
......
160 167
    qa_config.ReleaseNode(failovermaster)
161 168

  
162 169

  
170
@qa_utils.DefineHook('cluster-copyfile')
163 171
def TestClusterCopyfile():
164 172
  """gnt-cluster copyfile"""
165 173
  master = qa_config.GetMasterNode()
......
184 192
    _RemoveFileFromAllNodes(testname)
185 193

  
186 194

  
195
@qa_utils.DefineHook('cluster-command')
187 196
def TestClusterCommand():
188 197
  """gnt-cluster command"""
189 198
  master = qa_config.GetMasterNode()
......
201 210
    _RemoveFileFromAllNodes(rfile)
202 211

  
203 212

  
213
@qa_utils.DefineHook('cluster-destroy')
204 214
def TestClusterDestroy():
205 215
  """gnt-cluster destroy"""
206 216
  master = qa_config.GetMasterNode()
b/qa/qa_instance.py
63 63
    raise
64 64

  
65 65

  
66
@qa_utils.DefineHook('instance-add-plain-disk')
66 67
def TestInstanceAddWithPlainDisk(node):
67 68
  """gnt-instance add -t plain"""
68 69
  return _DiskTest(node['primary'], 'plain')
69 70

  
70 71

  
72
@qa_utils.DefineHook('instance-add-local-mirror-disk')
71 73
def TestInstanceAddWithLocalMirrorDisk(node):
72 74
  """gnt-instance add -t local_raid1"""
73 75
  return _DiskTest(node['primary'], 'local_raid1')
74 76

  
75 77

  
78
@qa_utils.DefineHook('instance-add-remote-raid-disk')
76 79
def TestInstanceAddWithRemoteRaidDisk(node, node2):
77 80
  """gnt-instance add -t remote_raid1"""
78 81
  return _DiskTest("%s:%s" % (node['primary'], node2['primary']),
79 82
                   'remote_raid1')
80 83

  
81 84

  
85
@qa_utils.DefineHook('instance-remove')
82 86
def TestInstanceRemove(instance):
83 87
  """gnt-instance remove"""
84 88
  master = qa_config.GetMasterNode()
......
90 94
  qa_config.ReleaseInstance(instance)
91 95

  
92 96

  
97
@qa_utils.DefineHook('instance-startup')
93 98
def TestInstanceStartup(instance):
94 99
  """gnt-instance startup"""
95 100
  master = qa_config.GetMasterNode()
......
99 104
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
100 105

  
101 106

  
107
@qa_utils.DefineHook('instance-shutdown')
102 108
def TestInstanceShutdown(instance):
103 109
  """gnt-instance shutdown"""
104 110
  master = qa_config.GetMasterNode()
......
108 114
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
109 115

  
110 116

  
117
@qa_utils.DefineHook('instance-reinstall')
111 118
def TestInstanceReinstall(instance):
112 119
  """gnt-instance reinstall"""
113 120
  master = qa_config.GetMasterNode()
......
117 124
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
118 125

  
119 126

  
127
@qa_utils.DefineHook('instance-failover')
120 128
def TestInstanceFailover(instance):
121 129
  """gnt-instance failover"""
122 130
  master = qa_config.GetMasterNode()
......
126 134
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
127 135

  
128 136

  
137
@qa_utils.DefineHook('instance-info')
129 138
def TestInstanceInfo(instance):
130 139
  """gnt-instance info"""
131 140
  master = qa_config.GetMasterNode()
......
135 144
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
136 145

  
137 146

  
147
@qa_utils.DefineHook('instance-list')
138 148
def TestInstanceList():
139 149
  """gnt-instance list"""
140 150
  master = qa_config.GetMasterNode()
......
144 154
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
145 155

  
146 156

  
157
@qa_utils.DefineHook('backup-export')
147 158
def TestInstanceExport(instance, node):
148 159
  """gnt-backup export"""
149 160
  master = qa_config.GetMasterNode()
......
155 166
  return qa_utils.ResolveInstanceName(instance)
156 167

  
157 168

  
169
@qa_utils.DefineHook('backup-import')
158 170
def TestInstanceImport(node, newinst, expnode, name):
159 171
  """gnt-backup import"""
160 172
  master = qa_config.GetMasterNode()
......
171 183
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
172 184

  
173 185

  
186
@qa_utils.DefineHook('backup-list')
174 187
def TestBackupList(expnode):
175 188
  """gnt-backup list"""
176 189
  master = qa_config.GetMasterNode()
b/qa/qa_node.py
25 25
from qa_utils import AssertEqual, StartSSH
26 26

  
27 27

  
28
@qa_utils.DefineHook('node-add')
28 29
def _NodeAdd(node):
29 30
  master = qa_config.GetMasterNode()
30 31

  
......
41 42
  node['_added'] = True
42 43

  
43 44

  
45
@qa_utils.DefineHook('node-remove')
44 46
def _NodeRemove(node):
45 47
  master = qa_config.GetMasterNode()
46 48

  
......
66 68
      _NodeRemove(node)
67 69

  
68 70

  
71
@qa_utils.DefineHook('node-info')
69 72
def TestNodeInfo():
70 73
  """gnt-node info"""
71 74
  master = qa_config.GetMasterNode()
......
75 78
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
76 79

  
77 80

  
81
@qa_utils.DefineHook('node-volumes')
78 82
def TestNodeVolumes():
79 83
  """gnt-node volumes"""
80 84
  master = qa_config.GetMasterNode()
......
84 88
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
85 89

  
86 90

  
91
@qa_utils.DefineHook('node-failover')
87 92
def TestNodeFailover(node, node2):
88 93
  """gnt-node failover"""
89 94
  master = qa_config.GetMasterNode()
......
104 109
                       utils.ShellQuoteArgs(cmd)).wait(), 0)
105 110

  
106 111

  
112
@qa_utils.DefineHook('node-evacuate')
107 113
def TestNodeEvacuate(node, node2):
108 114
  """gnt-node evacuate"""
109 115
  master = qa_config.GetMasterNode()

Also available in: Unified diff