Revision da4a52a3 test/py/ganeti.cmdlib_unittest.py
| b/test/py/ganeti.cmdlib_unittest.py | ||
|---|---|---|
| 192 | 192 |
("n3c", "g3"),
|
| 193 | 193 |
]) |
| 194 | 194 |
|
| 195 |
def Instance(name, pnode, snode):
|
|
| 195 |
def Instance(uuid, pnode, snode):
|
|
| 196 | 196 |
if snode is None: |
| 197 | 197 |
disks = [] |
| 198 | 198 |
disk_template = constants.DT_DISKLESS |
| ... | ... | |
| 201 | 201 |
logical_id=[pnode, snode, 1, 17, 17])] |
| 202 | 202 |
disk_template = constants.DT_DRBD8 |
| 203 | 203 |
|
| 204 |
return objects.Instance(name=name, primary_node=pnode, disks=disks, |
|
| 204 |
return objects.Instance(name="%s-name" % uuid, uuid="%s" % uuid, |
|
| 205 |
primary_node=pnode, disks=disks, |
|
| 205 | 206 |
disk_template=disk_template) |
| 206 | 207 |
|
| 207 |
instance_data = dict((name, Instance(name, pnode, snode))
|
|
| 208 |
for name, pnode, snode in [("inst1a", "n1a", "n1b"),
|
|
| 208 |
instance_data = dict((uuid, Instance(uuid, pnode, snode))
|
|
| 209 |
for uuid, pnode, snode in [("inst1a", "n1a", "n1b"),
|
|
| 209 | 210 |
("inst1b", "n1b", "n1a"),
|
| 210 | 211 |
("inst2a", "n2a", "n2b"),
|
| 211 | 212 |
("inst3a", "n3a", None),
|
Also available in: Unified diff