Revision 68d95757 test/py/ganeti.hooks_unittest.py

b/test/py/ganeti.hooks_unittest.py
30 30

  
31 31
from ganeti import errors
32 32
from ganeti import opcodes
33
from ganeti import mcpu
33
from ganeti import hooksmaster
34 34
from ganeti import backend
35 35
from ganeti import constants
36 36
from ganeti import cmdlib
......
250 250

  
251 251
  def testTotalFalse(self):
252 252
    """Test complete rpc failure"""
253
    hm = mcpu.HooksMaster.BuildFromLu(self._call_false, self.lu)
253
    hm = hooksmaster.HooksMaster.BuildFromLu(self._call_false, self.lu)
254 254
    self.failUnlessRaises(errors.HooksFailure,
255 255
                          hm.RunPhase, constants.HOOKS_PHASE_PRE)
256 256
    hm.RunPhase(constants.HOOKS_PHASE_POST)
257 257

  
258 258
  def testIndividualFalse(self):
259 259
    """Test individual node failure"""
260
    hm = mcpu.HooksMaster.BuildFromLu(self._call_nodes_false, self.lu)
260
    hm = hooksmaster.HooksMaster.BuildFromLu(self._call_nodes_false, self.lu)
261 261
    hm.RunPhase(constants.HOOKS_PHASE_PRE)
262 262
    #self.failUnlessRaises(errors.HooksFailure,
263 263
    #                      hm.RunPhase, constants.HOOKS_PHASE_PRE)
......
265 265

  
266 266
  def testScriptFalse(self):
267 267
    """Test individual rpc failure"""
268
    hm = mcpu.HooksMaster.BuildFromLu(self._call_script_fail, self.lu)
268
    hm = hooksmaster.HooksMaster.BuildFromLu(self._call_script_fail, self.lu)
269 269
    self.failUnlessRaises(errors.HooksAbort,
270 270
                          hm.RunPhase, constants.HOOKS_PHASE_PRE)
271 271
    hm.RunPhase(constants.HOOKS_PHASE_POST)
272 272

  
273 273
  def testScriptSucceed(self):
274 274
    """Test individual rpc failure"""
275
    hm = mcpu.HooksMaster.BuildFromLu(FakeHooksRpcSuccess, self.lu)
275
    hm = hooksmaster.HooksMaster.BuildFromLu(FakeHooksRpcSuccess, self.lu)
276 276
    for phase in (constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST):
277 277
      hm.RunPhase(phase)
278 278

  
......
323 323
  def testEmptyEnv(self):
324 324
    # Check pre-phase hook
325 325
    self.lu.hook_env = {}
326
    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
326
    hm = hooksmaster.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
327 327
    hm.RunPhase(constants.HOOKS_PHASE_PRE)
328 328

  
329 329
    (node_list, hpath, phase, env) = self._rpcs.pop(0)
......
349 349
    self.lu.hook_env = {
350 350
      "FOO": "pre-foo-value",
351 351
      }
352
    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
352
    hm = hooksmaster.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
353 353
    hm.RunPhase(constants.HOOKS_PHASE_PRE)
354 354

  
355 355
    (node_list, hpath, phase, env) = self._rpcs.pop(0)
......
396 396
      self.lu.hook_env = { name: "value" }
397 397

  
398 398
      # Test using a clean HooksMaster instance
399
      hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
399
      hm = hooksmaster.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
400 400

  
401 401
      for phase in [constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST]:
402 402
        self.assertRaises(AssertionError, hm.RunPhase, phase)
......
404 404

  
405 405
  def testNoNodes(self):
406 406
    self.lu.hook_env = {}
407
    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
407
    hm = hooksmaster.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
408 408
    hm.RunPhase(constants.HOOKS_PHASE_PRE, nodes=[])
409 409
    self.assertRaises(IndexError, self._rpcs.pop)
410 410

  
......
416 416
      "node93782.example.net",
417 417
      ]
418 418

  
419
    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
419
    hm = hooksmaster.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
420 420

  
421 421
    for phase in [constants.HOOKS_PHASE_PRE, constants.HOOKS_PHASE_POST]:
422 422
      hm.RunPhase(phase, nodes=nodes)
......
434 434
      "FOO": "value",
435 435
      }
436 436

  
437
    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
437
    hm = hooksmaster.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
438 438
    hm.RunConfigUpdate()
439 439

  
440 440
    (node_list, hpath, phase, env) = self._rpcs.pop(0)
......
453 453
      "FOO": "value",
454 454
      }
455 455

  
456
    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
456
    hm = hooksmaster.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
457 457
    hm.RunPhase(constants.HOOKS_PHASE_POST)
458 458

  
459 459
    (node_list, hpath, phase, env) = self._rpcs.pop(0)
......
471 471
    self.assertRaises(AssertionError, self.lu.BuildHooksEnv)
472 472
    self.assertRaises(AssertionError, self.lu.BuildHooksNodes)
473 473

  
474
    hm = mcpu.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
474
    hm = hooksmaster.HooksMaster.BuildFromLu(self._HooksRpc, self.lu)
475 475
    self.assertEqual(hm.pre_env, {})
476 476
    self.assertRaises(IndexError, self._rpcs.pop)
477 477

  

Also available in: Unified diff