[dts] [PATCH v1] framework: allow configure login user name of DUT

Marvin Liu yong.liu at intel.com
Wed Jul 26 07:46:07 CEST 2017


Signed-off-by: Marvin Liu <yong.liu at intel.com>

diff --git a/framework/dut.py b/framework/dut.py
index ad0d250..ffe084d 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -69,7 +69,7 @@ class Dut(Crb):
         self.tester = None
         self.cores = []
         self.architecture = None
-        self.ports_info = None
+        self.ports_info = []
         self.conf = PortConf()
         self.ports_map = []
         self.virt_pool = None
@@ -83,6 +83,7 @@ class Dut(Crb):
             self.host_session = SSHConnection(
                 self.get_ip_address(),
                 self.NAME + '_host',
+                self.get_username(),
                 self.get_password())
             self.host_session.init_log(self.logger)
             self.host_init_flag = True
@@ -177,6 +178,12 @@ class Dut(Crb):
         """
         return self.crb['pass']
 
+    def get_username(self):
+        """
+        Get DUT's login username.
+        """
+        return self.crb['user']
+
     def dut_prerequisites(self):
         """
         Prerequest function should be called before execute any test case.
diff --git a/framework/ssh_connection.py b/framework/ssh_connection.py
index 38ab36d..675279b 100644
--- a/framework/ssh_connection.py
+++ b/framework/ssh_connection.py
@@ -44,8 +44,8 @@ class SSHConnection(object):
     Implement send_expect/copy function upper SSHPexpet module.
     """
 
-    def __init__(self, host, session_name, password=''):
-        self.session = SSHPexpect(host, USERNAME, password)
+    def __init__(self, host, session_name, username, password=''):
+        self.session = SSHPexpect(host, username, password)
         self.name = session_name
         connection = {}
         connection[self.name] = self.session
diff --git a/framework/tester.py b/framework/tester.py
index 2bdd1ea..bae8e64 100644
--- a/framework/tester.py
+++ b/framework/tester.py
@@ -40,7 +40,7 @@ from settings import NICS, load_global_setting, PERF_SETTING
 from crb import Crb
 from net_device import GetNicObj
 from etgen import IxiaPacketGenerator, SoftwarePacketGenerator
-from settings import IXIA
+from settings import IXIA, USERNAME
 import random
 from utils import GREEN, convert_int2ip, convert_ip2int
 from exception import ParameterInvalidException
@@ -91,6 +91,12 @@ class Tester(Crb):
         """
         return self.crb['tester IP']
 
+    def get_username(self):
+        """
+        Get login username of tester CRB.
+        """
+        return USERNAME
+
     def get_password(self):
         """
         Get tester login password of tester CRB.
-- 
1.9.3



More information about the dts mailing list