Revision 3131adc7

b/htest/Test/Ganeti/OpCodes.hs
176 176
          genMaybe genName <*> genMaybe genNameNE <*> arbitrary <*>
177 177
          genMaybe genNameNE <*> arbitrary <*> arbitrary <*> emptyMUD
178 178
      "OP_NODE_QUERY" ->
179
        OpCodes.OpNodeQuery <$> genFieldsNE <*> arbitrary <*> genNamesNE
179
        OpCodes.OpNodeQuery <$> genFieldsNE <*> genNamesNE <*> arbitrary
180 180
      "OP_NODE_QUERYVOLS" ->
181 181
        OpCodes.OpNodeQueryvols <$> arbitrary <*> genNodeNamesNE
182 182
      "OP_NODE_QUERY_STORAGE" ->
b/htools/Ganeti/OpCodes.hs
187 187
     , pVmCapable
188 188
     , pNdParams
189 189
    ])
190
  , ("OpNodeQuery",
191
     [ pOutputFields
192
     , pUseLocking
193
     , pNames
194
     ])
190
  , ("OpNodeQuery", dOldQuery)
195 191
  , ("OpNodeQueryvols",
196 192
     [ pOutputFields
197 193
     , pNodes
......
347 343
     , pNodes
348 344
     , pIallocator
349 345
     ])
350
  , ("OpInstanceQuery",
351
     [ pOutputFields
352
     , pNames
353
     , pUseLocking
354
     ])
346
  , ("OpInstanceQuery", dOldQuery)
355 347
  , ("OpInstanceQueryData",
356 348
     [ pUseLocking
357 349
     , pInstances
......
402 394
     , pForce
403 395
     , pRequiredNodes
404 396
     ])
405
  , ("OpGroupQuery",
406
     [ pOutputFields
407
     , pNames
408
     ])
397
  , ("OpGroupQuery", dOldQueryNoLocking)
409 398
  , ("OpGroupSetParams",
410 399
     [ pGroupName
411 400
     , pNodeGroupAllocPolicy
......
518 507
     , pNetworkName
519 508
     , pIpConflictsCheck
520 509
     ])
521
  , ("OpNetworkQuery",
522
     [ pOutputFields
523
     , pNames
524
     ])
510
  , ("OpNetworkQuery", dOldQueryNoLocking)
525 511
  , ("OpRestrictedCommand",
526 512
     [ pUseLocking
527 513
     , pRequiredNodes
b/htools/Ganeti/OpParams.hs
221 221
  , pNetworkRemoveRsvdIps
222 222
  , pNetworkMode
223 223
  , pNetworkLink
224
  , dOldQuery
225
  , dOldQueryNoLocking
224 226
  ) where
225 227

  
226 228
import Control.Monad (liftM)
......
1342 1344
-- | Network link when connecting to a group.
1343 1345
pNetworkLink :: Field
1344 1346
pNetworkLink = simpleField "network_link" [t| NonEmptyString |]
1347

  
1348
-- * Entire opcode parameter list
1349

  
1350
-- | Old-style query opcode, with locking.
1351
dOldQuery :: [Field]
1352
dOldQuery =
1353
  [ pOutputFields
1354
  , pNames
1355
  , pUseLocking
1356
  ]
1357

  
1358
-- | Old-style query opcode, without locking.
1359
dOldQueryNoLocking :: [Field]
1360
dOldQueryNoLocking =
1361
  [ pOutputFields
1362
  , pNames
1363
  ]

Also available in: Unified diff