From patchwork Fri Oct 23 08:14:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yufen.Mo" X-Patchwork-Id: 81904 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 798D3A04DE; Fri, 23 Oct 2020 10:19:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4987A9AFE; Fri, 23 Oct 2020 10:19:03 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 58EFC9198 for ; Fri, 23 Oct 2020 10:19:01 +0200 (CEST) IronPort-SDR: wCfwpEQk2sk63l8neYDXubzXXbgTf7BCcMupNee2MUi5r9OGdJk2Erd/cYWxtDdnmzv7omQdTG CtsOk4THrIKw== X-IronPort-AV: E=McAfee;i="6000,8403,9782"; a="146936530" X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="146936530" 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; 23 Oct 2020 01:18:50 -0700 IronPort-SDR: e51AGNgRTDUD5pJJ8EXsBUcUWpZVYl00A2DeJgUYP64w42OVCH2d1TkVYKiRD3cjJ7JMaCrz3S 5a6PZiywtKYw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="534310569" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by orsmga005.jf.intel.com with ESMTP; 23 Oct 2020 01:18:46 -0700 From: yufengmx To: dts@dpdk.org, lijuan.tu@intel.com, lihongx.ma@intel.com Cc: yufengmx Date: Fri, 23 Oct 2020 16:14:09 +0800 Message-Id: <20201023081411.33229-2-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201023081411.33229-1-yufengx.mo@intel.com> References: <20201023081411.33229-1-yufengx.mo@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V4 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 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/framework/utils.py b/framework/utils.py index e74e6c5..6084ea6 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,30 @@ 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 or \ + (int(result[0][0]) == 3 and int(result[0][1]) < 6) or \ + (int(result[0][0]) == 3 and int(result[0][1]) == 6 and int(result[0][2]) < 9): + crb.logger.warning( + ("WARNING: Tester node python version is lower than python 3.6, " + "it is deprecated for use in DTS, " + "and will not work in future releases.")) + crb.logger.warning("Please use Python >= 3.6.9 instead") + + +def check_dts_python_version(): + if sys.version_info.major < 3 or \ + (sys.version_info.major == 3 and sys.version_info.minor < 6) or \ + (sys.version_info.major == 3 and sys.version_info.minor == 6 and sys.version_info.micro < 9): + print(RED( + ("WARNING: Dts running node python version is lower than python 3.6, " + "it is deprecated for use in DTS, " + "and will not work in future releases.")), file=sys.stderr) + print(RED("Please use Python >= 3.6.9 instead"), file=sys.stderr) From patchwork Fri Oct 23 08:14:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yufen.Mo" X-Patchwork-Id: 81903 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 27ADAA04DE; Fri, 23 Oct 2020 10:19:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 133C09AF1; Fri, 23 Oct 2020 10:19:02 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 105F39198 for ; Fri, 23 Oct 2020 10:18:56 +0200 (CEST) IronPort-SDR: 0M6l9qXfpHRTdibaih+se6t+alLp49MOOrUMGVdfUhVUXnSF4UOZxK4r4YWDovikVlMQUBZXvr sEHxrTrL1Nqw== X-IronPort-AV: E=McAfee;i="6000,8403,9782"; a="146936534" X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="146936534" 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; 23 Oct 2020 01:18:50 -0700 IronPort-SDR: MrfOsKAFIkzCfe3jH79GKQhE1w7EO9kATvNLGCMTfn54CiPwMGie+EIR9+9+vByZILPVPzkCgA WQlegVroS44Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="534310572" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by orsmga005.jf.intel.com with ESMTP; 23 Oct 2020 01:18:49 -0700 From: yufengmx To: dts@dpdk.org, lijuan.tu@intel.com, lihongx.ma@intel.com Cc: yufengmx Date: Fri, 23 Oct 2020 16:14:10 +0800 Message-Id: <20201023081411.33229-3-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201023081411.33229-1-yufengx.mo@intel.com> References: <20201023081411.33229-1-yufengx.mo@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V4 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 Fri Oct 23 08:14:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yufen.Mo" X-Patchwork-Id: 81906 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 C398DA04DE; Fri, 23 Oct 2020 10:19:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BB7C1A8F2; Fri, 23 Oct 2020 10:19:05 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id AAD4CA8EB for ; Fri, 23 Oct 2020 10:19:02 +0200 (CEST) IronPort-SDR: tuSM1S6bKPkkuzIMS7AuoSLyFX0gKpax4kxpbbj/tos2RnjN2On0EAy2SSneWitYd0sHQ523Ge Hby4FfjAX8Zw== X-IronPort-AV: E=McAfee;i="6000,8403,9782"; a="146936535" X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="146936535" 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; 23 Oct 2020 01:18:51 -0700 IronPort-SDR: z2Px5tdVI8cbLoeDMu59FD3oXCG6sQ0u5nOYj6e49nmn5/SYLeT8lT0lAlMBN40SaTTneh/xHB ZeBTDoH3Gz4A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,407,1596524400"; d="scan'208";a="534310587" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by orsmga005.jf.intel.com with ESMTP; 23 Oct 2020 01:18:50 -0700 From: yufengmx To: dts@dpdk.org, lijuan.tu@intel.com, lihongx.ma@intel.com Cc: yufengmx Date: Fri, 23 Oct 2020 16:14:11 +0800 Message-Id: <20201023081411.33229-4-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20201023081411.33229-1-yufengx.mo@intel.com> References: <20201023081411.33229-1-yufengx.mo@intel.com> MIME-Version: 1.0 Subject: [dts] [PATCH V4 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 --- 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