From 0afce24ef01e6f5d0aabf488676ab624ef9f7f47 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 5 Feb 2013 17:33:39 +0100
Subject: [PATCH] Remove qa_config.GetInstanceNicMac
Call the wrapped instance method directly.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Bernardo Dal Seno <bdalseno@google.com>
---
qa/qa_config.py | 7 -------
qa/qa_instance.py | 3 ++-
qa/qa_rapi.py | 3 +--
3 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/qa/qa_config.py b/qa/qa_config.py
index f85d940a4..fd2ea7afe 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 bf6b325db..d072e52bb 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 e854b0b6b..df374600e 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,
}]
--
GitLab