From patchwork Wed Oct 14 07:14:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yufen.Mo" X-Patchwork-Id: 80679 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C83F9A04C0; Wed, 14 Oct 2020 09:19:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BEFD31DCA3; Wed, 14 Oct 2020 09:19:10 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 762AF1DC67 for ; Wed, 14 Oct 2020 09:19:08 +0200 (CEST) IronPort-SDR: XOmlTekGNaS1bW7C4Rdr3SOGS7IMkEcm3vnquM4Nh23hw4mGDIbikEE6WhCc8U8XbNd6EyH57y w4kMPELyzpBQ== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145364898" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145364898" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 00:19:06 -0700 IronPort-SDR: Ka4N75MUdR5v7YRM78qlp2hZN/6kuCARleaTCQy0wipsPDksIJdEG7YquXwbIdr0YdJnvYROda fKMdCR+keprw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,373,1596524400"; d="scan'208";a="530719483" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by orsmga005.jf.intel.com with ESMTP; 14 Oct 2020 00:19:05 -0700 From: yufengmx To: dts@dpdk.org, lihongx.ma@intel.com Cc: yufengmx Date: Wed, 14 Oct 2020 15:14:46 +0800 Message-Id: <20201014071448.32119-2-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201014071448.32119-1-yufengx.mo@intel.com> References: <20201014071448.32119-1-yufengx.mo@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V2 1/3] framework: check the python version 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: , Errors-To: dts-bounces@dpdk.org Sender: "dts" implement a method to check the python version of tester and the server that run dts. If the version is python2, print a warning message. Signed-off-by: yufengmx --- framework/utils.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/framework/utils.py b/framework/utils.py index e74e6c5..371fe52 100644 --- a/framework/utils.py +++ b/framework/utils.py @@ -32,6 +32,7 @@ import json # json format import re import os +import sys import inspect import socket import struct @@ -280,3 +281,25 @@ def get_backtrace_object(file_name, obj_name): obj = getattr(frame.f_locals['self'], obj_name, None) return obj + + +def check_crb_python_version(crb): + cmd = 'python3 -V' + out = crb.send_expect(cmd, '#', 5) + pat = "Python (\d+).(\d+).(\d+)" + result = re.findall(pat, out) + if not result or int(result[0][0]) < 3: + crb.logger.warning( + ("WARNING: Tester node python version is lower than python 3, " + "it is deprecated for use in DTS, " + "and will not work in future releases.")) + crb.logger.warning("Please use Python 3 instead") + + +def check_dts_python_version(): + if sys.version_info.major < 3: + print(RED( + ("WARNING: Dts running node python version is lower than python 3, " + "it is deprecated for use in DTS, " + "and will not work in future releases.")), file=sys.stderr) + print(RED("Please use Python 3 instead"), file=sys.stderr) From patchwork Wed Oct 14 07:14:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yufen.Mo" X-Patchwork-Id: 80681 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0217DA04DB; Wed, 14 Oct 2020 09:19:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EBDB11DCAA; Wed, 14 Oct 2020 09:19:11 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id EAC4A1DC63 for ; Wed, 14 Oct 2020 09:19:09 +0200 (CEST) IronPort-SDR: 23LdPRXmQ8DGvtat56YLrPWzq5Z0gg80nsk6/wjz7mcrVHCGuNQ6ScAXRbQ+QBbkhckLCW6QAl YZwmpIaISXBw== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145364903" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145364903" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 00:19:07 -0700 IronPort-SDR: 2Aq+ZPw+l1XM0AxEnJRTiGcDlRkd+LR8SM39/9KH/E34nNDSgEqEVAIwWDKBvNLL1V70XM2gkV 4Wpwj8EBpTlw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,373,1596524400"; d="scan'208";a="530719493" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by orsmga005.jf.intel.com with ESMTP; 14 Oct 2020 00:19:06 -0700 From: yufengmx To: dts@dpdk.org, lihongx.ma@intel.com Cc: yufengmx Date: Wed, 14 Oct 2020 15:14:47 +0800 Message-Id: <20201014071448.32119-3-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201014071448.32119-1-yufengx.mo@intel.com> References: <20201014071448.32119-1-yufengx.mo@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V2 2/3] framework: check the python version 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: , Errors-To: dts-bounces@dpdk.org Sender: "dts" check the python version of the server that run dts. If the version is python2, print a warning message. Signed-off-by: yufengmx --- framework/dts.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/framework/dts.py b/framework/dts.py index 4fcec3a..697602d 100644 --- a/framework/dts.py +++ b/framework/dts.py @@ -58,7 +58,8 @@ import logger import debugger from config import CrbsConf from checkCase import CheckCase -from utils import get_subclasses, copy_instance_attr, create_parallel_locks +from utils import (get_subclasses, copy_instance_attr, create_parallel_locks, + check_dts_python_version) import sys import imp imp.reload(sys) @@ -505,6 +506,9 @@ def run_all(config_file, pkgName, git, patch, skip_setup, global log_handler global check_case_inst + # check the python version of the server that run dts + check_dts_python_version() + # save global variable serializer = Serializer() From patchwork Wed Oct 14 07:14:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yufen.Mo" X-Patchwork-Id: 80682 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 60540A04B7; Wed, 14 Oct 2020 09:19:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 289171DCAE; Wed, 14 Oct 2020 09:19:12 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 1A0071DC67 for ; Wed, 14 Oct 2020 09:19:09 +0200 (CEST) IronPort-SDR: wp3KVw8z1lyd3wtBrGFfss+s2UsyYsTjeyx79X0d17cWD9ka4Yrhd5VRhi3JpqFkskP0y1qr71 PJbzc42VlMNg== X-IronPort-AV: E=McAfee;i="6000,8403,9773"; a="145364907" X-IronPort-AV: E=Sophos;i="5.77,374,1596524400"; d="scan'208";a="145364907" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 00:19:08 -0700 IronPort-SDR: P7D9u0u9wMXhuBwhIYeni/9dm5wErBWCxpuCAIDMcGk1dJHpMYsUwGL4FXpN03ZTsx2KDUrskt mMnVFnralGRg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,373,1596524400"; d="scan'208";a="530719503" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by orsmga005.jf.intel.com with ESMTP; 14 Oct 2020 00:19:07 -0700 From: yufengmx To: dts@dpdk.org, lihongx.ma@intel.com Cc: yufengmx Date: Wed, 14 Oct 2020 15:14:48 +0800 Message-Id: <20201014071448.32119-4-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201014071448.32119-1-yufengx.mo@intel.com> References: <20201014071448.32119-1-yufengx.mo@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V2 3/3] framework: check the python version 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: , Errors-To: dts-bounces@dpdk.org Sender: "dts" check the python version of tester. If the version is python2, print a warning message. Signed-off-by: yufengmx Acked-by: Lihongx Ma --- framework/tester.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/framework/tester.py b/framework/tester.py index ca179b2..482b0e4 100644 --- a/framework/tester.py +++ b/framework/tester.py @@ -43,7 +43,8 @@ from crb import Crb from net_device import GetNicObj from etgen import IxiaPacketGenerator, SoftwarePacketGenerator import random -from utils import GREEN, convert_int2ip, convert_ip2int +from utils import (GREEN, convert_int2ip, convert_ip2int, + check_crb_python_version) from exception import ParameterInvalidException from multiprocessing import Process from pktgen import getPacketGenerator @@ -66,6 +67,8 @@ class Tester(Crb): self.NAME = 'tester' self.scapy_session = None super(Tester, self).__init__(crb, serializer, self.NAME) + # check the python version of tester + check_crb_python_version(self) self.bgProcIsRunning = False self.duts = None