From nobody Wed Nov 12 16:27:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1571498568; cv=none; d=zoho.com; s=zohoarc; b=USybf5O1zGjPp8ov8HIZLzG3h186JZ7DYJ9CtO+URWcUKfn+pzLkjvEA1JZe+ePahknXvB2rO9IBxKukqiSpnsaufUgMMiI7gLZAKKlubPTS71H2uu3KN1FMiOOWHrYl88I2GSLX5loQwknbf2OhG/2D7KJWQUuidovqVYAxd8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571498568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IrxCFtZN7IWMU6h2qOEBlnQRpVoXjxguCXHm8vL6MOI=; b=fehNZZbqFfYRcoARZC9W235kaw+jIKyoz6wnZZTr5hsOBc4BWQkrC9+1u7NdIJzWp35IQJK0WetStGFAqyC3NmZZp733lDigd0ego/dr3QZqI+abtLvHclRU23tpkmHQPcKD+hGXEQWIqAZ9hTpy3ZcjIC8zWAq8ybHaa3GoEi8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571498568076673.8797296735821; Sat, 19 Oct 2019 08:22:48 -0700 (PDT) Received: from localhost ([::1]:56637 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqZ4-0003Vc-Vo for importer@patchew.org; Sat, 19 Oct 2019 11:22:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45751) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLqNy-0001KA-SS for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:11:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLqNw-00077H-VN for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:11:18 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:43872) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iLqNw-00075w-Fp for qemu-devel@nongnu.org; Sat, 19 Oct 2019 11:11:16 -0400 Received: by mail-wr1-x441.google.com with SMTP id c2so3948662wrr.10 for ; Sat, 19 Oct 2019 08:11:16 -0700 (PDT) Received: from x1w.redhat.com (14.red-88-21-201.staticip.rima-tde.net. [88.21.201.14]) by smtp.gmail.com with ESMTPSA id t13sm10753964wra.70.2019.10.19.08.11.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Oct 2019 08:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IrxCFtZN7IWMU6h2qOEBlnQRpVoXjxguCXHm8vL6MOI=; b=Kbe6W6HmdS+fWJQDjRBnkcyA22Z71off/MNopVmr33yzT/vr3VDiUEChO9R4faNU2w foK9Eu+onYZw9llsLkml6R7KJuWYyFZRxk1s427pStiv29LQ6tB8VC1QDu06W9obpF42 KwTQKEZkIc7bnl2aA+C5Czt9Z48Ga/sY89gxNJsq7fx8hpwUbCvWbxvDRccHgI4Uum6l M/fZQTh6qgQCGiTrgtV4Mh7SDZ1fQ6DTc9SjbqGcCMwhsWo9+ArfW6Yd2WfTGw/6+Oco qFEqmsdrISx0JagmVcUfgb9+gV9uGjdjXgjAi1SXOO24avsZOQRWn7JeixrrtpRVoCpQ 2Riw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IrxCFtZN7IWMU6h2qOEBlnQRpVoXjxguCXHm8vL6MOI=; b=EiteRxy4YqjfgxN+QdMRzkFu9RzzU+PvEDtgfEV1OfjJTL6t8euhY5h3fF04SEWMvF azVFqBnUu/bo3qGq2DrMoQ7OaDyoNjUwbjDQXdf3SbIAnZ4A851X/JPSgGVhISm94vQe Y2FmFU+hUiJM+h8yY1+d/WF8QdMqe3cA7mWWrDbOHbvWvsUTgoSL5MEO+jLEBiw70Ika pCS6wTGG9TpCV4Ny5oJfL1JNX1amUAYnFXX3lbc6SeZ1FUFfRoJbJ0V6XOe4C/KpLM4B Hwu3n4nWe0NOeZ6CrfIA1Yd2LS3aRXhFqM6QHrlL54IH26m/xoD6S0eGQnfOVTk2Ey+T nmJQ== X-Gm-Message-State: APjAAAWsEggzHszBy4CtAGOHbkoeNuYOqggc2PnqX8WtYVn2x4BJtoVU 5jITIkn49raC8+wm3oxxxjQKbvnS X-Google-Smtp-Source: APXvYqzIqkc1+/1rmHXfLUTaYeNF7Q9ko6dkLFDuG0FA2P7sMdWLUgTSnjjbc/wfrniQRBJAeItUow== X-Received: by 2002:adf:a506:: with SMTP id i6mr11985631wrb.159.1571497874934; Sat, 19 Oct 2019 08:11:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 10/11] tests/ssh_linux_malta: Refactor how to get image/kernel info Date: Sat, 19 Oct 2019 17:10:57 +0200 Message-Id: <20191019151058.31733-11-f4bug@amsat.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191019151058.31733-1-f4bug@amsat.org> References: <20191019151058.31733-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 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: Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Cleber Rosa , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The qcow and kernel images use a similar pattern regarding they are for big/little endianess, or 32/64 bit. Refactor using more dictionary keys. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/linux_ssh_mips_malta.py | 75 ++++++++++++++---------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/li= nux_ssh_mips_malta.py index 822b0553ff..2139c80f5f 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -26,15 +26,44 @@ class LinuxSSH(Test): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' VM_IP =3D '127.0.0.1' =20 + BASE_URL =3D 'https://people.debian.org/~aurel32/qemu/' IMAGE_INFO =3D { - 'be': {'image_url': ('https://people.debian.org/~aurel32/qemu/mips= /' - 'debian_wheezy_mips_standard.qcow2'), - 'image_hash': '8987a63270df67345b2135a6b7a4885a35e392d5'}, - 'le': {'image_url': ('https://people.debian.org/~aurel32/qemu/mips= el/' - 'debian_wheezy_mipsel_standard.qcow2'), - 'image_hash': '7866764d9de3ef536ffca24c9fb9f04ffdb45802'} + 'be': {'base_url': 'mips', + 'image_name': 'debian_wheezy_mips_standard.qcow2', + 'image_hash': '8987a63270df67345b2135a6b7a4885a35e392d5', + 'kernel_hash': { + 32: '592e384a4edc16dade52a6cd5c785c637bcbc9ad', + 64: 'db6eea7de35d36c77d8c165b6bcb222e16eb91db'} + }, + 'le': {'base_url': 'mipsel', + 'image_name': 'debian_wheezy_mipsel_standard.qcow2', + 'image_hash': '7866764d9de3ef536ffca24c9fb9f04ffdb45802', + 'kernel_hash': { + 32: 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a', + 64: '6a7f77245acf231415a0e8b725d91ed2f3487794'} + } + } + CPU_INFO =3D { + 32: {'kernel_release': '3.2.0-4-4kc-malta'}, + 64: {'kernel_release': '3.2.0-4-5kc-malta'} } =20 + def get_url(self, endianess, path=3D''): + qkey =3D {'le': 'el', 'be': ''} + return '%s/mips%s/%s' % (self.BASE_URL, qkey[endianess], path) + + def get_image_info(self, endianess): + dinfo =3D self.IMAGE_INFO[endianess] + image_url =3D self.get_url(endianess, dinfo['image_name']) + image_hash =3D dinfo['image_hash'] + return (image_url, image_hash) + + def get_kernel_info(self, endianess, wordsize): + minfo =3D self.CPU_INFO[wordsize] + kernel_url =3D self.get_url(endianess, + 'vmlinux-%s' % minfo['kernel_release']) + kernel_hash =3D self.IMAGE_INFO[endianess]['kernel_hash'][wordsize] + return kernel_url, kernel_hash =20 @skipUnless(ssh.SSH_CLIENT_BINARY, 'No SSH client available') @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout= ') @@ -79,8 +108,7 @@ class LinuxSSH(Test): return stdout_lines, stderr_lines =20 def boot_debian_wheezy_image_and_ssh_login(self, endianess, kernel_pat= h): - image_url =3D self.IMAGE_INFO[endianess]['image_url'] - image_hash =3D self.IMAGE_INFO[endianess]['image_hash'] + image_url, image_hash =3D self.get_image_info(endianess) image_path =3D self.fetch_asset(image_url, asset_hash=3Dimage_hash) =20 self.vm.set_machine('malta') @@ -172,7 +200,10 @@ class LinuxSSH(Test): 'md5sum /dev/mtd2ro', '0dfbe8aa4c20b52e1b8bf3cb6cbdf193') =20 - def check_mips_malta(self, endianess, kernel_path, uname_m): + def check_mips_malta(self, uname_m, endianess): + wordsize =3D 64 if '64' in uname_m else 32 + kernel_url, kernel_hash =3D self.get_kernel_info(endianess, wordsi= ze) + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) self.boot_debian_wheezy_image_and_ssh_login(endianess, kernel_path) =20 stdout, _ =3D self.ssh_command('uname -a') @@ -188,12 +219,7 @@ class LinuxSSH(Test): :avocado: tags=3Dendian:big :avocado: tags=3Ddevice:pcnet32 """ - kernel_url =3D ('https://people.debian.org/~aurel32/qemu/mips/' - 'vmlinux-3.2.0-4-4kc-malta') - kernel_hash =3D '592e384a4edc16dade52a6cd5c785c637bcbc9ad' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) - - self.check_mips_malta('be', kernel_path, 'mips') + self.check_mips_malta('mips', 'be') =20 def test_mips_malta32el_kernel3_2_0(self): """ @@ -202,12 +228,7 @@ class LinuxSSH(Test): :avocado: tags=3Dendian:little :avocado: tags=3Ddevice:pcnet32 """ - kernel_url =3D ('https://people.debian.org/~aurel32/qemu/mipsel/' - 'vmlinux-3.2.0-4-4kc-malta') - kernel_hash =3D 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) - - self.check_mips_malta('le', kernel_path, 'mips') + self.check_mips_malta('mips', 'le') =20 def test_mips_malta64eb_kernel3_2_0(self): """ @@ -216,11 +237,7 @@ class LinuxSSH(Test): :avocado: tags=3Dendian:big :avocado: tags=3Ddevice:pcnet32 """ - kernel_url =3D ('https://people.debian.org/~aurel32/qemu/mips/' - 'vmlinux-3.2.0-4-5kc-malta') - kernel_hash =3D 'db6eea7de35d36c77d8c165b6bcb222e16eb91db' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) - self.check_mips_malta('be', kernel_path, 'mips64') + self.check_mips_malta('mips64', 'be') =20 def test_mips_malta64el_kernel3_2_0(self): """ @@ -229,8 +246,4 @@ class LinuxSSH(Test): :avocado: tags=3Dendian:little :avocado: tags=3Ddevice:pcnet32 """ - kernel_url =3D ('https://people.debian.org/~aurel32/qemu/mipsel/' - 'vmlinux-3.2.0-4-5kc-malta') - kernel_hash =3D '6a7f77245acf231415a0e8b725d91ed2f3487794' - kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) - self.check_mips_malta('le', kernel_path, 'mips64') + self.check_mips_malta('mips64', 'le') --=20 2.21.0