From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FF71C433DB for ; Thu, 25 Mar 2021 12:52:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBCF361962 for ; Thu, 25 Mar 2021 12:52:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBCF361962 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPPTb-0003BZ-Ok for qemu-devel@archiver.kernel.org; Thu, 25 Mar 2021 08:52:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPPS8-0002DL-G4 for qemu-devel@nongnu.org; Thu, 25 Mar 2021 08:51:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPPS2-0002Sz-6w for qemu-devel@nongnu.org; Thu, 25 Mar 2021 08:51:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616676658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JMA6SvstL8imlKbsJwVzdvNrp2kbwq/ULDpiGIG9/Ck=; b=GkqEos8KJdjVLxTEutNICQE9G4oElruKUHowMzT+gMeEUX8qoJMjG/0I/sTcTM03/J69EE Dmw46qYfkmTGwzg09yjoYddG3uvJLc8/tRnWGcBhXG+oTHlcJwdNZOr67jxjRbC+T8knNM lTSRXkKvBequDQ/3axDO4ns0U/ScpIo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-289-lM2awr62OZSidyMVVAnXGQ-1; Thu, 25 Mar 2021 08:50:56 -0400 X-MC-Unique: lM2awr62OZSidyMVVAnXGQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AB1CE6D24C; Thu, 25 Mar 2021 12:50:46 +0000 (UTC) Received: from [10.36.112.13] (ovpn-112-13.ams2.redhat.com [10.36.112.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 72BCB5F82D; Thu, 25 Mar 2021 12:50:32 +0000 (UTC) Subject: Re: [PATCH v2 04/10] Acceptance Tests: move useful ssh methods to base class To: Cleber Rosa References: <20210323221539.3532660-1-crosa@redhat.com> <20210323221539.3532660-5-crosa@redhat.com> <41f58f57-8cc5-f375-943e-0b2d298b8fbd@redhat.com> <20210324222332.GB3592254@amachine.somewhere> From: Auger Eric Message-ID: <0a9f951d-e5d6-8e69-4dfc-079365180a22@redhat.com> Date: Thu, 25 Mar 2021 13:50:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210324222332.GB3592254@amachine.somewhere> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_FILL_THIS_FORM_SHORT=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Aleksandar Rikalo , Eduardo Habkost , =?UTF-8?Q?Alex_Benn=c3=a9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Willian Rampazzo , Eric Auger , John Snow , Willian Rampazzo , Thomas Huth , =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Max Reitz , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Aurelien Jarno , Beraldo Leal Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Cleber, On 3/24/21 11:23 PM, Cleber Rosa wrote: > On Wed, Mar 24, 2021 at 10:07:31AM +0100, Auger Eric wrote: >> Hi Cleber, >> >> On 3/23/21 11:15 PM, Cleber Rosa wrote: >>> Both the virtiofs submounts and the linux ssh mips malta tests >>> contains useful methods related to ssh that deserve to be made >>> available to other tests. Let's move them to the base LinuxTest >> nit: strictly speaking they are moved to another class which is >> inherited by LinuxTest, right? >>> class. >>> >>> The method that helps with setting up an ssh connection will now >>> support both key and password based authentication, defaulting to key >>> based. >>> >>> Signed-off-by: Cleber Rosa >>> Reviewed-by: Wainer dos Santos Moschetta >>> Reviewed-by: Willian Rampazzo >>> --- >>> tests/acceptance/avocado_qemu/__init__.py | 48 ++++++++++++++++++++++- >>> tests/acceptance/linux_ssh_mips_malta.py | 38 ++---------------- >>> tests/acceptance/virtiofs_submounts.py | 37 ----------------- >>> 3 files changed, 50 insertions(+), 73 deletions(-) >>> >>> diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py >>> index 83b1741ec8..67f75f66e5 100644 >>> --- a/tests/acceptance/avocado_qemu/__init__.py >>> +++ b/tests/acceptance/avocado_qemu/__init__.py >>> @@ -20,6 +20,7 @@ >>> from avocado.utils import cloudinit >>> from avocado.utils import datadrainer >>> from avocado.utils import network >>> +from avocado.utils import ssh >>> from avocado.utils import vmimage >>> from avocado.utils.path import find_command >>> >>> @@ -43,6 +44,8 @@ >>> from qemu.accel import kvm_available >>> from qemu.accel import tcg_available >>> from qemu.machine import QEMUMachine >>> +from qemu.utils import get_info_usernet_hostfwd_port >>> + >>> >>> def is_readable_executable_file(path): >>> return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) >>> @@ -253,7 +256,50 @@ def fetch_asset(self, name, >>> cancel_on_missing=cancel_on_missing) >>> >>> >>> -class LinuxTest(Test): >>> +class LinuxSSHMixIn: >>> + """Contains utility methods for interacting with a guest via SSH.""" >>> + >>> + def ssh_connect(self, username, credential, credential_is_key=True): >>> + self.ssh_logger = logging.getLogger('ssh') >>> + res = self.vm.command('human-monitor-command', >>> + command_line='info usernet') >>> + port = get_info_usernet_hostfwd_port(res) >>> + self.assertIsNotNone(port) >>> + self.assertGreater(port, 0) >>> + self.log.debug('sshd listening on port: %d', port) >>> + if credential_is_key: >>> + self.ssh_session = ssh.Session('127.0.0.1', port=port, >>> + user=username, key=credential) >>> + else: >>> + self.ssh_session = ssh.Session('127.0.0.1', port=port, >>> + user=username, password=credential) >>> + for i in range(10): >>> + try: >>> + self.ssh_session.connect() >>> + return >>> + except: >>> + time.sleep(4) >>> + pass >>> + self.fail('ssh connection timeout') >>> + >>> + def ssh_command(self, command): >>> + self.ssh_logger.info(command) >>> + result = self.ssh_session.cmd(command) >>> + stdout_lines = [line.rstrip() for line >>> + in result.stdout_text.splitlines()] >>> + for line in stdout_lines: >>> + self.ssh_logger.info(line) >>> + stderr_lines = [line.rstrip() for line >>> + in result.stderr_text.splitlines()] >>> + for line in stderr_lines: >>> + self.ssh_logger.warning(line) >>> + >>> + self.assertEqual(result.exit_status, 0, >>> + f'Guest command failed: {command}') >>> + return stdout_lines, stderr_lines >>> + >>> + >>> +class LinuxTest(Test, LinuxSSHMixIn): >>> """Facilitates having a cloud-image Linux based available. >>> >>> For tests that indend to interact with guests, this is a better choice >>> diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py >>> index 052008f02d..3f590a081f 100644 >>> --- a/tests/acceptance/linux_ssh_mips_malta.py >>> +++ b/tests/acceptance/linux_ssh_mips_malta.py >>> @@ -12,7 +12,7 @@ >>> import time >>> >>> from avocado import skipUnless >>> -from avocado_qemu import Test >>> +from avocado_qemu import Test, LinuxSSHMixIn >>> from avocado_qemu import wait_for_console_pattern >>> from avocado.utils import process >>> from avocado.utils import archive >>> @@ -21,7 +21,7 @@ >>> from qemu.utils import get_info_usernet_hostfwd_port >> Can't you remove this now? >>> >>> > > Yes, good catch! > >>> -class LinuxSSH(Test): >>> +class LinuxSSH(Test, LinuxSSHMixIn): >> out of curiosity why can't it be migrated to a LinuxTest? > > LinuxTest (currently) assumes that it'll boot via an image obtained > with avocado.utils.vmimage, and configured with > avocado.utils.cloudinit. Those are not the case for this test. I > believe there are still some opportunities for advancing them towards > each other, but LinuxTest needs to become more versatile. OK makes sense. By the way would it be possible to launch other types of cloud-init images? I see that LinuxTest download_boot() only uses a fedora 31 image. I would be interested in being able to run other types of images. Could we make it configurable? I can work on this if it makes sense. Thanks Eric > >>> >>> timeout = 150 # Not for 'configure --enable-debug --enable-debug-tcg' >>> >>> @@ -72,41 +72,9 @@ def get_kernel_info(self, endianess, wordsize): >>> def setUp(self): >>> super(LinuxSSH, self).setUp() >>> >>> - def ssh_connect(self, username, password): >>> - self.ssh_logger = logging.getLogger('ssh') >>> - res = self.vm.command('human-monitor-command', >>> - command_line='info usernet') >>> - port = get_info_usernet_hostfwd_port(res) >>> - if not port: >>> - self.cancel("Failed to retrieve SSH port") >>> - self.log.debug("sshd listening on port:" + port) >>> - self.ssh_session = ssh.Session(self.VM_IP, port=int(port), >>> - user=username, password=password) >>> - for i in range(10): >>> - try: >>> - self.ssh_session.connect() >>> - return >>> - except: >>> - time.sleep(4) >>> - pass >>> - self.fail("ssh connection timeout") >>> - >>> def ssh_disconnect_vm(self): >>> self.ssh_session.quit() >>> >>> - def ssh_command(self, command, is_root=True): >>> - self.ssh_logger.info(command) >>> - result = self.ssh_session.cmd(command) >>> - stdout_lines = [line.rstrip() for line >>> - in result.stdout_text.splitlines()] >>> - for line in stdout_lines: >>> - self.ssh_logger.info(line) >>> - stderr_lines = [line.rstrip() for line >>> - in result.stderr_text.splitlines()] >>> - for line in stderr_lines: >>> - self.ssh_logger.warning(line) >>> - return stdout_lines, stderr_lines >>> - >>> def boot_debian_wheezy_image_and_ssh_login(self, endianess, kernel_path): >>> image_url, image_hash = self.get_image_info(endianess) >>> image_path = self.fetch_asset(image_url, asset_hash=image_hash) >>> @@ -127,7 +95,7 @@ def boot_debian_wheezy_image_and_ssh_login(self, endianess, kernel_path): >>> wait_for_console_pattern(self, console_pattern, 'Oops') >>> self.log.info('sshd ready') >>> >>> - self.ssh_connect('root', 'root') >>> + self.ssh_connect('root', 'root', False) >>> >>> def shutdown_via_ssh(self): >>> self.ssh_command('poweroff') >>> diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virtiofs_submounts.py >>> index 57a7047342..bed8ce44df 100644 >>> --- a/tests/acceptance/virtiofs_submounts.py >>> +++ b/tests/acceptance/virtiofs_submounts.py >>> @@ -9,8 +9,6 @@ >>> from avocado_qemu import wait_for_console_pattern >>> from avocado.utils import ssh >>> >>> -from qemu.utils import get_info_usernet_hostfwd_port >>> - >>> >>> def run_cmd(args): >>> subp = subprocess.Popen(args, >>> @@ -75,41 +73,6 @@ class VirtiofsSubmountsTest(LinuxTest): >>> :avocado: tags=accel:kvm >>> """ >>> >>> - def ssh_connect(self, username, keyfile): >>> - self.ssh_logger = logging.getLogger('ssh') >>> - res = self.vm.command('human-monitor-command', >>> - command_line='info usernet') >>> - port = get_info_usernet_hostfwd_port(res) >>> - self.assertIsNotNone(port) >>> - self.assertGreater(port, 0) >>> - self.log.debug('sshd listening on port: %d', port) >>> - self.ssh_session = ssh.Session('127.0.0.1', port=port, >>> - user=username, key=keyfile) >>> - for i in range(10): >>> - try: >>> - self.ssh_session.connect() >>> - return >>> - except: >>> - time.sleep(4) >>> - pass >>> - self.fail('ssh connection timeout') >>> - >>> - def ssh_command(self, command): >>> - self.ssh_logger.info(command) >>> - result = self.ssh_session.cmd(command) >>> - stdout_lines = [line.rstrip() for line >>> - in result.stdout_text.splitlines()] >>> - for line in stdout_lines: >>> - self.ssh_logger.info(line) >>> - stderr_lines = [line.rstrip() for line >>> - in result.stderr_text.splitlines()] >>> - for line in stderr_lines: >>> - self.ssh_logger.warning(line) >>> - >>> - self.assertEqual(result.exit_status, 0, >>> - f'Guest command failed: {command}') >>> - return stdout_lines, stderr_lines >>> - >>> def run(self, args, ignore_error=False): >>> stdout, stderr, ret = run_cmd(args) >>> >>> >> >> Besides, >> >> Reviewed-by: Eric Auger >> >> Thanks >> >> Eric > > Thanks for the review! > > - Cleber. >