From 4af82f00036a079ec0d5e150457063e386af7788 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 27 Jun 2020 15:25:13 +0200 Subject: xml: T2656: do not flatten dict by default --- python/vyos/xml/__init__.py | 4 ++-- src/conf_mode/interfaces-macsec.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/vyos/xml/__init__.py b/python/vyos/xml/__init__.py index bda8c96c5..6e0e73b1b 100644 --- a/python/vyos/xml/__init__.py +++ b/python/vyos/xml/__init__.py @@ -9,7 +9,7 @@ # See the GNU Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License along with this library; -# if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA from vyos.xml import definition @@ -35,7 +35,7 @@ def load_configuration(cache=[]): return xml -def defaults(lpath, flat=True): +def defaults(lpath, flat=False): return load_configuration().defaults(lpath, flat) diff --git a/src/conf_mode/interfaces-macsec.py b/src/conf_mode/interfaces-macsec.py index bd3a15914..6f4e90169 100755 --- a/src/conf_mode/interfaces-macsec.py +++ b/src/conf_mode/interfaces-macsec.py @@ -48,7 +48,7 @@ def get_config(): # retrieve interface default values base = ['interfaces', 'macsec'] - default_values = defaults(base, flat=False) + default_values = defaults(base) ifname = os.environ['VYOS_TAGNODE_VALUE'] base = base + [ifname] -- cgit v1.2.3