diff --git a/qa/qa_config.py b/qa/qa_config.py index f85d940a422fa79f7c9c5b131a9a073c113691c2..fd2ea7afe17702acb13c23f603e0bdad2c9387a8 100644 --- a/qa/qa_config.py +++ b/qa/qa_config.py @@ -448,13 +448,6 @@ def GetDefaultHypervisor(*args): return GetConfig().GetDefaultHypervisor(*args) -def GetInstanceNicMac(inst, default=None): - """Returns MAC address for instance's network interface. - - """ - return inst.GetNicMacAddr(0, default) - - def GetMasterNode(): """Wrapper for L{_QaConfig.GetMasterNode}. diff --git a/qa/qa_instance.py b/qa/qa_instance.py index bf6b325dbb9d50f54bcb469e1fc9262666eb06bf..d072e52bb56798a82f113ed4153a9d81ebc3f805 100644 --- a/qa/qa_instance.py +++ b/qa/qa_instance.py @@ -56,7 +56,8 @@ def _GetGenericAddParameters(inst, force_mac=None): if force_mac: nic0_mac = force_mac else: - nic0_mac = qa_config.GetInstanceNicMac(inst) + nic0_mac = inst.GetNicMacAddr(0, None) + if nic0_mac: params.extend(["--net", "0:mac=%s" % nic0_mac]) diff --git a/qa/qa_rapi.py b/qa/qa_rapi.py index e854b0b6b7478567d5b5ef0ce86377a71c97e355..df374600e72f696b3ca34a06b8e1874a422730a8 100644 --- a/qa/qa_rapi.py +++ b/qa/qa_rapi.py @@ -558,8 +558,7 @@ def TestRapiInstanceAdd(node, use_client): try: disk_sizes = [utils.ParseUnit(size) for size in qa_config.get("disk")] disks = [{"size": size} for size in disk_sizes] - nic0_mac = qa_config.GetInstanceNicMac(instance, - default=constants.VALUE_GENERATE) + nic0_mac = instance.GetNicMacAddr(0, constants.VALUE_GENERATE) nics = [{ constants.INIC_MAC: nic0_mac, }]