From c2f77297f0557f3a8f59680d5e5b62bfc89d5422 Mon Sep 17 00:00:00 2001 From: up-n-atom Date: Thu, 17 Aug 2023 18:08:29 -0400 Subject: [PATCH] Reduce duplicate code Clean up DNS interface logic --- xmo-cli.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/xmo-cli.py b/xmo-cli.py index 8ab5123..6b1b971 100755 --- a/xmo-cli.py +++ b/xmo-cli.py @@ -95,16 +95,13 @@ async def set_dns_servers(client: SagemcomClient, dns_servers: tuple[IPv4Address for i, dns_server in enumerate(dns_servers, start=1): try: await client.set_value_by_xpath(f"Device/DNS/Relay/Forwardings/Forwarding[@uid={i}]/DNSServer", dns_server) + iface = 'Device/IP/Interfaces/Interface[IP_DATA]' if dns_server.is_private: - await client.set_value_by_xpath( - f"Device/DNS/Relay/Forwardings/Forwarding[@uid={i}]/Interface", - 'Device/IP/Interfaces/Interface[IP_BR_LAN]' - ) - elif dns_server.is_global: - await client.set_value_by_xpath( - f"Device/DNS/Relay/Forwardings/Forwarding[@uid={i}]/Interface", - 'Device/IP/Interfaces/Interface[IP_DATA]' - ) + iface = 'Device/IP/Interfaces/Interface[IP_BR_LAN] + await client.set_value_by_xpath( + f"Device/DNS/Relay/Forwardings/Forwarding[@uid={i}]/Interface", + iface + ) except Exception as e: click.echo(e, err=True) break