As none of our logical units actually uses the GanetiContext,
remove it from the constructor and its instance variables.
Signed-off-by: Klaus Aehlig <[email protected]>
---
lib/cmdlib/base.py | 3 +--
lib/mcpu.py | 2 +-
test/py/cmdlib/testsupport/cmdlib_testcase.py | 2 +-
test/py/ganeti.hooks_unittest.py | 5 ++---
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/lib/cmdlib/base.py b/lib/cmdlib/base.py
index 6307bb1..57eb8d5 100644
--- a/lib/cmdlib/base.py
+++ b/lib/cmdlib/base.py
@@ -115,7 +115,7 @@ class LogicalUnit(object): # pylint: disable=R0902
HTYPE = None
REQ_BGL = True
- def __init__(self, processor, op, context, cfg,
+ def __init__(self, processor, op, cfg,
rpc_runner, wconfdcontext, wconfd):
"""Constructor for LogicalUnit.
@@ -135,7 +135,6 @@ class LogicalUnit(object): # pylint: disable=R0902
self.cfg = cfg
self.wconfdlocks = []
self.wconfdcontext = wconfdcontext
- self.context = context
self.rpc = rpc_runner
self.wconfd = wconfd # wconfd module to use, for testing
diff --git a/lib/mcpu.py b/lib/mcpu.py
index 35616c0..e5bd057 100644
--- a/lib/mcpu.py
+++ b/lib/mcpu.py
@@ -685,7 +685,7 @@ class Processor(object):
raise errors.ProgrammerError("Opcode '%s' requires BGL, but locks are"
" disabled" % op.OP_ID)
- lu = lu_class(self, op, self.context, self.cfg, self.rpc,
+ lu = lu_class(self, op, self.cfg, self.rpc,
self._wconfdcontext, self.wconfd)
lu.wconfdlocks = self.wconfd.Client().ListLocks(self._wconfdcontext)
lu.ExpandNames()
diff --git a/test/py/cmdlib/testsupport/cmdlib_testcase.py
b/test/py/cmdlib/testsupport/cmdlib_testcase.py
index bcacd99..4e459f3 100644
--- a/test/py/cmdlib/testsupport/cmdlib_testcase.py
+++ b/test/py/cmdlib/testsupport/cmdlib_testcase.py
@@ -231,7 +231,7 @@ class CmdlibTestCase(testutils.GanetiTestCase):
@return: A mock LU
"""
- return MockLU(self.mcpu, mock.MagicMock(), self.ctx, self.cfg, self.rpc,
+ return MockLU(self.mcpu, mock.MagicMock(), self.cfg, self.rpc,
(1234, "/tmp/mock/livelock"), self.wconfd)
def RpcResultsBuilder(self, use_node_names=False):
diff --git a/test/py/ganeti.hooks_unittest.py b/test/py/ganeti.hooks_unittest.py
index 19d41bb..ab7ddda 100755
--- a/test/py/ganeti.hooks_unittest.py
+++ b/test/py/ganeti.hooks_unittest.py
@@ -252,10 +252,9 @@ class TestHooksMaster(unittest.TestCase):
def setUp(self):
self.op = opcodes.OpCode()
- self.context = FakeContext()
# WARNING: here we pass None as RpcRunner instance since we know
# our usage via HooksMaster will not use lu.rpc
- self.lu = FakeLU(FakeProc(), self.op, self.context, FakeConfig(),
+ self.lu = FakeLU(FakeProc(), self.op, FakeConfig(),
None, (123, "/foo/bar"), None)
def testTotalFalse(self):
@@ -528,7 +527,7 @@ class TestHooksRunnerEnv(unittest.TestCase):
self.op = opcodes.OpTestDummy(result=False, messages=[], fail=False)
self.lu = FakeEnvWithCustomPostHookNodesLU(FakeProc(), self.op,
- FakeContext(), FakeConfig(),
+ FakeConfig(),
None,
(123, "/foo/bar"),
None)
--
2.2.0.rc0.207.ga3a616c
