Revision 3d7e87b8

b/htest/Test/Ganeti/OpCodes.hs
110 110 
        OpCodes.OpTestDelay <$> arbitrary <*> arbitrary <*>
111 111 
          genNodeNamesNE <*> arbitrary
112 112 
      "OP_INSTANCE_REPLACE_DISKS" ->
113 
        OpCodes.OpInstanceReplaceDisks <$> genFQDN <*>
114 
          genMaybe genNodeNameNE <*> arbitrary <*> genDiskIndices <*>
115 
          genMaybe genNameNE
113 
        OpCodes.OpInstanceReplaceDisks <$> genFQDN <*> arbitrary <*>
114 
          arbitrary <*> arbitrary <*> genDiskIndices <*>
115 
          genMaybe genNodeNameNE <*> genMaybe genNameNE
116 116 
      "OP_INSTANCE_FAILOVER" ->
117 
        OpCodes.OpInstanceFailover <$> genFQDN <*> arbitrary <*>
118 
          genMaybe genNodeNameNE
117 
        OpCodes.OpInstanceFailover <$> genFQDN <*> arbitrary <*> arbitrary <*>
118 
          genMaybe genNodeNameNE <*> arbitrary <*> genMaybe genNameNE
119 119 
      "OP_INSTANCE_MIGRATE" ->
120 
        OpCodes.OpInstanceMigrate <$> genFQDN <*> arbitrary <*>
121 
          arbitrary <*> arbitrary <*> genMaybe genNodeNameNE
120 
        OpCodes.OpInstanceMigrate <$> genFQDN <*> arbitrary <*> arbitrary <*>
121 
          genMaybe genNodeNameNE <*> arbitrary <*>
122 
          arbitrary <*> arbitrary <*> genMaybe genNameNE <*> arbitrary
122 123 
      "OP_TAGS_GET" ->
123 124 
        OpCodes.OpTagsGet <$> arbitrary <*> arbitrary
124 125 
      "OP_TAGS_SEARCH" ->
b/htools/Ganeti/HTools/Cluster.hs
1453 1453 
                      Bad msg -> error $ "Empty node name for idx " ++
1454 1454 
                                 show n ++ ": " ++ msg ++ "??"
1455 1455 
                      Ok ne -> Just ne
1456 
      live = Just True
1457 
      opF = OpCodes.OpInstanceMigrate iname live False True Nothing
1458 
      opFA n = OpCodes.OpInstanceMigrate iname live False True (lookNode n)
1459 
      opR n = OpCodes.OpInstanceReplaceDisks iname (lookNode n)
1460 
              OpCodes.ReplaceNewSecondary [] Nothing
1456 
      opF = OpCodes.OpInstanceMigrate
1457 
              { OpCodes.opInstanceName        = iname
1458 
              , OpCodes.opMigrationMode       = Nothing -- default
1459 
              , OpCodes.opOldLiveMode         = Nothing -- default as well
1460 
              , OpCodes.opTargetNode          = Nothing -- this is drbd
1461 
              , OpCodes.opAllowRuntimeChanges = False
1462 
              , OpCodes.opIgnoreIpolicy       = False
1463 
              , OpCodes.opMigrationCleanup    = False
1464 
              , OpCodes.opIallocator          = Nothing
1465 
              , OpCodes.opAllowFailover       = True }
1466 
      opFA n = opF { OpCodes.opTargetNode = lookNode n } -- not drbd
1467 
      opR n = OpCodes.OpInstanceReplaceDisks
1468 
                { OpCodes.opInstanceName     = iname
1469 
                , OpCodes.opEarlyRelease     = False
1470 
                , OpCodes.opIgnoreIpolicy    = False
1471 
                , OpCodes.opReplaceDisksMode = OpCodes.ReplaceNewSecondary
1472 
                , OpCodes.opReplaceDisksList = []
1473 
                , OpCodes.opRemoteNode       = lookNode n
1474 
                , OpCodes.opIallocator       = Nothing
1475 
                }
1461 1476 
  in case move of
1462 1477 
       Failover -> [ opF ]
1463 1478 
       FailoverToAny np -> [ opFA np ]
b/htools/Ganeti/OpCodes.hs
59 59 
     ])
60 60 
  , ("OpInstanceReplaceDisks",
61 61 
     [ pInstanceName
62 
     , pRemoteNode
62 
     , pEarlyRelease
63 
     , pIgnoreIpolicy
63 64 
     , pReplaceDisksMode
64 65 
     , pReplaceDisksList
66 
     , pRemoteNode
65 67 
     , pIallocator
66 68 
     ])
67 69 
  , ("OpInstanceFailover",
68 70 
     [ pInstanceName
71 
     , pShutdownTimeout
69 72 
     , pIgnoreConsistency
70 73 
     , pMigrationTargetNode
74 
     , pIgnoreIpolicy
75 
     , pIallocator
71 76 
     ])
72 77 
  , ("OpInstanceMigrate",
73 78 
     [ pInstanceName
79 
     , pMigrationMode
74 80 
     , pMigrationLive
81 
     , pMigrationTargetNode
82 
     , pAllowRuntimeChgs
83 
     , pIgnoreIpolicy
75 84 
     , pMigrationCleanup
85 
     , pIallocator
76 86 
     , pAllowFailover
77 
     , pMigrationTargetNode
78 87 
     ])
79 88 
  , ("OpTagsGet",
80 89 
     [ pTagsObject

Also available in: Unified diff