Change Details

When looking at the XML definitions in `vyos-1x:interface-definitions/` we see a lot of mixed patterns. ``` -rw-r--r-- 1 cpo gr_linux 1738 Aug 6 19:32 bcast-relay.xml.in -rw-r--r-- 1 cpo gr_linux 17522 Aug 6 19:32 container.xml.in -rw-r--r-- 1 cpo gr_linux 2633 Aug 6 19:32 cron.xml.in -rw-r--r-- 1 cpo gr_linux 5166 Aug 6 19:32 dhcp-relay.xml.in -rw-r--r-- 1 cpo gr_linux 22988 Aug 6 19:32 dhcp-server.xml.in ... -rw-r--r-- 1 cpo gr_linux 2654 Aug 6 19:32 system-lcd.xml.in -rw-r--r-- 1 cpo gr_linux 1040 Aug 6 19:32 system-login-banner.xml.in ``` Same applies for the conf_mode scripts in `vyos-1x:src/conf_mode/` ``` -rwxr-xr-x 1 cpo gr_linux 31050 Aug 11 20:53 interfaces-openvpn.py -rwxr-xr-x 1 cpo gr_linux 4498 Aug 6 19:32 interfaces-pppoe.py -rwxr-xr-x 1 cpo gr_linux 3447 Aug 6 19:32 interfaces-pseudo-ethernet.py -rwxr-xr-x 1 cpo gr_linux 4920 Aug 6 19:32 interfaces-sstpc.py -rwxr-xr-x 1 cpo gr_linux 9665 Aug 11 20:53 interfaces-tunnel.py -rwxr-xr-x 1 cpo gr_linux 3673 Aug 6 19:32 interfaces-virtual-ethernet.py -rwxr-xr-x 1 cpo gr_linux 1797 Aug 6 19:32 interfaces-vti.py ... -rwxr-xr-x 1 cpo gr_linux 2771 Aug 11 20:53 service_config_sync.py -rwxr-xr-x 1 cpo gr_linux 4191 Aug 11 20:53 service_console-server.py -rwxr-xr-x 1 cpo gr_linux 2544 Aug 6 19:32 service_event_handler.py -rwxr-xr-x 1 cpo gr_linux 3461 Aug 11 20:53 service_ids_fastnetmon.py -rwxr-xr-x 1 cpo gr_linux 7038 Aug 6 19:32 service_ipoe-server.py -rwxr-xr-x 1 cpo gr_linux 4150 Aug 6 19:32 service_mdns-repeater.py -rwxr-xr-x 1 cpo gr_linux 8008 Aug 11 20:53 service_monitoring_telegraf.py -rwxr-xr-x 1 cpo gr_linux 2748 Aug 11 22:26 service_monitoring_zabbix-agent.py ``` The idea is to make this more clear to the users which file is used for which part of the system. The guideline is as follows and applies to both XML and conf_mode python scripts. The filename should contain the path in the config hirarchy and cofig levels should be separated by `_`. If a service name has a hyphen (`-`) in it, keep it. * `src/conf_mode/dhcp_server.py` -> `src/conf_mode/service_dhcp-server.py` * `src/conf_mode/interfaces-pseudo-ethernet.py` -> `src/conf_mode/interfaces_pseudo-ethernet.py` * `interface-definitions/dhcp-server.xml.in` -> `interface-definitions/service_dhcp-server.xml.in` * `interface-definitions/interfaces-pseudo-ethernet.xml.in` -> `interface-definitions/interfaces_pseudo-ethernet.xml.in` op-mode is not covered by this change!

When looking at the XML definitions in `vyos-1x:interface-definitions/` we see a lot of mixed patterns. ``` -rw-r--r-- 1 vyos vyos 1738 Aug 6 19:32 bcast-relay.xml.in -rw-r--r-- 1 vyos vyos 17522 Aug 6 19:32 container.xml.in -rw-r--r-- 1 vyos vyos 2633 Aug 6 19:32 cron.xml.in -rw-r--r-- 1 vyos vyos 5166 Aug 6 19:32 dhcp-relay.xml.in -rw-r--r-- 1 vyos vyos 22988 Aug 6 19:32 dhcp-server.xml.in -rw-r--r-- 1 vyos vyos 2654 Aug 6 19:32 system-lcd.xml.in -rw-r--r-- 1 vyos vyos 1040 Aug 6 19:32 system-login-banner.xml.in ``` Same applies for the conf_mode scripts in `vyos-1x:src/conf_mode/` ``` -rwxr-xr-x 1 vyos vyos 31050 Aug 11 20:53 interfaces-openvpn.py -rwxr-xr-x 1 vyos vyos 4498 Aug 6 19:32 interfaces-pppoe.py -rwxr-xr-x 1 vyos vyos 3447 Aug 6 19:32 interfaces-pseudo-ethernet.py -rwxr-xr-x 1 vyos vyos 4920 Aug 6 19:32 interfaces-sstpc.py -rwxr-xr-x 1 vyos vyos 9665 Aug 11 20:53 interfaces-tunnel.py -rwxr-xr-x 1 vyos vyos 3673 Aug 6 19:32 interfaces-virtual-ethernet.py -rwxr-xr-x 1 vyos vyos 1797 Aug 6 19:32 interfaces-vti.py -rwxr-xr-x 1 vyos vyos 2771 Aug 11 20:53 service_config_sync.py -rwxr-xr-x 1 vyos vyos 4191 Aug 11 20:53 service_console-server.py -rwxr-xr-x 1 vyos vyos 2544 Aug 6 19:32 service_event_handler.py -rwxr-xr-x 1 vyos vyos 3461 Aug 11 20:53 service_ids_fastnetmon.py -rwxr-xr-x 1 vyos vyos 7038 Aug 6 19:32 service_ipoe-server.py -rwxr-xr-x 1 vyos vyos 4150 Aug 6 19:32 service_mdns-repeater.py -rwxr-xr-x 1 vyos vyos 8008 Aug 11 20:53 service_monitoring_telegraf.py -rwxr-xr-x 1 vyos vyos 2748 Aug 11 22:26 service_monitoring_zabbix-agent.py ``` The idea is to make this more clear to the users which file is used for which part of the system. The guideline is as follows and applies to both XML and conf_mode python scripts. The filename should contain the path in the config hirarchy and cofig levels should be separated by `_`. If a service name has a hyphen (`-`) in it, keep it. * `src/conf_mode/dhcp_server.py` -> `src/conf_mode/service_dhcp-server.py` * `src/conf_mode/interfaces-pseudo-ethernet.py` -> `src/conf_mode/interfaces_pseudo-ethernet.py` * `interface-definitions/dhcp-server.xml.in` -> `interface-definitions/service_dhcp-server.xml.in` * `interface-definitions/interfaces-pseudo-ethernet.xml.in` -> `interface-definitions/interfaces_pseudo-ethernet.xml.in` op-mode is not covered by this change!

