From patchwork Wed Mar 11 17:20:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 11432359 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF59B1392 for ; Wed, 11 Mar 2020 17:22:28 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 764CD20736 for ; Wed, 11 Mar 2020 17:22:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="fB9RA6TZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 764CD20736 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC524-0002z1-RU; Wed, 11 Mar 2020 17:20:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jC523-0002yw-Fe for xen-devel@lists.xenproject.org; Wed, 11 Mar 2020 17:20:35 +0000 X-Inumbo-ID: 9d7c516a-63bc-11ea-b027-12813bfff9fa Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9d7c516a-63bc-11ea-b027-12813bfff9fa; Wed, 11 Mar 2020 17:20:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1583947234; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/BjKoiOIXnCoIb8GyzLHLIBG3RMyNlkDODrdMAM2RvA=; b=fB9RA6TZASZQ1g00lBnTlch1Dnh+hLeoSRvhUJizC8bHQlolgx4azN6f MdX//w2Mhpm+EREl15O0lLbWGQDiD6AavV/sI7Zkf/hUPvglXvreLfQxY iQvYOc2HsU2ct57geS04PEgQwkz5iTxw8I58TKmLM6UiPDq32YSvVAS4M c=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=roger.pau@citrix.com; spf=Pass smtp.mailfrom=roger.pau@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of roger.pau@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa2.hc3370-68.iphmx.com: domain of roger.pau@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="roger.pau@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa2.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa2.hc3370-68.iphmx.com; envelope-from="roger.pau@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: SrKN8Y1KjoHEREBvJ9hmkGKFH7+0qpETGtNRhnlPEKPI+HVEaL+rZnPgOr0X57UAkVYJ04P54B tKCG3rVh2fb40BXpn2qSJQJh1SOED0gc8qDV54xJpuhhCHAa89vS7d4+Y1H8hqVVEd6ZZwe0j9 Y1XbWGV0R4S2E/xL/1vqCaAvdN2bPjvzx+tH7A4xPSRbRLFaEawj1aZjS+jsnuh5yWIx/Z7x21 P6dJJAMk0WMY1JXjGoV2j+lsnLN4Uzre2XoGT9STzY7/wy8BuB9ooqwTBH8DWaBkN5FYaRMmzB GVE= X-SBRS: 2.7 X-MesageID: 13794323 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,541,1574139600"; d="scan'208";a="13794323" From: Roger Pau Monne To: Date: Wed, 11 Mar 2020 18:20:05 +0100 Message-ID: <20200311172010.7777-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH OSSTEST v5 1/5] host: introduce modify_host X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: ian.jackson@eu.citrix.com, Roger Pau Monne Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Abstract the set_property checks and DB call into a helper. No functional change. Signed-off-by: Roger Pau Monné Reviewed-by: Ian Jackson --- Requested on IRC: 17:09:30 Diziet Also if it were me I would put the modify_host refactoring in its own nfc patch, but I won't insist on that... --- changes since v4: - New in this version. --- Osstest/HostDB/Executive.pm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Osstest/HostDB/Executive.pm b/Osstest/HostDB/Executive.pm index 7ffca6c4..d402bcac 100644 --- a/Osstest/HostDB/Executive.pm +++ b/Osstest/HostDB/Executive.pm @@ -51,6 +51,16 @@ END } } +sub modify_host ($$$) { + my ($hd, $ho, $query) = @_; + my $blessing = intended_blessing(); + + die "Attempting to modify host with intended blessing $blessing != real" + if $blessing ne "real"; + + db_retry($dbh_tests, [qw(resources)], $query); +} + sub set_property($$$$) { my ($hd, $ho, $prop, $val) = @_; my $rmq = $dbh_tests->prepare(<execute($ho->{Name}, $prop); if (length $val) { $addq->execute($ho->{Name}, $prop, $val);