Revision 66222813 test/py/cmdlib/testsupport/cmdlib_testcase.py
| b/test/py/cmdlib/testsupport/cmdlib_testcase.py | ||
|---|---|---|
| 37 | 37 |
from cmdlib.testsupport.ssh_mock import patchSsh |
| 38 | 38 |
|
| 39 | 39 |
from ganeti import errors |
| 40 |
from ganeti import objects |
|
| 40 | 41 |
from ganeti import opcodes |
| 41 | 42 |
from ganeti import runtime |
| 42 | 43 |
|
| ... | ... | |
| 81 | 82 |
group = property(fget=lambda self: self._GetDefaultGroup(), |
| 82 | 83 |
doc="Default node group") |
| 83 | 84 |
|
| 85 |
os = property(fget=lambda self: self.cfg.GetDefaultOs(), |
|
| 86 |
doc="Default OS") |
|
| 87 |
os_name_variant = property( |
|
| 88 |
fget=lambda self: self.os.name + objects.OS.VARIANT_DELIM + |
|
| 89 |
self.os.supported_variants[0], |
|
| 90 |
doc="OS name and variant string") |
|
| 91 |
|
|
| 84 | 92 |
def setUp(self): |
| 85 | 93 |
super(CmdlibTestCase, self).setUp() |
| 86 | 94 |
self._iallocator_patcher = None |
| ... | ... | |
| 304 | 312 |
state = opcode.__getstate__() |
| 305 | 313 |
|
| 306 | 314 |
for key, value in kwargs.items(): |
| 307 |
if value == self.REMOVE: |
|
| 315 |
if value == self.REMOVE and key in state:
|
|
| 308 | 316 |
del state[key] |
| 309 | 317 |
else: |
| 310 | 318 |
state[key] = value |
Also available in: Unified diff