From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2D477924BD for ; Fri, 5 Apr 2024 15:18:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2657013FFB for ; Fri, 5 Apr 2024 15:18:22 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 5 Apr 2024 15:18:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6B788465BA for ; Fri, 5 Apr 2024 15:18:20 +0200 (CEST) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Fri, 5 Apr 2024 15:17:59 +0200 Message-ID: <20240405131806.388178-7-s.lendl@proxmox.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240405131806.388178-1-s.lendl@proxmox.com> References: <20240405131806.388178-1-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v3 pve-network 06/12] dns: dnsmasq: extract function to systemctl command. X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2024 13:18:53 -0000 systemctl_service() is a wrapper around PVE::Tools::run_command to allow mocking the systemctl interactions in tests. Signed-off-by: Stefan Lendl Reviewed-by: Max Carrara Tested-by: Max Carrara Reviewed-by: Stefan Hanreich Tested-by: Stefan Hanreich --- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index 2844943..f9f1c39 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -101,7 +101,7 @@ sub add_ip_mapping { } my $service_name = "dnsmasq\@$dhcpid"; - PVE::Tools::run_command(['systemctl', 'reload', $service_name]) if $reload; + systemctl_service('reload', $service_name) if $reload; #update lease as ip could still be associated to an old removed mac my $bus = Net::DBus->system(); @@ -163,6 +163,12 @@ sub configure_vnet { ); } +sub systemctl_service { + my ($action, $service) = @_; + + PVE::Tools::run_command(['systemctl', $action, $service]); +} + sub before_configure { my ($class, $dhcpid) = @_; @@ -250,9 +256,9 @@ sub after_configure { my $service_name = "dnsmasq\@$dhcpid"; - PVE::Tools::run_command(['systemctl', 'reload', 'dbus']); - PVE::Tools::run_command(['systemctl', 'enable', $service_name]); - PVE::Tools::run_command(['systemctl', 'restart', $service_name]); + systemctl_service('reload', 'dbus'); + systemctl_service('enable', $service_name); + systemctl_service('restart', $service_name); } sub before_regenerate { @@ -260,8 +266,8 @@ sub before_regenerate { return if !assert_dnsmasq_installed($noerr); - PVE::Tools::run_command(['systemctl', 'stop', "dnsmasq@*"]); - PVE::Tools::run_command(['systemctl', 'disable', 'dnsmasq@']); + systemctl_service('stop', "dnsmasq@*"); + systemctl_service('disable', 'dnsmasq@'); } sub after_regenerate { -- 2.44.0