From 487966732137692696f5f00fe7504e8140d6b268 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 21 Feb 2012 16:19:48 +0100
Subject: [PATCH] Add result checks for OpTags*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/opcodes.py | 7 +++++++
test/ganeti.opcodes_unittest.py | 4 ----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/opcodes.py b/lib/opcodes.py
index e266079b0..f805b5611 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1741,6 +1741,7 @@ class OpTagsGet(OpCode):
# Name is only meaningful for nodes and instances
("name", ht.NoDefault, ht.TMaybeString, None),
]
+ OP_RESULT = ht.TListOf(ht.TNonEmptyString)
class OpTagsSearch(OpCode):
@@ -1749,6 +1750,10 @@ class OpTagsSearch(OpCode):
OP_PARAMS = [
("pattern", ht.NoDefault, ht.TNonEmptyString, None),
]
+ OP_RESULT = ht.TListOf(ht.TAnd(ht.TIsLength(2), ht.TItems([
+ ht.TNonEmptyString,
+ ht.TNonEmptyString,
+ ])))
class OpTagsSet(OpCode):
@@ -1759,6 +1764,7 @@ class OpTagsSet(OpCode):
# Name is only meaningful for nodes and instances
("name", ht.NoDefault, ht.TMaybeString, None),
]
+ OP_RESULT = ht.TNone
class OpTagsDel(OpCode):
@@ -1769,6 +1775,7 @@ class OpTagsDel(OpCode):
# Name is only meaningful for nodes and instances
("name", ht.NoDefault, ht.TMaybeString, None),
]
+ OP_RESULT = ht.TNone
# Test opcodes
diff --git a/test/ganeti.opcodes_unittest.py b/test/ganeti.opcodes_unittest.py
index b94ab1432..7e6cb6e34 100755
--- a/test/ganeti.opcodes_unittest.py
+++ b/test/ganeti.opcodes_unittest.py
@@ -38,10 +38,6 @@ import testutils
#: Unless an opcode is included in the following list it must have a result
#: check of some sort
MISSING_RESULT_CHECK = frozenset([
- opcodes.OpTagsDel,
- opcodes.OpTagsGet,
- opcodes.OpTagsSearch,
- opcodes.OpTagsSet,
opcodes.OpTestAllocator,
opcodes.OpTestDelay,
opcodes.OpTestDummy,
--
GitLab