Revision d45574de test/py/cmdlib/testsupport/cmdlib_testcase.py

b/test/py/cmdlib/testsupport/cmdlib_testcase.py
34 34
  SetupDefaultNetutilsMock
35 35
from cmdlib.testsupport.processor_mock import ProcessorMock
36 36
from cmdlib.testsupport.rpc_runner_mock import CreateRpcRunnerMock, \
37
  RpcResultsBuilder
37
  RpcResultsBuilder, patchRpc, SetupDefaultRpcModuleMock
38 38
from cmdlib.testsupport.ssh_mock import patchSsh
39 39

  
40 40
from ganeti.cmdlib.base import LogicalUnit
41 41
from ganeti import errors
42
from ganeti import locking
42 43
from ganeti import objects
43 44
from ganeti import opcodes
44 45
from ganeti import runtime
......
57 58
  def __init__(self, test_case):
58 59
    self._test_case = test_case
59 60

  
61
  def AddNode(self, node, ec_id):
62
    self._test_case.cfg.AddNode(node, ec_id)
63
    self._test_case.glm.add(locking.LEVEL_NODE, node.uuid)
64
    self._test_case.glm.add(locking.LEVEL_NODE_RES, node.uuid)
65

  
66
  def ReaddNode(self, node):
67
    pass
68

  
69
  def RemoveNode(self, node):
70
    self._test_case.cfg.RemoveNode(node.uuid)
71
    self._test_case.glm.remove(locking.LEVEL_NODE, node.uuid)
72
    self._test_case.glm.remove(locking.LEVEL_NODE_RES, node.uuid)
73

  
60 74

  
61 75
class MockLU(LogicalUnit):
62 76
  def BuildHooksNodes(self):
......
109 123
    self._iallocator_patcher = None
110 124
    self._netutils_patcher = None
111 125
    self._ssh_patcher = None
126
    self._rpc_patcher = None
112 127

  
113 128
    try:
114 129
      runtime.InitArchInfo()
......
128 143
    if self._ssh_patcher is not None:
129 144
      self._ssh_patcher.stop()
130 145
      self._ssh_patcher = None
146
    if self._rpc_patcher is not None:
147
      self._rpc_patcher.stop()
148
      self._rpc_patcher = None
131 149

  
132 150
  def tearDown(self):
133 151
    super(CmdlibTestCase, self).tearDown()
......
178 196
      # this test module does not use ssh, no patching performed
179 197
      self._ssh_patcher = None
180 198

  
199
    try:
200
      self._rpc_patcher = patchRpc(self._GetTestModule())
201
      self.rpc_mod = self._rpc_patcher.start()
202
      SetupDefaultRpcModuleMock(self.rpc_mod)
203
    except (ImportError, AttributeError):
204
      # this test module does not use rpc, no patching performed
205
      self._rpc_patcher = None
206

  
181 207
  def GetMockLU(self):
182 208
    """Creates a mock L{LogialUnit} with access to the mocked config etc.
183 209

  

Also available in: Unified diff