Revision 2060348b Ganeti/HTools/QC.hs

b/Ganeti/HTools/QC.hs
154 154
    where _types = (inst::Instance.Instance, name::String)
155 155

  
156 156
prop_Instance_setPri inst pdx =
157
    Instance.pnode (Instance.setPri inst pdx) == pdx
157
    Instance.pNode (Instance.setPri inst pdx) == pdx
158 158
    where _types = (inst::Instance.Instance, pdx::Types.Ndx)
159 159

  
160 160
prop_Instance_setSec inst sdx =
161
    Instance.snode (Instance.setSec inst sdx) == sdx
161
    Instance.sNode (Instance.setSec inst sdx) == sdx
162 162
    where _types = (inst::Instance.Instance, sdx::Types.Ndx)
163 163

  
164 164
prop_Instance_setBoth inst pdx sdx =
165
    Instance.pnode si == pdx && Instance.snode si == sdx
165
    Instance.pNode si == pdx && Instance.sNode si == sdx
166 166
    where _types = (inst::Instance.Instance, pdx::Types.Ndx, sdx::Types.Ndx)
167 167
          si = Instance.setBoth inst pdx sdx
168 168

  
169 169
prop_Instance_runStatus_True inst =
170 170
    let run_st = Instance.running inst
171
        run_tx = Instance.run_st inst
171
        run_tx = Instance.runSt inst
172 172
    in
173 173
      run_tx == "running" || run_tx == "ERROR_up" ==> run_st == True
174 174

  
175 175
prop_Instance_runStatus_False inst =
176 176
    let run_st = Instance.running inst
177
        run_tx = Instance.run_st inst
177
        run_tx = Instance.runSt inst
178 178
    in
179 179
      run_tx /= "running" && run_tx /= "ERROR_up" ==> run_st == False
180 180

  
......
213 213
            (Instance.name i == name &&
214 214
             Instance.vcpus i == vcpus &&
215 215
             Instance.mem i == mem &&
216
             Instance.pnode i == pdx &&
217
             Instance.snode i == rsdx)
216
             Instance.pNode i == pdx &&
217
             Instance.sNode i == rsdx)
218 218

  
219 219
test_Text =
220 220
    [ run prop_Text_Load_Instance
......
223 223
-- Node tests
224 224

  
225 225
-- | Check that an instance add with too high memory or disk will be rejected
226
prop_Node_addPri node inst = (Instance.mem inst >= Node.f_mem node ||
227
                              Instance.dsk inst >= Node.f_dsk node) &&
226
prop_Node_addPri node inst = (Instance.mem inst >= Node.fMem node ||
227
                              Instance.dsk inst >= Node.fDsk node) &&
228 228
                             not (Node.failN1 node)
229 229
                             ==>
230 230
                             isFailure (Node.addPri node inst)
......
233 233

  
234 234
-- | Check that an instance add with too high memory or disk will be rejected
235 235
prop_Node_addSec node inst pdx =
236
    (Instance.mem inst >= (Node.f_mem node - Node.r_mem node) ||
237
     Instance.dsk inst >= Node.f_dsk node) &&
236
    (Instance.mem inst >= (Node.fMem node - Node.rMem node) ||
237
     Instance.dsk inst >= Node.fDsk node) &&
238 238
    not (Node.failN1 node)
239 239
    ==> isFailure (Node.addSec node inst pdx)
240 240
        where _types = (node::Node.Node, inst::Instance.Instance, pdx::Int)
......
250 250
-- | Check that the cluster score is close to zero for a homogeneous cluster
251 251
prop_Score_Zero node count =
252 252
    ((not $ Node.offline node) && (not $ Node.failN1 node) && (count > 0) &&
253
     (Node.t_dsk node > 0) && (Node.t_mem node > 0)) ==>
253
     (Node.tDsk node > 0) && (Node.tMem node > 0)) ==>
254 254
    let fn = Node.buildPeers node Container.empty
255 255
        nlst = (zip [1..] $ replicate count fn)::[(Types.Ndx, Node.Node)]
256 256
        nl = Container.fromAssocList nlst

Also available in: Unified diff