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 1338FA04A2; Tue, 12 May 2020 09:37:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0AA261C014; Tue, 12 May 2020 09:37:33 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 1CE721BFB4 for ; Tue, 12 May 2020 09:37:30 +0200 (CEST) IronPort-SDR: XSWly7CLqR1AQHAnF0C6H8JAmtvbhPvzHoZTpEiMfZgLyGtzR/FhjSiiI/CgKlO6aY/pKnqvca ho7p03Bb7lzw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2020 00:37:30 -0700 IronPort-SDR: qYTuTAhun68R/J1k7AuvEQ1JVnxfmOzXm8R+JD/+hUI57Q/vX4URKoo9GZkOkCN1y/8IxKhgdX UElFZqooqcoQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,383,1583222400"; d="scan'208";a="436989498" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga005.jf.intel.com with ESMTP; 12 May 2020 00:37:29 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 12 May 2020 00:37:29 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.225]) by shsmsx102.ccr.corp.intel.com ([169.254.2.38]) with mapi id 14.03.0439.000; Tue, 12 May 2020 15:37:25 +0800 From: "Tu, Lijuan" To: "Wang, Yinan" , "dts@dpdk.org" CC: "Wang, Yinan" Thread-Topic: [dts] [PATCH v1] tests: Skip LM active status check since LM can be completed in a moment Thread-Index: AQHWJ1AxuHpZBezbS0iWZCwmku/8aKikEbdw Date: Tue, 12 May 2020 07:37:25 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BC2A3C6@SHSMSX101.ccr.corp.intel.com> References: <20200510214712.48161-1-yinan.wang@intel.com> In-Reply-To: <20200510214712.48161-1-yinan.wang@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH v1] tests: Skip LM active status check since LM can be completed in a moment 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" Applied, thanks > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Yinan > Sent: Monday, May 11, 2020 5:47 AM > To: dts@dpdk.org > Cc: Wang, Yinan > Subject: [dts] [PATCH v1] tests: Skip LM active status check since LM can= be > completed in a moment >=20 > From: Wang Yinan >=20 > Signed-off-by: Wang Yinan > --- > tests/TestSuite_vhost_user_live_migration.py | 20 +++----------------- > 1 file changed, 3 insertions(+), 17 deletions(-) >=20 > diff --git a/tests/TestSuite_vhost_user_live_migration.py > b/tests/TestSuite_vhost_user_live_migration.py > index cb6789c..ed58901 100644 > --- a/tests/TestSuite_vhost_user_live_migration.py > +++ b/tests/TestSuite_vhost_user_live_migration.py > @@ -84,8 +84,6 @@ class TestVhostUserLiveMigration(TestCase): > backup_socket_num =3D len(set([int(core['socket']) for core in > self.backup_dut.cores])) > self.host_socket_mem =3D ','.join(['1024']*host_socket_num) > self.backup_socket_mem =3D ','.join(['1024']*backup_socket_num) > - self.backup_speed =3D self.dut.skip_setup > - self.flag_compiled =3D False >=20 > def set_up(self): > self.host_dut.send_expect('rm ./vhost-net*', '# ', 30) @@ -170,8= +168,6 > @@ class TestVhostUserLiveMigration(TestCase): > """ > Create testing environment on Host and Backup > """ > - if self.flag_compiled: > - self.dut.skip_setup =3D True > try: > # set up host virtual machine > self.host_vm =3D VM(self.duts[0], 'host', '%s' % self.suite_= name) @@ - > 193,8 +189,6 @@ class TestVhostUserLiveMigration(TestCase): >=20 > if self.vm_dut_host is None: > raise Exception("Set up host VM ENV failed!") > - self.flag_compiled =3D True > - > self.logger.info("Start virtual machine on backup host") > # set up backup virtual machine > self.backup_vm =3D VM(self.duts[1], 'backup', > 'vhost_user_live_migration') @@ -236,8 +230,8 @@ class > TestVhostUserLiveMigration(TestCase): > try: > if self.backup_vm is not None: > if self.migration_done: > - self.vm_dut_backup.kill_all() > self.vm_dut_backup.send_expect('pkill screen', '# ') > + self.vm_dut_backup.kill_all() > self.backup_vm.stop() > self.backup_vm =3D None > except Exception as e: > @@ -320,7 +314,6 @@ class TestVhostUserLiveMigration(TestCase): > vm_dut.send_expect('export TERM=3Dscreen', '# ') > vm_dut.send_command('screen -r %s' % self.screen_name) > # clean the output info before verify > - vm_dut.get_session_output(timeout=3D1) > time.sleep(5) > out =3D vm_dut.get_session_output(timeout=3D1) > print(out) > @@ -332,12 +325,10 @@ class TestVhostUserLiveMigration(TestCase): > def start_tcpdump_on_vm(self, vm_dut): > vm_dut.send_expect('export TERM=3Dscreen', '# ') > vm_dut.send_expect('screen -S %s' % self.screen_name, '# ', 120) > - > # get host interface > vm_intf =3D vm_dut.ports_info[0]['port'].get_interface_name() > # start tcpdump the interface > vm_dut.send_expect("ifconfig %s up" % vm_intf, "# ") > - > direct_pat =3D re.compile(r"(\s+)\[ (\S+) in\|out\|inout \]") > vm_dut.send_expect("tcpdump -h", "# ") > out =3D vm_dut.get_session_output(timeout=3D1) > @@ -367,9 +358,7 @@ class TestVhostUserLiveMigration(TestCase): >=20 > self.logger.info("Migrate host VM to backup host") > # start live migration > - ret =3D self.host_vm.start_migration(self.backup_dut_ip, > self.backup_vm.migrate_port) > - self.verify(ret, "Failed to migration, please check VM and qemu = version") > - > + self.host_vm.start_migration(self.backup_dut_ip, > + self.backup_vm.migrate_port) > if multi_queue is True: > vm_intf =3D self.vm_dut_host.ports_info[0]['port'].get_inter= face_name() > out =3D self.vm_dut_host.send_expect('ethtool -L %s combined= 4' % > vm_intf, '# ') @@ -378,6 +367,7 @@ class > TestVhostUserLiveMigration(TestCase): > self.logger.info("Waiting migration process done") > # wait live migration done > self.host_vm.wait_migration_done() > + > self.migration_done =3D True >=20 > self.logger.info("Migration process done, then go to backup VM")= @@ - > 396,12 +386,10 @@ class TestVhostUserLiveMigration(TestCase): > self.launch_testpmd_as_vhost_on_both_dut() > self.start_testpmd_with_fwd_mode_on_both_dut() > self.setup_vm_env_on_both_dut() > - > # bind virtio-net back to virtio-pci > self.bind_nic_driver_of_vm(self.vm_dut_host, driver=3D"") > # start screen and tcpdump on vm > self.start_tcpdump_on_vm(self.vm_dut_host) > - > self.send_and_verify(self.verify_kernel) >=20 > def > test_adjust_split_ring_virtio_net_queue_numbers_while_migreting_with_vir > tio_net(self): > @@ -421,7 +409,6 @@ class TestVhostUserLiveMigration(TestCase): > self.launch_testpmd_as_vhost_on_both_dut() > self.start_testpmd_with_fwd_mode_on_both_dut() > self.setup_vm_env_on_both_dut() > - > # bind virtio-net to igb_uio > self.bind_nic_driver_of_vm(self.vm_dut_host, driver=3D"igb_uio") > self.start_testpmd_on_vm(self.vm_dut_host) > @@ -510,5 +497,4 @@ class TestVhostUserLiveMigration(TestCase): > pass >=20 > def tear_down_all(self): > - self.dut.skip_setup =3D self.backup_speed > pass > -- > 2.17.1