From c9eaafd9f808aba8d29be73054e11d37577e539a Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 30 Dec 2023 23:25:20 +0100
Subject: T5474: establish common file name pattern for XML conf mode commands

We will use _ as CLI level divider. The XML definition filename and also
the Python helper should match the CLI node.

Example:
set interfaces ethernet -> interfaces_ethernet.xml.in
set interfaces bond -> interfaces_bond.xml.in
set service dhcp-server -> service_dhcp-server-xml.in

(cherry picked from commit 4ef110fd2c501b718344c72d495ad7e16d2bd465)
---
 data/config-mode-dependencies/vyos-1x.json | 64 +++++++++++++++---------------
 1 file changed, 33 insertions(+), 31 deletions(-)

(limited to 'data/config-mode-dependencies')

diff --git a/data/config-mode-dependencies/vyos-1x.json b/data/config-mode-dependencies/vyos-1x.json
index b9dd22f5a..50473a6a1 100644
--- a/data/config-mode-dependencies/vyos-1x.json
+++ b/data/config-mode-dependencies/vyos-1x.json
@@ -1,37 +1,39 @@
 {
-  "firewall": {"group_resync": ["nat", "policy-route"]},
+  "firewall": {
+    "group_resync": ["nat", "policy_route"]
+  },
   "interfaces_bonding": {
-           "ethernet": ["interfaces-ethernet"]
-         },
+    "ethernet": ["interfaces_ethernet"]
+  },
   "interfaces_bridge": {
-           "vxlan": ["interfaces-vxlan"]
-         },
+    "vxlan": ["interfaces_vxlan"]
+  },
   "pki": {
-           "ethernet": ["interfaces-ethernet"],
-           "openvpn": ["interfaces-openvpn"],
-           "https": ["https"],
-           "ipsec": ["vpn_ipsec"],
-           "openconnect": ["vpn_openconnect"],
-           "sstp": ["vpn_sstp"]
-         },
+    "ethernet": ["interfaces_ethernet"],
+    "openvpn": ["interfaces_openvpn"],
+    "https": ["service_https"],
+    "ipsec": ["vpn_ipsec"],
+    "openconnect": ["vpn_openconnect"],
+    "sstp": ["vpn_sstp"]
+  },
   "qos": {
-           "bonding": ["interfaces-bonding"],
-           "bridge": ["interfaces-bridge"],
-           "dummy": ["interfaces-dummy"],
-           "ethernet": ["interfaces-ethernet"],
-           "geneve": ["interfaces-geneve"],
-           "input": ["interfaces-input"],
-           "l2tpv3": ["interfaces-l2tpv3"],
-           "loopback": ["interfaces-loopback"],
-           "macsec": ["interfaces-macsec"],
-           "openvpn": ["interfaces-openvpn"],
-           "pppoe": ["interfaces-pppoe"],
-           "pseudo-ethernet": ["interfaces-pseudo-ethernet"],
-           "tunnel": ["interfaces-tunnel"],
-           "vti": ["interfaces-vti"],
-           "vxlan": ["interfaces-vxlan"],
-           "wireguard": ["interfaces-wireguard"],
-           "wireless": ["interfaces-wireless"],
-           "wwan": ["interfaces-wwan"]
-         }
+    "bonding": ["interfaces_bonding"],
+    "bridge": ["interfaces_bridge"],
+    "dummy": ["interfaces_dummy"],
+    "ethernet": ["interfaces_ethernet"],
+    "geneve": ["interfaces_geneve"],
+    "input": ["interfaces_input"],
+    "l2tpv3": ["interfaces_l2tpv3"],
+    "loopback": ["interfaces_loopback"],
+    "macsec": ["interfaces_macsec"],
+    "openvpn": ["interfaces_openvpn"],
+    "pppoe": ["interfaces_pppoe"],
+    "pseudo-ethernet": ["interfaces_pseudo-ethernet"],
+    "tunnel": ["interfaces_tunnel"],
+    "vti": ["interfaces_vti"],
+    "vxlan": ["interfaces_vxlan"],
+    "wireguard": ["interfaces_wireguard"],
+    "wireless": ["interfaces_wireless"],
+    "wwan": ["interfaces_wwan"]
+  }
 }
-- 
cgit v1.2.3