From 1316b470886c77e52905cdeabdb5aedd761a1555 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 19 Feb 2025 09:55:37 -0600 Subject: [PATCH 1/2] T7182: normalize formatting --- src/etc/netplug/vyos-netplug-dhcp-client | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/etc/netplug/vyos-netplug-dhcp-client b/src/etc/netplug/vyos-netplug-dhcp-client index 83fed70f0e..8afc9fda95 100755 --- a/src/etc/netplug/vyos-netplug-dhcp-client +++ b/src/etc/netplug/vyos-netplug-dhcp-client @@ -26,14 +26,15 @@ from vyos.ifconfig import Section from vyos.utils.boot import boot_configuration_complete from vyos.utils.commit import commit_in_progress from vyos import airbag + airbag.enable() if len(sys.argv) < 3: - airbag.noteworthy("Must specify both interface and link status!") + airbag.noteworthy('Must specify both interface and link status!') sys.exit(1) if not boot_configuration_complete(): - airbag.noteworthy("System bootup not yet finished...") + airbag.noteworthy('System bootup not yet finished...') sys.exit(1) interface = sys.argv[1] @@ -50,5 +51,7 @@ in_out = sys.argv[2] config = ConfigTreeQuery() interface_path = ['interfaces'] + Section.get_config_path(interface).split() -_, interface_config = get_interface_dict(config, interface_path[:-1], ifname=interface, with_pki=True) +_, interface_config = get_interface_dict( + config, interface_path[:-1], ifname=interface, with_pki=True +) Interface(interface).update(interface_config) From 4a049c36bbc35564950b199daa11191d4093fb0d Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 19 Feb 2025 09:56:13 -0600 Subject: [PATCH 2/2] T7182: use Config instead of ConfigTreeQuery for get_interface_dict --- src/etc/netplug/vyos-netplug-dhcp-client | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/netplug/vyos-netplug-dhcp-client b/src/etc/netplug/vyos-netplug-dhcp-client index 8afc9fda95..4cc824afdb 100755 --- a/src/etc/netplug/vyos-netplug-dhcp-client +++ b/src/etc/netplug/vyos-netplug-dhcp-client @@ -19,7 +19,7 @@ import sys from time import sleep -from vyos.configquery import ConfigTreeQuery +from vyos.config import Config from vyos.configdict import get_interface_dict from vyos.ifconfig import Interface from vyos.ifconfig import Section @@ -48,7 +48,7 @@ while commit_in_progress(): sleep(1) in_out = sys.argv[2] -config = ConfigTreeQuery() +config = Config() interface_path = ['interfaces'] + Section.get_config_path(interface).split() _, interface_config = get_interface_dict(