From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id C91D82629 for ; Wed, 26 Jul 2017 07:48:18 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jul 2017 22:48:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,413,1496127600"; d="scan'208";a="1176520186" Received: from dpdk-test38.sh.intel.com ([10.67.111.97]) by fmsmga001.fm.intel.com with ESMTP; 25 Jul 2017 22:48:15 -0700 From: Marvin Liu To: dts@dpdk.org Cc: Marvin Liu Date: Wed, 26 Jul 2017 01:46:07 -0400 Message-Id: <1501047967-50409-1-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH v1] framework: allow configure login user name of DUT X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jul 2017 05:48:19 -0000 Signed-off-by: Marvin Liu 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