When looking at the XML definitions in `vyos-1x:interface-definitions/` we see a lot of mixed patterns. ``` -rw-r--r-- 1 cpo gr_linuxvyos vyos 1738 Aug 6 19:32 bcast-relay.xml.in -rw-r--r-- 1 cpo gr_linuxvyos vyos 17522 Aug 6 19:32 container.xml.in -rw-r--r-- 1 cpo gr_linuxvyos vyos 2633 Aug 6 19:32 cron.xml.in -rw-r--r-- 1 cpo gr_linuxvyos vyos 5166 Aug 6 19:32 dhcp-relay.xml.in -rw-r--r-- 1 cpo gr_linuxvyos vyos 22988 Aug 6 19:32 dhcp-serverr.xml.in -rw-r--r-- 1 vyos vyos 2654 Aug 6 19:32 system-lcd.xml.in ...-rw-r--r-- 1 vyos vyos 1040 Aug 6 19:32 system-login-banner.xml.in -rw-r--r-- 1 cpo gr_linux 2654 Aug 6 19:32 system-lcd.xml.in -rw-r--r-- 1 cpo gr_linux 1040 Aug 6 19:32 system-login-banner.xml.in ``` Same applies for the conf_mode scripts in `vyos-1x:src/conf_mode/` ``` -rwxr-xr-x 1 cpo gr_linuxvyos vyos 31050 Aug 11 20:53 interfaces-openvpn.py -rwxr-xr-x 1 cpo gr_linuxvyos vyos 4498 Aug 6 19:32 interfaces-pppoe.py -rwxr-xr-x 1 cpo gr_linuxvyos vyos 3447 Aug 6 19:32 interfaces-pseudo-ethernet.py -rwxr-xr-x 1 cpo gr_linuxvyos vyos 4920 Aug 6 19:32 interfaces-sstpc.py -rwxr-xr-x 1 cpo gr_linuxvyos vyos 9665 Aug 11 20:53 interfaces-tunnel.py -rwxr-xr-x 1 cpo gr_linuxvyos vyos 3673 Aug 6 19:32 interfaces-virtual-ethernet.py -rwxr-xr-x 1 cpo gr_linuxvyos vyos 1797 Aug 6 19:32 interfaces-vti.py -rwxr-xr-x 1 vyos vyos 2771 Aug 11 20:53 service_config_sync.py ...-rwxr-xr-x 1 vyos vyos 4191 Aug 11 20:53 service_console-server.py -rwxr-xr-x 1 cpo gr_linux 2771vyos vyos 2544 Aug 11 20:53 6 19:32 service_config_syncevent_handler.py -rwxr-xr-x 1 cpo gr_linux 419vyos vyos 3461 Aug 11 20:53 service_console-serverids_fastnetmon.py -rwxr-xr-x 1 cpo gr_linux 2544vyos vyos 7038 Aug 6 19:32 service_event_handleripoe-server.py -rwxr-xr-x 1 cpo gr_linux 3461vyos vyos 4150 Aug 11 20:53 6 19:32 service_ids_fastnetmonmdns-repeater.py -rwxr-xr-x 1 cpo gr_linux 703vyos vyos 8008 Aug 6 19:3211 20:53 service_ipoe-servermonitoring_telegraf.py -rwxr-xr-x 1 cpo gr_linux 4150 Aug 6 19:32 service_mdns-repeater.py -rwxr-xr-x 1 cpo gr_linux 8008 Aug 11 20:53 service_monitoring_telegraf.py -rwxr-xr-x 1 cpo gr_linuxvyos vyos 2748 Aug 11 22:26 service_monitoring_zabbix-agent.py ``` The idea is to make this more clear to the users which file is used for which part of the system. The guideline is as follows and applies to both XML and conf_mode python scripts. The filename should contain the path in the config hirarchy and cofig levels should be separated by `_`. If a service name has a hyphen (`-`) in it, keep it. * `src/conf_mode/dhcp_server.py` -> `src/conf_mode/service_dhcp-server.py` * `src/conf_mode/interfaces-pseudo-ethernet.py` -> `src/conf_mode/interfaces_pseudo-ethernet.py` * `interface-definitions/dhcp-server.xml.in` -> `interface-definitions/service_dhcp-server.xml.in` * `interface-definitions/interfaces-pseudo-ethernet.xml.in` -> `interface-definitions/interfaces_pseudo-ethernet.xml.in` op-mode is not covered by this change!