Commit b8812691 authored by Iustin Pop's avatar Iustin Pop
Browse files

Rework the "type" system



This patch merges the _OP_REQP and _OP_DEFS class attributes into a
_OP_PARAMS list, which holds both. The associated unittest checks that
all opcode attributes are declared and checked, and that no LU uses the
old fields (could be removed later).
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent e7736336
This diff is collapsed.
...@@ -28,8 +28,11 @@ import time ...@@ -28,8 +28,11 @@ import time
import tempfile import tempfile
import shutil import shutil
from ganeti import mcpu
from ganeti import cmdlib from ganeti import cmdlib
from ganeti import opcodes
from ganeti import errors from ganeti import errors
from ganeti import utils
import testutils import testutils
...@@ -57,5 +60,39 @@ class TestCertVerification(testutils.GanetiTestCase): ...@@ -57,5 +60,39 @@ class TestCertVerification(testutils.GanetiTestCase):
self.assertEqual(errcode, cmdlib.LUVerifyCluster.ETYPE_ERROR) self.assertEqual(errcode, cmdlib.LUVerifyCluster.ETYPE_ERROR)
class TestOpcodeParams(testutils.GanetiTestCase):
def testParamsStructures(self):
for op in sorted(mcpu.Processor.DISPATCH_TABLE):
lu = mcpu.Processor.DISPATCH_TABLE[op]
lu_name = lu.__name__
self.failIf(hasattr(lu, "_OP_REQP"), "LU '%s' has old-style _OP_REQP" %
lu_name)
self.failIf(hasattr(lu, "_OP_DEFS"), "LU '%s' has old-style _OP_DEFS" %
lu_name)
# this needs to remain a list!
defined_params = [v[0] for v in lu._OP_PARAMS]
for row in lu._OP_PARAMS:
# this relies on there being at least one element
param_name = row[0]
self.failIf(len(row) != 3, "LU '%s' parameter %s has invalid length" %
(lu_name, param_name))
self.failIf(defined_params.count(param_name) > 1, "LU '%s' parameter"
" '%s' is defined multiple times" % (lu_name, param_name))
def testParamsDefined(self):
for op in sorted(mcpu.Processor.DISPATCH_TABLE):
lu = mcpu.Processor.DISPATCH_TABLE[op]
lu_name = lu.__name__
# TODO: this doesn't deal with recursive slots definitions
all_params = set(op.__slots__)
defined_params = set(v[0] for v in lu._OP_PARAMS)
missing = all_params.difference(defined_params)
self.failIf(missing, "Undeclared parameter types for LU '%s': %s" %
(lu_name, utils.CommaJoin(missing)))
extra = defined_params.difference(all_params)
self.failIf(extra, "Extra parameter types for LU '%s': %s" %
(lu_name, utils.CommaJoin(extra)))
if __name__ == "__main__": if __name__ == "__main__":
testutils.GanetiTestProgram() testutils.GanetiTestProgram()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment