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 5007BA0350; Tue, 30 Jun 2020 11:55:05 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 48BF81BF76; Tue, 30 Jun 2020 11:55:05 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 86E3A1BEC0 for ; Tue, 30 Jun 2020 11:55:03 +0200 (CEST) IronPort-SDR: LTEuYT+AFFEuUdVxeMF0Q8FAqkArfD5ZRAqf+OFpzgYmOxtIilN39xIlkAnAir2t9E8oJQQS+a yuUMSrMwNFJg== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="147742008" X-IronPort-AV: E=Sophos;i="5.75,297,1589266800"; d="scan'208";a="147742008" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2020 02:55:03 -0700 IronPort-SDR: Bn/xb0ssvDrAHNB0+TPjNdwnLho90lXp+U9/nrq488aB+7czmbUlG3uKjIs+Ty0uR+Lk5fCzVK AMnVIlTWJeVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,297,1589266800"; d="scan'208";a="355732308" Received: from unknown (HELO xqm-virtio_tester.localdomain) ([10.240.183.52]) by orsmga001.jf.intel.com with ESMTP; 30 Jun 2020 02:55:02 -0700 From: Xiao Qimai To: dts@dpdk.org Cc: Xiao Qimai Date: Tue, 30 Jun 2020 17:46:37 +0800 Message-Id: <1593510398-51509-5-git-send-email-qimaix.xiao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593510398-51509-1-git-send-email-qimaix.xiao@intel.com> References: <1593510398-51509-1-git-send-email-qimaix.xiao@intel.com> Subject: [dts] [PATCH V1 4/5]framework/qemu_kvm: remove cat command 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" Signed-off-by: Xiao Qimai --- framework/qemu_kvm.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py index 421ee3e..757737e 100644 --- a/framework/qemu_kvm.py +++ b/framework/qemu_kvm.py @@ -1829,11 +1829,6 @@ class QEMUKvm(VirtBase): if self.control_type == "qga": # wait few seconds for network ready time.sleep(5) - # before get the ip, check the ssh service is ok - # if the ssh service if ready, the file /run/sshd.pid will store the pid - out = self.control_session.send_expect(self.qga_cmd_head + "cat /run/sshd.pid" , "#", timeout=self.OPERATION_TIMEOUT) - if out == '': - return "Failed" out = self.control_session.send_expect(self.qga_cmd_head + "ifconfig" , "#", timeout=self.OPERATION_TIMEOUT) else: pci = "00:1f.0" @@ -1843,10 +1838,6 @@ class QEMUKvm(VirtBase): if self.nic_model == "virtio": pci += "/virtio*/" - # before get the ip, check the ssh service is ok - out = self.control_session.send_expect("ls /run/sshd.pid", "# ", timeout=self.OPERATION_TIMEOUT, verify=True) - if isinstance(out, int): - return "Failed" intf = self.control_session.send_expect("ls -1 /sys/bus/pci/devices/0000:%s/net" %pci, "#", timeout=self.OPERATION_TIMEOUT) out = self.control_session.send_expect("ifconfig %s" % intf, "#", timeout=self.OPERATION_TIMEOUT) if "10.0.2" not in out: -- 1.8.3.1