Revision 1c3231aa test/hs/Test/Ganeti/OpCodes.hs

b/test/hs/Test/Ganeti/OpCodes.hs
109 109
    case op_id of
110 110
      "OP_TEST_DELAY" ->
111 111
        OpCodes.OpTestDelay <$> arbitrary <*> arbitrary <*>
112
          genNodeNamesNE <*> arbitrary
112
          genNodeNamesNE <*> return Nothing <*> arbitrary
113 113
      "OP_INSTANCE_REPLACE_DISKS" ->
114 114
        OpCodes.OpInstanceReplaceDisks <$> genFQDN <*> arbitrary <*>
115 115
          arbitrary <*> arbitrary <*> genDiskIndices <*>
116
          genMaybe genNodeNameNE <*> genMaybe genNameNE
116
          genMaybe genNodeNameNE <*> return Nothing <*> genMaybe genNameNE
117 117
      "OP_INSTANCE_FAILOVER" ->
118 118
        OpCodes.OpInstanceFailover <$> genFQDN <*> arbitrary <*> arbitrary <*>
119
          genMaybe genNodeNameNE <*> arbitrary <*> genMaybe genNameNE
119
        genMaybe genNodeNameNE <*> return Nothing <*> arbitrary <*>
120
        genMaybe genNameNE
120 121
      "OP_INSTANCE_MIGRATE" ->
121 122
        OpCodes.OpInstanceMigrate <$> genFQDN <*> arbitrary <*> arbitrary <*>
122
          genMaybe genNodeNameNE <*> arbitrary <*>
123
          genMaybe genNodeNameNE <*> return Nothing <*> arbitrary <*>
123 124
          arbitrary <*> arbitrary <*> genMaybe genNameNE <*> arbitrary
124 125
      "OP_TAGS_GET" ->
125 126
        OpCodes.OpTagsGet <$> arbitrary <*> arbitrary
......
172 173
      "OP_QUERY_FIELDS" ->
173 174
        OpCodes.OpQueryFields <$> arbitrary <*> arbitrary
174 175
      "OP_OOB_COMMAND" ->
175
        OpCodes.OpOobCommand <$> genNodeNamesNE <*> arbitrary <*>
176
          arbitrary <*> arbitrary <*> (arbitrary `suchThat` (>0))
177
      "OP_NODE_REMOVE" -> OpCodes.OpNodeRemove <$> genNodeNameNE
176
        OpCodes.OpOobCommand <$> genNodeNamesNE <*> return Nothing <*>
177
          arbitrary <*> arbitrary <*> arbitrary <*>
178
          (arbitrary `suchThat` (>0))
179
      "OP_NODE_REMOVE" ->
180
        OpCodes.OpNodeRemove <$> genNodeNameNE <*> return Nothing
178 181
      "OP_NODE_ADD" ->
179 182
        OpCodes.OpNodeAdd <$> genNodeNameNE <*> emptyMUD <*> emptyMUD <*>
180 183
          genMaybe genName <*> genMaybe genNameNE <*> arbitrary <*>
......
187 190
        OpCodes.OpNodeQueryStorage <$> arbitrary <*> arbitrary <*>
188 191
          genNodeNamesNE <*> genNameNE
189 192
      "OP_NODE_MODIFY_STORAGE" ->
190
        OpCodes.OpNodeModifyStorage <$> genNodeNameNE <*> arbitrary <*>
191
          genNameNE <*> pure emptyJSObject
193
        OpCodes.OpNodeModifyStorage <$> genNodeNameNE <*> return Nothing <*>
194
          arbitrary <*> genNameNE <*> pure emptyJSObject
192 195
      "OP_REPAIR_NODE_STORAGE" ->
193
        OpCodes.OpRepairNodeStorage <$> genNodeNameNE <*> arbitrary <*>
194
          genNameNE <*> arbitrary
196
        OpCodes.OpRepairNodeStorage <$> genNodeNameNE <*> return Nothing <*>
197
          arbitrary <*> genNameNE <*> arbitrary
195 198
      "OP_NODE_SET_PARAMS" ->
196
        OpCodes.OpNodeSetParams <$> genNodeNameNE <*> arbitrary <*>
197
          emptyMUD <*> emptyMUD <*> arbitrary <*> arbitrary <*> arbitrary <*>
198
          arbitrary <*> arbitrary <*> arbitrary <*> genMaybe genNameNE <*>
199
          emptyMUD <*> arbitrary
199
        OpCodes.OpNodeSetParams <$> genNodeNameNE <*> return Nothing <*>
200
          arbitrary <*> emptyMUD <*> emptyMUD <*> arbitrary <*> arbitrary <*>
201
          arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*>
202
          genMaybe genNameNE <*> emptyMUD <*> arbitrary
200 203
      "OP_NODE_POWERCYCLE" ->
201
        OpCodes.OpNodePowercycle <$> genNodeNameNE <*> arbitrary
204
        OpCodes.OpNodePowercycle <$> genNodeNameNE <*> return Nothing <*>
205
          arbitrary
202 206
      "OP_NODE_MIGRATE" ->
203
        OpCodes.OpNodeMigrate <$> genNodeNameNE <*> arbitrary <*>
204
          arbitrary <*> genMaybe genNodeNameNE <*> arbitrary <*>
205
          arbitrary <*> genMaybe genNameNE
207
        OpCodes.OpNodeMigrate <$> genNodeNameNE <*> return Nothing <*>
208
          arbitrary <*> arbitrary <*> genMaybe genNodeNameNE <*>
