From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3ED59A00B8; Mon, 28 Oct 2019 11:14:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F337A1BF23; Mon, 28 Oct 2019 11:14:37 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 6441A1BF08 for ; Mon, 28 Oct 2019 11:14:36 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Oct 2019 03:14:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,239,1569308400"; d="scan'208";a="210846829" Received: from unknown (HELO dpdk-xiaoqimai-tester.sh.intel.com) ([10.240.179.35]) by fmsmga001.fm.intel.com with ESMTP; 28 Oct 2019 03:14:34 -0700 From: Xiao Qimai To: dts@dpdk.org Cc: Xiao Qimai Date: Mon, 28 Oct 2019 18:14:31 -0400 Message-Id: <1572300871-27885-1-git-send-email-qimaix.xiao@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dts] [PATCH V2] tests/TestSuite_telemetry: update file_prefix in telemetry client 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" update file_prefix in telemetry client after testpmd launched Signed-off-by: Xiao Qimai --- tests/TestSuite_telemetry.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/TestSuite_telemetry.py b/tests/TestSuite_telemetry.py index bb2c9e6..c6e7e08 100644 --- a/tests/TestSuite_telemetry.py +++ b/tests/TestSuite_telemetry.py @@ -250,6 +250,8 @@ class TestTelemetry(TestCase): socket=socket) self.testpmd_status = 'running' self.testpmd.execute_cmd('start') + if not self.change_flag: + self.change_run_fileprefix(output) return output def close_telemetry_server(self): @@ -441,6 +443,22 @@ class TestTelemetry(TestCase): # # test content # + def get_file_prefix(self, out): + m = re.search('socket /var/run/dpdk/(.+?)/', out) + if m: + self.file_prefix = m.group(1) if m.group(1) != "rte" else None + + def change_run_fileprefix(self, out): + self.get_file_prefix(out) + if self.file_prefix: + self.dut_session2 = self.dut.new_session() + cmd1 = "sed -i 's/self.socket.send_fd.connect(\"\/var\/run\/dpdk\/.*\/telemetry\")/self.socket.send_fd.connect(\"\/var\/run\/dpdk\/{0}\/telemetry\")/g' {1}".format( + self.file_prefix, os.path.join(self.target_dir, 'usertools/dpdk-telemetry-client.py')) + cmd = "sed -i 's/self.socket.send_fd.connect(\"\/var\/run\/dpdk\/.*\/telemetry\")/self.socket.send_fd.connect(\"\/var\/run\/dpdk\/{0}\/telemetry\")/g' {1}".format( + self.file_prefix, os.path.join(self.target_dir, 'dpdk_telemetry_client.py')) + self.dut_session2.send_expect(cmd1, "# ", 3) + self.dut_session2.send_expect(cmd, "# ", 3) + self.change_flag = True def verify_basic_script(self): ''' @@ -553,6 +571,7 @@ class TestTelemetry(TestCase): self.init_test_binary_files() self.nic_grp = self.get_ports_by_nic_type() self.used_ports = [] + self.change_flag = False def set_up(self): """ -- 1.8.3.1