|
 |
04140e |
From 3333cb8bfa77fb208bb4f6f62dce770aa235bc2b Mon Sep 17 00:00:00 2001
|
|
|
04140e |
From: Fernando Fernandez Mancera <ffmancera@riseup.net>
|
|
|
04140e |
Date: Mon, 6 Jul 2020 13:45:19 +0200
|
|
|
04140e |
Subject: [PATCH] dns: fix remove dns config
|
|
|
04140e |
|
|
|
04140e |
This patch is fixing the support of removing the dns config.
|
|
|
04140e |
|
|
|
04140e |
Ref: https://bugzilla.redhat.com/1850698
|
|
|
04140e |
|
|
|
04140e |
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
|
|
|
04140e |
---
|
|
|
04140e |
libnmstate/dns.py | 8 +++++---
|
|
|
04140e |
tests/integration/dns_test.py | 4 +++-
|
|
|
04140e |
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
04140e |
|
|
|
04140e |
diff --git a/libnmstate/dns.py b/libnmstate/dns.py
|
|
|
04140e |
index 1ec0d81..e41220f 100644
|
|
|
04140e |
--- a/libnmstate/dns.py
|
|
|
04140e |
+++ b/libnmstate/dns.py
|
|
|
04140e |
@@ -181,9 +181,11 @@ class DnsState:
|
|
|
04140e |
|
|
|
04140e |
def verify(self, cur_dns_state):
|
|
|
04140e |
cur_dns = DnsState(des_dns_state=None, cur_dns_state=cur_dns_state,)
|
|
|
04140e |
- if self.config.get(DNS.SERVER) != cur_dns.config.get(
|
|
|
04140e |
- DNS.SERVER
|
|
|
04140e |
- ) or self.config.get(DNS.SEARCH) != cur_dns.config.get(DNS.SEARCH):
|
|
|
04140e |
+ if self.config.get(DNS.SERVER, []) != cur_dns.config.get(
|
|
|
04140e |
+ DNS.SERVER, []
|
|
|
04140e |
+ ) or self.config.get(DNS.SEARCH, []) != cur_dns.config.get(
|
|
|
04140e |
+ DNS.SEARCH, []
|
|
|
04140e |
+ ):
|
|
|
04140e |
raise NmstateVerificationError(
|
|
|
04140e |
format_desired_current_state_diff(
|
|
|
04140e |
{DNS.KEY: self.config}, {DNS.KEY: cur_dns.config},
|
|
|
04140e |
--
|
|
|
04140e |
2.25.4
|
|
|
04140e |
|