test suite reviews and discussions
 help / color / mirror / Atom feed
From: Xiao Qimai <qimaix.xiao@intel.com>
To: dts@dpdk.org
Cc: Xiao Qimai <qimaix.xiao@intel.com>
Subject: [dts] [PATCH V2] tests/TestSuite_telemetry: update file_prefix in telemetry client
Date: Mon, 28 Oct 2019 18:14:31 -0400	[thread overview]
Message-ID: <1572300871-27885-1-git-send-email-qimaix.xiao@intel.com> (raw)

update file_prefix in telemetry client after testpmd launched

Signed-off-by: Xiao Qimai <qimaix.xiao@intel.com>
---
 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


             reply	other threads:[~2019-10-28 10:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-28 22:14 Xiao Qimai [this message]
2019-11-04  2:41 ` Tu, Lijuan
2019-11-04  3:12 ` Mo, YufengX
2019-11-04  3:20 ` Mo, YufengX

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1572300871-27885-1-git-send-email-qimaix.xiao@intel.com \
    --to=qimaix.xiao@intel.com \
    --cc=dts@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).