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

1 files changed, 30 insertions, 34 deletions

diff --git a/data/config-mode-dependencies/vyos-1x.json b/data/config-mode-dependencies/vyos-1x.json
index 4a1bc4011..4fd94d895 100644
--- a/data/config-mode-dependencies/vyos-1x.json
+++ b/data/config-mode-dependencies/vyos-1x.json
@@ -1,56 +1,52 @@
 {
-    "conntrack": {
-        "conntrack_sync": ["conntrack_sync"]
+    "system_conntrack": {
+        "conntrack_sync": ["service_conntrack-sync"]
     },
     "firewall": {
-        "conntrack": ["conntrack"],
-        "conntrack_sync": ["conntrack_sync"],
-        "group_resync": ["conntrack", "nat", "policy-route"]
+        "conntrack": ["system_conntrack"],
+        "group_resync": ["system_conntrack", "nat", "policy_route"]
     },
     "interfaces_bonding": {
-        "ethernet": ["interfaces-ethernet"]
+        "ethernet": ["interfaces_ethernet"]
     },
     "interfaces_bridge": {
-        "vxlan": ["interfaces-vxlan"]
+        "vxlan": ["interfaces_vxlan"]
     },
     "load_balancing_wan": {
-        "conntrack": ["conntrack"],
-        "conntrack_sync": ["conntrack_sync"]
+        "conntrack": ["system_conntrack"]
     },
     "nat": {
-        "conntrack": ["conntrack"],
-        "conntrack_sync": ["conntrack_sync"]
+        "conntrack": ["system_conntrack"]
     },
     "nat66": {
-        "conntrack": ["conntrack"],
-        "conntrack_sync": ["conntrack_sync"]
+        "conntrack": ["system_conntrack"]
     },
     "pki": {
-        "ethernet": ["interfaces-ethernet"],
-        "openvpn": ["interfaces-openvpn"],
-        "https": ["https"],
+        "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"]
     }
 }