[dts] [PATCH 1/8] framework settings: rename nic_name_from_type to get_nic_name
Yong Liu
yong.liu at intel.com
Sun Dec 13 05:57:37 CET 2015
From: Marvin Liu <yong.liu at intel.com>
This function will return nic name by pci type.
Signed-off-by: Marvin Liu <yong.liu at intel.com>
diff --git a/framework/checkCase.py b/framework/checkCase.py
index e7b22f1..94e6a4a 100644
--- a/framework/checkCase.py
+++ b/framework/checkCase.py
@@ -1,6 +1,6 @@
import xlrd
-from settings import nic_name_from_type
+from settings import get_nic_name
filter_file = r'./conf/dpdk_test_case_checklist.xls'
filter_case = []
@@ -96,7 +96,7 @@ class check_case_skip():
def check_nic(self, nic_type):
if 'all' == nic_type[0].lower():
return True
- dut_nic_type = nic_name_from_type(self.dut.ports_info[0]['type'])
+ dut_nic_type = get_nic_name(self.dut.ports_info[0]['type'])
if dut_nic_type in nic_type:
return True
else:
diff --git a/framework/settings.py b/framework/settings.py
index c99dcaa..0b658f2 100644
--- a/framework/settings.py
+++ b/framework/settings.py
@@ -40,6 +40,7 @@ FOLDERS = {
'Configuration': 'conf',
'Depends': 'dep',
'Output': 'output',
+ 'NicDriver': 'nics',
}
"""
@@ -159,7 +160,7 @@ The log name seperater.
LOG_NAME_SEP = '.'
-def nic_name_from_type(type):
+def get_nic_name(type):
"""
strip nic code name by nic type
"""
diff --git a/framework/test_case.py b/framework/test_case.py
index 5013123..f601381 100644
--- a/framework/test_case.py
+++ b/framework/test_case.py
@@ -35,7 +35,7 @@ A base class for creating DTF test cases.
import dts
from exception import VerifyFailure
-from settings import DRIVERS, NICS, nic_name_from_type
+from settings import DRIVERS, NICS, get_nic_name
class TestCase(object):
@@ -48,7 +48,7 @@ class TestCase(object):
self.nics = []
for portid in range(len(self.dut.ports_info)):
nic_type = self.dut.ports_info[portid]['type']
- self.nics.append(nic_name_from_type(nic_type))
+ self.nics.append(get_nic_name(nic_type))
if len(self.nics):
self.nic = self.nics[0]
else:
--
1.9.3
More information about the dts
mailing list