From nobody Fri Dec 19 20:34:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563371386; cv=none; d=zoho.com; s=zohoarc; b=WGySkiolnX1M6o7yTPI9MlZl0ZtawBm5zOId8bO2ML2lyK1h+GEI1OxngxVg74iVN3arbgqpOUMUyX4+aKQNPXrbHxoffTazZ4Qjwp671AvzfiCPkgrN25oTOUNGX0M9fq9uMs0rmMxMjLz6FdLbdYLQc6/tSAeVH5+0BiH5WTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563371386; h=Content-Type:Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=Nom1h6Z2pGAWRbWzoMPNBX73XosPbtXxPvM7WlR1sY8=; b=jmWwO1S3CzCO7Plwsbs1duyLvrewmSI6fQ+NfCpWxojbwZCTr5SKMD3bvLzK4vH54sjj3t0iejsQmsv10oIxQ7pDYjjYItVnC99AsLtsZnejaiPgOtJeTG8UU+wjIMb0nzccOICERxVAZNhP6XLWhq60tLwX6w8voy7fwasH+yY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1563371386493805.2631806284419; Wed, 17 Jul 2019 06:49:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9ED8E30833A5; Wed, 17 Jul 2019 13:49:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3ADCD600C8; Wed, 17 Jul 2019 13:49:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E5E574EA31; Wed, 17 Jul 2019 13:49:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6HDnffV025426 for ; Wed, 17 Jul 2019 09:49:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 86B3B60920; Wed, 17 Jul 2019 13:49:41 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10A7460D7C for ; Wed, 17 Jul 2019 13:49:40 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 17 Jul 2019 15:49:15 +0200 Message-Id: <20190717134929.10540-7-abologna@redhat.com> In-Reply-To: <20190717134929.10540-1-abologna@redhat.com> References: <20190717134929.10540-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH v2 06/20] quayadmin: Build endpoint, params and payload separately X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 17 Jul 2019 13:49:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Instead of building all arguments for a request at the same time as the request itself is prepared, build them beforehand and then pass them to the corresponding function. This makes the code more readable, especially when complex params or long endpoints are involved. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/quayadmin | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/guests/quayadmin b/guests/quayadmin index 6eeacd1..7ddf7a4 100755 --- a/guests/quayadmin +++ b/guests/quayadmin @@ -66,18 +66,26 @@ def has_error(quiet, res, expected, message): =20 =20 def run_list_repos(args): - res =3D get("/repository", params=3D{"namespace": args.namespace}) + endpoint =3D "/repository" + params =3D { + "namespace": args.namespace, + } + + res =3D get(endpoint, params=3Dparams) =20 if has_error(args.quiet, res, 200, "Cannot list repositories"): return 1 =20 info =3D res.json() + for repo in info["repositories"]: print ("{}".format(repo["name"])) =20 =20 def run_show_repo(args): - res =3D get("/repository/{}/{}".format(args.namespace, args.repo)) + endpoint =3D "/repository/{}/{}".format(args.namespace, args.repo) + + res =3D get(endpoint) =20 if has_error(args.quiet, res, 200, "Cannot query repository {}/{}" .format(args.namespace, args.repo)): @@ -95,13 +103,16 @@ def run_show_repo(args): =20 =20 def run_create_repo(args): - res =3D post("/repository", payload=3D{ + endpoint =3D "/repository" + payload =3D { "repo_kind": "image", "namespace": args.namespace, "visibility": "public", "repository": args.repo, "description": args.desc, - }) + } + + res =3D post(endpoint, payload=3Dpayload) =20 if has_error(args.quiet, res, 201, "Cannot create repository {}/{}" .format(args.namespace, args.repo)): @@ -114,7 +125,9 @@ def run_create_repo(args): =20 =20 def run_delete_repo(args): - res =3D delete("/repository/{}/{}".format(args.namespace, args.repo)) + endpoint =3D "/repository/{}/{}".format(args.namespace, args.repo) + + res =3D delete(endpoint) =20 if has_error(args.quiet, res, 204, "Cannot delete repository {}/{}" .format(args.namespace, args.repo)): --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list