Revision 0afce24e
| b/qa/qa_config.py | ||
|---|---|---|
| 448 | 448 |
return GetConfig().GetDefaultHypervisor(*args) |
| 449 | 449 |
|
| 450 | 450 |
|
| 451 |
def GetInstanceNicMac(inst, default=None): |
|
| 452 |
"""Returns MAC address for instance's network interface. |
|
| 453 |
|
|
| 454 |
""" |
|
| 455 |
return inst.GetNicMacAddr(0, default) |
|
| 456 |
|
|
| 457 |
|
|
| 458 | 451 |
def GetMasterNode(): |
| 459 | 452 |
"""Wrapper for L{_QaConfig.GetMasterNode}.
|
| 460 | 453 |
|
| b/qa/qa_instance.py | ||
|---|---|---|
| 56 | 56 |
if force_mac: |
| 57 | 57 |
nic0_mac = force_mac |
| 58 | 58 |
else: |
| 59 |
nic0_mac = qa_config.GetInstanceNicMac(inst) |
|
| 59 |
nic0_mac = inst.GetNicMacAddr(0, None) |
|
| 60 |
|
|
| 60 | 61 |
if nic0_mac: |
| 61 | 62 |
params.extend(["--net", "0:mac=%s" % nic0_mac]) |
| 62 | 63 |
|
| b/qa/qa_rapi.py | ||
|---|---|---|
| 558 | 558 |
try: |
| 559 | 559 |
disk_sizes = [utils.ParseUnit(size) for size in qa_config.get("disk")]
|
| 560 | 560 |
disks = [{"size": size} for size in disk_sizes]
|
| 561 |
nic0_mac = qa_config.GetInstanceNicMac(instance, |
|
| 562 |
default=constants.VALUE_GENERATE) |
|
| 561 |
nic0_mac = instance.GetNicMacAddr(0, constants.VALUE_GENERATE) |
|
| 563 | 562 |
nics = [{
|
| 564 | 563 |
constants.INIC_MAC: nic0_mac, |
| 565 | 564 |
}] |
Also available in: Unified diff