Am 16. Mai 2011 12:24 schrieb Iustin Pop <[email protected]>:
> On Fri, May 13, 2011 at 05:35:46PM +0200, Michael Hanselmann wrote:
>> --- a/lib/opcodes.py
>> +++ b/lib/opcodes.py
>> @@ -1430,6 +1430,11 @@ class OpTestAllocator(OpCode):
>> ("disk_template", None, ht.TMaybeString, None),
>> ("evac_nodes", None, ht.TOr(ht.TNone, ht.TListOf(ht.TNonEmptyString)),
>> None),
>> + ("instances", None, ht.TOr(ht.TNone, ht.TListOf(ht.TNonEmptyString)),
>> + None),
>> + ("reloc_mode", None, ht.TMaybeString, None),
>
> Shouldn't reloc mode be ht.TElemOf(constants.…)?
Correct, see interdiff below. I added this before adding the mode
constants and forgot about it.
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1432,7 +1432,8 @@ class OpTestAllocator(OpCode):
None),
("instances", None, ht.TOr(ht.TNone, ht.TListOf(ht.TNonEmptyString)),
None),
- ("reloc_mode", None, ht.TMaybeString, None),
+ ("reloc_mode", None,
+ ht.TOr(ht.TNone, ht.TElemOf(constants.IALLOCATOR_MRELOC_MODES)), None),
("target_groups", None, ht.TOr(ht.TNone, ht.TListOf(ht.TNonEmptyString)),
None),
]
Michael