209
          return Nothing <*> arbitrary <*> arbitrary <*> genMaybe genNameNE
206 210
      "OP_NODE_EVACUATE" ->
207 211
        OpCodes.OpNodeEvacuate <$> arbitrary <*> genNodeNameNE <*>
208
          genMaybe genNodeNameNE <*> genMaybe genNameNE <*> arbitrary
212
          return Nothing <*> genMaybe genNodeNameNE <*> return Nothing <*>
213
          genMaybe genNameNE <*> arbitrary
209 214
      "OP_INSTANCE_CREATE" ->
210 215
        OpCodes.OpInstanceCreate <$> genFQDN <*> arbitrary <*>
211 216
          arbitrary <*> arbitrary <*> arbitrary <*> pure emptyJSObject <*>
......
214 219
          arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*>
215 220
          arbitrary <*> arbitrary <*> pure emptyJSObject <*>
216 221
          genMaybe genNameNE <*>
217
          genMaybe genNodeNameNE <*> genMaybe genNodeNameNE <*>
222
          genMaybe genNodeNameNE <*> return Nothing <*>
223
          genMaybe genNodeNameNE <*> return Nothing <*>
218 224
          genMaybe (pure []) <*> genMaybe genNodeNameNE <*>
219
          arbitrary <*> genMaybe genNodeNameNE <*>
225
          arbitrary <*> genMaybe genNodeNameNE <*> return Nothing <*>
220 226
          genMaybe genNodeNameNE <*> genMaybe genNameNE <*>
221 227
          arbitrary <*> arbitrary <*> (genTags >>= mapM mkNonEmpty)
222 228
      "OP_INSTANCE_MULTI_ALLOC" ->
......
242 248
          arbitrary <*> arbitrary
243 249
      "OP_INSTANCE_MOVE" ->
244 250
        OpCodes.OpInstanceMove <$> genFQDN <*> arbitrary <*> arbitrary <*>
245
          genNodeNameNE <*> arbitrary
251
          genNodeNameNE <*> return Nothing <*> arbitrary
246 252
      "OP_INSTANCE_CONSOLE" -> OpCodes.OpInstanceConsole <$> genFQDN
247 253
      "OP_INSTANCE_ACTIVATE_DISKS" ->
248 254
        OpCodes.OpInstanceActivateDisks <$> genFQDN <*>
......
251 257
        OpCodes.OpInstanceDeactivateDisks <$> genFQDN <*> arbitrary
252 258
      "OP_INSTANCE_RECREATE_DISKS" ->
253 259
        OpCodes.OpInstanceRecreateDisks <$> genFQDN <*> arbitrary <*>
254
          genNodeNamesNE <*> genMaybe genNameNE
260
          genNodeNamesNE <*> return Nothing <*> genMaybe genNameNE
255 261
      "OP_INSTANCE_QUERY" ->
256 262
        OpCodes.OpInstanceQuery <$> genFieldsNE <*> genNamesNE <*> arbitrary
257 263
      "OP_INSTANCE_QUERY_DATA" ->
......
261 267
        OpCodes.OpInstanceSetParams <$> genFQDN <*> arbitrary <*>
262 268
          arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*>
263 269
          pure emptyJSObject <*> arbitrary <*> pure emptyJSObject <*>
264
          arbitrary <*> genMaybe genNodeNameNE <*> genMaybe genNodeNameNE <*>
270
          arbitrary <*> genMaybe genNodeNameNE <*> return Nothing <*>
271
          genMaybe genNodeNameNE <*> return Nothing <*>
265 272
          genMaybe genNameNE <*> pure emptyJSObject <*> arbitrary <*>
266 273
          arbitrary <*> arbitrary
267 274
      "OP_INSTANCE_GROW_DISK" ->
......
276 283
          emptyMUD <*> emptyMUD <*> emptyMUD
277 284
      "OP_GROUP_ASSIGN_NODES" ->
278 285
        OpCodes.OpGroupAssignNodes <$> genNameNE <*> arbitrary <*>
279
          genNodeNamesNE
286
          genNodeNamesNE <*> return Nothing
280 287
      "OP_GROUP_QUERY" ->
281 288
        OpCodes.OpGroupQuery <$> genFieldsNE <*> genNamesNE
282 289
      "OP_GROUP_SET_PARAMS" ->
......
300 307
        OpCodes.OpBackupPrepare <$> genFQDN <*> arbitrary
301 308
      "OP_BACKUP_EXPORT" ->
302 309
        OpCodes.OpBackupExport <$> genFQDN <*> arbitrary <*>
303
          arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*>
304
          arbitrary <*> genMaybe (pure []) <*> genMaybe genNameNE
310
          arbitrary <*> return Nothing <*> arbitrary <*> arbitrary <*>
311
          arbitrary <*> arbitrary <*> genMaybe (pure []) <*>
312
          genMaybe genNameNE
305 313
      "OP_BACKUP_REMOVE" ->
306 314
        OpCodes.OpBackupRemove <$> genFQDN
307 315
      "OP_TEST_ALLOCATOR" ->
......
339 347
        OpCodes.OpNetworkQuery <$> genFieldsNE <*> genNamesNE <*> arbitrary
340 348
      "OP_RESTRICTED_COMMAND" ->
341 349
        OpCodes.OpRestrictedCommand <$> arbitrary <*> genNodeNamesNE <*>
342
          genNameNE
350
          return Nothing <*> genNameNE
343 351
      _ -> fail $ "Undefined arbitrary for opcode " ++ op_id
344 352

  
345 353
-- | Generates one element of a reason trail

Also available in: Unified diff