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 193CA9C62F for ; Wed, 22 Nov 2023 13:28:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE22617C82 for ; Wed, 22 Nov 2023 13:28:08 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Wed, 22 Nov 2023 13:28:08 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 50C5C2C0C7B; Wed, 22 Nov 2023 13:28:08 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Wed, 22 Nov 2023 13:28:08 +0100 Message-Id: <20231122122808.214325-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.435 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network] validation: add support for arrays to change tracking 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: Wed, 22 Nov 2023 12:28:39 -0000 This is needed so dhcp-ranges are properly displayed as changed in the web UI. Also took the chance to properly indent the encode_value function with our indentation scheme. Signed-off-by: Stefan Hanreich --- src/PVE/Network/SDN.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm index c306527..3af09b5 100644 --- a/src/PVE/Network/SDN.pm +++ b/src/PVE/Network/SDN.pm @@ -241,12 +241,14 @@ sub generate_dhcp_config { sub encode_value { my ($type, $key, $value) = @_; - if ($key eq 'nodes' || $key eq 'exitnodes') { - if(ref($value) eq 'HASH') { - return join(',', sort keys(%$value)); - } else { - return $value; - } + if ($key eq 'nodes' || $key eq 'exitnodes' || $key eq 'dhcp-range') { + if (ref($value) eq 'HASH') { + return join(',', sort keys(%$value)); + } elsif (ref($value) eq 'ARRAY') { + return join(',', sort @$value); + } else { + return $value; + } } return $value; -- 2.39.2