From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 4/8] refactor(dnsmasq): extract update_lease function
Date: Wed, 3 Jan 2024 16:37:51 +0100 [thread overview]
Message-ID: <20240103153753.407079-7-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240103153753.407079-3-s.lendl@proxmox.com>
that calls the dbus service.
can be mocked.
Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
---
src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
index 5a227ba..c14f5d7 100644
--- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
+++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
@@ -38,6 +38,17 @@ sub ethers_file {
return "$DNSMASQ_CONFIG_ROOT/$dhcpid/ethers";
}
+sub update_lease {
+ my ($dhcpid, $ip4, $mac) = @_;
+ #update lease as ip could still be associated to an old removed mac
+ my $bus = Net::DBus->system();
+ my $dnsmasq = $bus->get_service("uk.org.thekelleys.dnsmasq.$dhcpid");
+ my $manager = $dnsmasq->get_object("/uk/org/thekelleys/dnsmasq","uk.org.thekelleys.dnsmasq.$dhcpid");
+
+ my @hostname = unpack("C*", "*");
+ $manager->AddDhcpLease($ip4, $mac, \@hostname, undef, 0, 0, 0) if $ip4;
+}
+
sub add_ip_mapping {
my ($class, $dhcpid, $macdb, $mac, $ip4, $ip6) = @_;
@@ -107,16 +118,7 @@ sub add_ip_mapping {
my $service_name = "dnsmasq\@$dhcpid";
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();
- my $dnsmasq = $bus->get_service("uk.org.thekelleys.dnsmasq.$dhcpid");
- my $manager = $dnsmasq->get_object("/uk/org/thekelleys/dnsmasq","uk.org.thekelleys.dnsmasq.$dhcpid");
-
- my @hostname = unpack("C*", "*");
- $manager->AddDhcpLease($ip4, $mac, \@hostname, undef, 0, 0, 0) if $ip4;
-# $manager->AddDhcpLease($ip6, $mac, \@hostname, undef, 0, 0, 0) if $ip6;
-
+ update_lease($dhcpid, $ip4, $mac);
}
sub configure_subnet {
--
2.42.0
next prev parent reply other threads:[~2024-01-03 15:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-03 15:37 [pve-devel] [PATCH pve-network 0/8] SDN Vnet blackbox testing Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 1/8] refactor(sdn): extract cfs_read_file(datacenter.cfg) Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 2/8] refactor(dnsmasq): extract systemctl_service function Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 3/8] refactor(dnsmasq): extract ethers_file function Stefan Lendl
2024-01-03 15:37 ` Stefan Lendl [this message]
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 5/8] refactor(controllers): extract read_etc_network_interfaces Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 6/8] refactor(evpn): extract read_local_frr_config Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 7/8] refactor(api): extract create_etc_interfaces_sdn_dir Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 8/8] test(vnets): add test_vnets_blackbox Stefan Lendl
2024-03-18 12:41 ` Max Carrara
2024-03-18 14:14 ` Stefan Lendl
2024-03-18 15:00 ` Max Carrara
2024-03-18 12:41 ` [pve-devel] [PATCH pve-network 0/8] SDN Vnet blackbox testing Max Carrara
2024-04-02 16:10 ` Stefan Lendl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240103153753.407079-7-s.lendl@proxmox.com \
--to=s.lendl@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox