diff options
| -rw-r--r-- | Makefile | 21 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | op-mode-definitions/add-system-image.xml.in (renamed from op-mode-definitions/add-system-image.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/clear-ip.xml.in (renamed from op-mode-definitions/clear-ip.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/clear-ipv6.xml.in (renamed from op-mode-definitions/clear-ipv6.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/configure.xml.in (renamed from op-mode-definitions/configure.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/connect.xml.in (renamed from op-mode-definitions/connect.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/date.xml.in (renamed from op-mode-definitions/date.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/dhcp.xml.in (renamed from op-mode-definitions/dhcp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/disconnect.xml.in (renamed from op-mode-definitions/disconnect.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/disks.xml.in (renamed from op-mode-definitions/disks.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/dns-dynamic.xml.in (renamed from op-mode-definitions/dns-dynamic.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/dns-forwarding.xml.in (renamed from op-mode-definitions/dns-forwarding.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/flow-accounting-op.xml.in (renamed from op-mode-definitions/flow-accounting-op.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/force-arp.xml.in (renamed from op-mode-definitions/force-arp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/force-ipv6-nd.xml.in (renamed from op-mode-definitions/force-ipv6-nd.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/force-ipv6-rd.xml.in (renamed from op-mode-definitions/force-ipv6-rd.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/force-mtu-host.xml.in (renamed from op-mode-definitions/force-mtu-host.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/generate-macsec-key.xml.in (renamed from op-mode-definitions/generate-macsec-key.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/generate-ssh-server-key.xml.in (renamed from op-mode-definitions/generate-ssh-server-key.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/igmp-proxy.xml.in (renamed from op-mode-definitions/igmp-proxy.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i | 16 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-adv-router.xml.i | 13 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-detail.xml.i | 9 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-dump.xml.i | 9 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-internal.xml.i | 9 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-linkstate-id.xml.i | 15 | ||||
| -rw-r--r-- | op-mode-definitions/include/ospfv3-self-originated.xml.i | 13 | ||||
| -rw-r--r-- | op-mode-definitions/ipoe-server.xml.in (renamed from op-mode-definitions/ipoe-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/ipv4-route.xml.in (renamed from op-mode-definitions/ipv4-route.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/ipv6-route.xml.in (renamed from op-mode-definitions/ipv6-route.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/l2tp-server.xml.in (renamed from op-mode-definitions/l2tp-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/lldp.xml.in (renamed from op-mode-definitions/lldp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-bandwidth-test.xml.in (renamed from op-mode-definitions/monitor-bandwidth-test.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-bandwidth.xml.in (renamed from op-mode-definitions/monitor-bandwidth.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-log.xml.in (renamed from op-mode-definitions/monitor-log.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-ndp.xml.in (renamed from op-mode-definitions/monitor-ndp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/nat.xml.in (renamed from op-mode-definitions/nat.xml) | 4 | ||||
| -rw-r--r-- | op-mode-definitions/openconnect.xml.in (renamed from op-mode-definitions/openconnect.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/openvpn.xml.in (renamed from op-mode-definitions/openvpn.xml) | 1 | ||||
| -rw-r--r-- | op-mode-definitions/ping.xml.in (renamed from op-mode-definitions/ping.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/poweroff.xml.in (renamed from op-mode-definitions/poweroff.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/pppoe-server.xml.in (renamed from op-mode-definitions/pppoe-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/pptp-server.xml.in (renamed from op-mode-definitions/pptp-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reboot.xml.in (renamed from op-mode-definitions/reboot.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-conntrack.xml.in (renamed from op-mode-definitions/reset-conntrack.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-ip-bgp.xml.in (renamed from op-mode-definitions/reset-ip-bgp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-ip-igmp.xml.in (renamed from op-mode-definitions/reset-ip-igmp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-ip-multicast.xml.in (renamed from op-mode-definitions/reset-ip-multicast.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-ipv6-bgp.xml.in (renamed from op-mode-definitions/reset-ipv6-bgp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-mpls.xml.in (renamed from op-mode-definitions/reset-mpls.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/reset-vpn.xml.in (renamed from op-mode-definitions/reset-vpn.xml) | 26 | ||||
| -rw-r--r-- | op-mode-definitions/restart-frr.xml.in (renamed from op-mode-definitions/restart-frr.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/restart.xml.in (renamed from op-mode-definitions/restart.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-acceleration.xml.in (renamed from op-mode-definitions/show-acceleration.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-bridge.xml.in (renamed from op-mode-definitions/show-bridge.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-configuration.xml.in (renamed from op-mode-definitions/show-configuration.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-console-server.xml.in (renamed from op-mode-definitions/show-console-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-environment.xml.in (renamed from op-mode-definitions/show-environment.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-hardware.xml.in (renamed from op-mode-definitions/show-hardware.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-history.xml.in (renamed from op-mode-definitions/show-history.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-host.xml.in (renamed from op-mode-definitions/show-host.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-bonding.xml.in (renamed from op-mode-definitions/show-interfaces-bonding.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-bridge.xml.in (renamed from op-mode-definitions/show-interfaces-bridge.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-dummy.xml.in (renamed from op-mode-definitions/show-interfaces-dummy.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-ethernet.xml.in (renamed from op-mode-definitions/show-interfaces-ethernet.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-input.xml.in (renamed from op-mode-definitions/show-interfaces-input.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-l2tpv3.xml.in (renamed from op-mode-definitions/show-interfaces-l2tpv3.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-loopback.xml.in (renamed from op-mode-definitions/show-interfaces-loopback.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-macsec.xml.in (renamed from op-mode-definitions/show-interfaces-macsec.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-pppoe.xml.in (renamed from op-mode-definitions/show-interfaces-pppoe.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in (renamed from op-mode-definitions/show-interfaces-pseudo-ethernet.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-tunnel.xml.in (renamed from op-mode-definitions/show-interfaces-tunnel.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-vti.xml.in (renamed from op-mode-definitions/show-interfaces-vti.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-vxlan.xml.in (renamed from op-mode-definitions/show-interfaces-vxlan.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces-wirelessmodem.xml.in (renamed from op-mode-definitions/show-interfaces-wirelessmodem.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-interfaces.xml.in (renamed from op-mode-definitions/show-interfaces.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in (renamed from op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-bgp.xml.in (renamed from op-mode-definitions/show-ip-bgp.xml) | 14 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-igmp.xml.in (renamed from op-mode-definitions/show-ip-igmp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-multicast.xml.in (renamed from op-mode-definitions/show-ip-multicast.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-ospf.xml.in (renamed from op-mode-definitions/show-ip-ospf.xml) | 18 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-pim.xml.in (renamed from op-mode-definitions/show-ip-pim.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-ports.xml.in (renamed from op-mode-definitions/show-ip-ports.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-rip.xml.in (renamed from op-mode-definitions/show-ip-rip.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ip-route.xml.in (renamed from op-mode-definitions/show-ip-route.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-bgp.xml.in (renamed from op-mode-definitions/show-ipv6-bgp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-ospfv3.xml | 777 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-ospfv3.xml.in | 348 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-prefix-list.xml.in (renamed from op-mode-definitions/show-ipv6-prefix-list.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6-route.xml.in (renamed from op-mode-definitions/show-ipv6-route.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ipv6.xml.in (renamed from op-mode-definitions/show-ipv6.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-isis.xml.in (renamed from op-mode-definitions/show-isis.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-license.xml.in (renamed from op-mode-definitions/show-license.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-log.xml.in (renamed from op-mode-definitions/show-log.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-login.xml.in (renamed from op-mode-definitions/show-login.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-monitoring.xml.in (renamed from op-mode-definitions/show-monitoring.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-mpls.xml.in (renamed from op-mode-definitions/show-mpls.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-ntp.xml.in (renamed from op-mode-definitions/show-ntp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-poweroff.xml.in (renamed from op-mode-definitions/show-poweroff.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-protocols-bfd.xml.in (renamed from op-mode-definitions/show-protocols-bfd.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-protocols-static.xml.in (renamed from op-mode-definitions/show-protocols-static.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-raid.xml.in (renamed from op-mode-definitions/show-raid.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-reboot.xml.in (renamed from op-mode-definitions/show-reboot.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-route-map.xml.in (renamed from op-mode-definitions/show-route-map.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-rpki.xml.in (renamed from op-mode-definitions/show-rpki.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-system.xml.in (renamed from op-mode-definitions/show-system.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-table.xml.in (renamed from op-mode-definitions/show-table.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-users.xml.in (renamed from op-mode-definitions/show-users.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-version.xml.in (renamed from op-mode-definitions/show-version.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/show-vpn.xml.in (renamed from op-mode-definitions/show-vpn.xml) | 2 | ||||
| -rw-r--r-- | op-mode-definitions/show-vrf.xml.in (renamed from op-mode-definitions/show-vrf.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/snmp.xml.in (renamed from op-mode-definitions/snmp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/sstp-server.xml.in (renamed from op-mode-definitions/sstp-server.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/telnet.xml.in (renamed from op-mode-definitions/telnet.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/terminal.xml.in (renamed from op-mode-definitions/terminal.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/traceroute.xml.in (renamed from op-mode-definitions/traceroute.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/traffic-dump.xml.in (renamed from op-mode-definitions/traffic-dump.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/vrrp.xml.in (renamed from op-mode-definitions/vrrp.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/wake-on-lan.xml.in (renamed from op-mode-definitions/wake-on-lan.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/webproxy.xml.in (renamed from op-mode-definitions/webproxy.xml) | 0 | ||||
| -rw-r--r-- | op-mode-definitions/wireguard.xml.in (renamed from op-mode-definitions/wireguard.xml) | 1 | ||||
| -rw-r--r-- | op-mode-definitions/wireless.xml.in (renamed from op-mode-definitions/wireless.xml) | 0 | ||||
| -rw-r--r-- | sphinx/source/.gitignore | 1 |
124 files changed, 478 insertions, 824 deletions
@@ -8,8 +8,10 @@ CC := gcc LIBS := -lzmq CFLAGS := -src = $(wildcard interface-definitions/*.xml.in) -obj = $(src:.xml.in=.xml) +config_xml_src = $(wildcard interface-definitions/*.xml.in) +config_xml_obj = $(config_xml_src:.xml.in=.xml) +op_xml_src = $(wildcard op-mode-definitions/*.xml.in) +op_xml_obj = $(op_xml_src:.xml.in=.xml) %.xml: %.xml.in @echo Generating $(BUILD_DIR)/$@ from $< @@ -23,15 +25,12 @@ obj = $(src:.xml.in=.xml) # -nostdinc Do not search the standard system directories for header files # -P Inhibit generation of linemarkers in the output from the # preprocessor - @$(CC) -x c-header -E -undef -nostdinc -P -I$(CURDIR)/interface-definitions -o $(BUILD_DIR)/$@ -c $< - -$(BUILD_DIR): - install -d -m 0755 $(BUILD_DIR)/interface-definitions - install -d -m 0755 $(BUILD_DIR)/op-mode-definitions + mkdir -p $(BUILD_DIR)/$(dir $@) + @$(CC) -x c-header -E -undef -nostdinc -P -I$(CURDIR)/$(dir $<) -o $(BUILD_DIR)/$@ -c $< .PHONY: interface_definitions .ONESHELL: -interface_definitions: $(BUILD_DIR) $(obj) +interface_definitions: $(config_xml_obj) mkdir -p $(TMPL_DIR) find $(BUILD_DIR)/interface-definitions -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1 @@ -62,10 +61,10 @@ interface_definitions: $(BUILD_DIR) $(obj) .PHONY: op_mode_definitions .ONESHELL: -op_mode_definitions: +op_mode_definitions: $(op_xml_obj) mkdir -p $(OP_TMPL_DIR) - find $(CURDIR)/op-mode-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-op-templates {} $(CURDIR)/schema/op-mode-definition.rng $(OP_TMPL_DIR) || exit 1 + find $(BUILD_DIR)/op-mode-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-op-templates {} $(CURDIR)/schema/op-mode-definition.rng $(OP_TMPL_DIR) || exit 1 # XXX: delete top level op mode node.def's that now live in other packages rm -f $(OP_TMPL_DIR)/add/node.def @@ -87,7 +86,7 @@ op_mode_definitions: .PHONY: component_versions .ONESHELL: -component_versions: $(BUILD_DIR) $(obj) +component_versions: interface_definitions $(CURDIR)/scripts/build-component-versions $(BUILD_DIR)/interface-definitions $(DATA_DIR) .PHONY: vyshim diff --git a/debian/control b/debian/control index f7d9fccf6..d0ba72bcf 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,7 @@ Build-Depends: python3-jinja2, python3-psutil, python3-setuptools, + python3-sphinx, python3-xmltodict, quilt, whois diff --git a/op-mode-definitions/add-system-image.xml b/op-mode-definitions/add-system-image.xml.in index 3dc1c67ab..67d8aa3b4 100644 --- a/op-mode-definitions/add-system-image.xml +++ b/op-mode-definitions/add-system-image.xml.in @@ -11,7 +11,7 @@ <properties> <help>Add a new image to the system</help> <completionHelp> - <list>/path/to/vyos-image.iso http://example.com/vyos-image.iso</list> + <list>/path/to/vyos-image.iso "http://example.com/vyos-image.iso"</list> </completionHelp> </properties> <command>sudo ${vyatta_sbindir}/install-image --url "${4}"</command> diff --git a/op-mode-definitions/clear-ip.xml b/op-mode-definitions/clear-ip.xml.in index 3c75ed11b..3c75ed11b 100644 --- a/op-mode-definitions/clear-ip.xml +++ b/op-mode-definitions/clear-ip.xml.in diff --git a/op-mode-definitions/clear-ipv6.xml b/op-mode-definitions/clear-ipv6.xml.in index c062102fc..c062102fc 100644 --- a/op-mode-definitions/clear-ipv6.xml +++ b/op-mode-definitions/clear-ipv6.xml.in diff --git a/op-mode-definitions/configure.xml b/op-mode-definitions/configure.xml.in index 3dd5a0f45..3dd5a0f45 100644 --- a/op-mode-definitions/configure.xml +++ b/op-mode-definitions/configure.xml.in diff --git a/op-mode-definitions/connect.xml b/op-mode-definitions/connect.xml.in index 1ec62949a..1ec62949a 100644 --- a/op-mode-definitions/connect.xml +++ b/op-mode-definitions/connect.xml.in diff --git a/op-mode-definitions/date.xml b/op-mode-definitions/date.xml.in index 15a69dbd9..15a69dbd9 100644 --- a/op-mode-definitions/date.xml +++ b/op-mode-definitions/date.xml.in diff --git a/op-mode-definitions/dhcp.xml b/op-mode-definitions/dhcp.xml.in index 48752cfd5..48752cfd5 100644 --- a/op-mode-definitions/dhcp.xml +++ b/op-mode-definitions/dhcp.xml.in diff --git a/op-mode-definitions/disconnect.xml b/op-mode-definitions/disconnect.xml.in index bf2c37b89..bf2c37b89 100644 --- a/op-mode-definitions/disconnect.xml +++ b/op-mode-definitions/disconnect.xml.in diff --git a/op-mode-definitions/disks.xml b/op-mode-definitions/disks.xml.in index fb39c4f3c..fb39c4f3c 100644 --- a/op-mode-definitions/disks.xml +++ b/op-mode-definitions/disks.xml.in diff --git a/op-mode-definitions/dns-dynamic.xml b/op-mode-definitions/dns-dynamic.xml.in index 9c37874fb..9c37874fb 100644 --- a/op-mode-definitions/dns-dynamic.xml +++ b/op-mode-definitions/dns-dynamic.xml.in diff --git a/op-mode-definitions/dns-forwarding.xml b/op-mode-definitions/dns-forwarding.xml.in index 23de97704..23de97704 100644 --- a/op-mode-definitions/dns-forwarding.xml +++ b/op-mode-definitions/dns-forwarding.xml.in diff --git a/op-mode-definitions/flow-accounting-op.xml b/op-mode-definitions/flow-accounting-op.xml.in index 912805d59..912805d59 100644 --- a/op-mode-definitions/flow-accounting-op.xml +++ b/op-mode-definitions/flow-accounting-op.xml.in diff --git a/op-mode-definitions/force-arp.xml b/op-mode-definitions/force-arp.xml.in index f9f7c7643..f9f7c7643 100644 --- a/op-mode-definitions/force-arp.xml +++ b/op-mode-definitions/force-arp.xml.in diff --git a/op-mode-definitions/force-ipv6-nd.xml b/op-mode-definitions/force-ipv6-nd.xml.in index 49de097f6..49de097f6 100644 --- a/op-mode-definitions/force-ipv6-nd.xml +++ b/op-mode-definitions/force-ipv6-nd.xml.in diff --git a/op-mode-definitions/force-ipv6-rd.xml b/op-mode-definitions/force-ipv6-rd.xml.in index 8c901af25..8c901af25 100644 --- a/op-mode-definitions/force-ipv6-rd.xml +++ b/op-mode-definitions/force-ipv6-rd.xml.in diff --git a/op-mode-definitions/force-mtu-host.xml b/op-mode-definitions/force-mtu-host.xml.in index b92179f11..b92179f11 100644 --- a/op-mode-definitions/force-mtu-host.xml +++ b/op-mode-definitions/force-mtu-host.xml.in diff --git a/op-mode-definitions/generate-macsec-key.xml b/op-mode-definitions/generate-macsec-key.xml.in index 40d2b9061..40d2b9061 100644 --- a/op-mode-definitions/generate-macsec-key.xml +++ b/op-mode-definitions/generate-macsec-key.xml.in diff --git a/op-mode-definitions/generate-ssh-server-key.xml b/op-mode-definitions/generate-ssh-server-key.xml.in index a6ebf1b78..a6ebf1b78 100644 --- a/op-mode-definitions/generate-ssh-server-key.xml +++ b/op-mode-definitions/generate-ssh-server-key.xml.in diff --git a/op-mode-definitions/igmp-proxy.xml b/op-mode-definitions/igmp-proxy.xml.in index 8533138d7..8533138d7 100644 --- a/op-mode-definitions/igmp-proxy.xml +++ b/op-mode-definitions/igmp-proxy.xml.in diff --git a/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i b/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i new file mode 100644 index 000000000..b6a64c52a --- /dev/null +++ b/op-mode-definitions/include/ospfv3-adv-router-id-node-tag.xml.i @@ -0,0 +1,16 @@ +<!-- included start from ospfv3-adv-router-id-node-tag.xml.i --> +<node name="node.tag"> + <properties> + <help>Search by Advertising Router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 database * $6 $7"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-adv-router.xml.i b/op-mode-definitions/include/ospfv3-adv-router.xml.i new file mode 100644 index 000000000..6330c0a72 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-adv-router.xml.i @@ -0,0 +1,13 @@ +<!-- included start from ospfv3-adv-router.xml.i --> +<tagNode name="adv-router"> + <properties> + <help>Search by Advertising Router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-linkstate-id.xml.i> + </children> +</tagNode> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-detail.xml.i b/op-mode-definitions/include/ospfv3-detail.xml.i new file mode 100644 index 000000000..76096fbc8 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-detail.xml.i @@ -0,0 +1,9 @@ +<!-- included start from ospfv3-detail.xml.i --> +<node name="detail"> + <properties> + <help>Show detailed information</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-dump.xml.i b/op-mode-definitions/include/ospfv3-dump.xml.i new file mode 100644 index 000000000..4271aec53 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-dump.xml.i @@ -0,0 +1,9 @@ +<!-- included start from ospfv3-dump.xml.i --> +<node name="dump"> + <properties> + <help>Show dump of LSAs</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-internal.xml.i b/op-mode-definitions/include/ospfv3-internal.xml.i new file mode 100644 index 000000000..8b45e86c1 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-internal.xml.i @@ -0,0 +1,9 @@ +<!-- included start from ospfv3-internal.xml.i --> +<node name="internal"> + <properties> + <help>Show internal LSA information</help> + </properties> + <!-- FRR uses ospf6 where we use ospfv3, thus alter the command --> + <command>vtysh -c "show ipv6 ospf6 ${@:4}"</command> +</node> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-linkstate-id.xml.i b/op-mode-definitions/include/ospfv3-linkstate-id.xml.i new file mode 100644 index 000000000..eab5916f1 --- /dev/null +++ b/op-mode-definitions/include/ospfv3-linkstate-id.xml.i @@ -0,0 +1,15 @@ +<!-- included start from ospfv3-linkstate-id.xml.i --> +<tagNode name="linkstate-id"> + <properties> + <help>Search by Link state ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> +</tagNode> +<!-- included end --> diff --git a/op-mode-definitions/include/ospfv3-self-originated.xml.i b/op-mode-definitions/include/ospfv3-self-originated.xml.i new file mode 100644 index 000000000..76054757b --- /dev/null +++ b/op-mode-definitions/include/ospfv3-self-originated.xml.i @@ -0,0 +1,13 @@ +<!-- included start from ospfv3-self-originated.xml.i --> +<node name="self-originated"> + <properties> + <help>Show Self-originated LSAs</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> +</node> +<!-- included end --> diff --git a/op-mode-definitions/ipoe-server.xml b/op-mode-definitions/ipoe-server.xml.in index c20d3aa2a..c20d3aa2a 100644 --- a/op-mode-definitions/ipoe-server.xml +++ b/op-mode-definitions/ipoe-server.xml.in diff --git a/op-mode-definitions/ipv4-route.xml b/op-mode-definitions/ipv4-route.xml.in index 1bda3ac11..1bda3ac11 100644 --- a/op-mode-definitions/ipv4-route.xml +++ b/op-mode-definitions/ipv4-route.xml.in diff --git a/op-mode-definitions/ipv6-route.xml b/op-mode-definitions/ipv6-route.xml.in index fbf6489ba..fbf6489ba 100644 --- a/op-mode-definitions/ipv6-route.xml +++ b/op-mode-definitions/ipv6-route.xml.in diff --git a/op-mode-definitions/l2tp-server.xml b/op-mode-definitions/l2tp-server.xml.in index 3e96b9365..3e96b9365 100644 --- a/op-mode-definitions/l2tp-server.xml +++ b/op-mode-definitions/l2tp-server.xml.in diff --git a/op-mode-definitions/lldp.xml b/op-mode-definitions/lldp.xml.in index 297ccf1f4..297ccf1f4 100644 --- a/op-mode-definitions/lldp.xml +++ b/op-mode-definitions/lldp.xml.in diff --git a/op-mode-definitions/monitor-bandwidth-test.xml b/op-mode-definitions/monitor-bandwidth-test.xml.in index 5b36b1da5..5b36b1da5 100644 --- a/op-mode-definitions/monitor-bandwidth-test.xml +++ b/op-mode-definitions/monitor-bandwidth-test.xml.in diff --git a/op-mode-definitions/monitor-bandwidth.xml b/op-mode-definitions/monitor-bandwidth.xml.in index 9af0a9e70..9af0a9e70 100644 --- a/op-mode-definitions/monitor-bandwidth.xml +++ b/op-mode-definitions/monitor-bandwidth.xml.in diff --git a/op-mode-definitions/monitor-log.xml b/op-mode-definitions/monitor-log.xml.in index 99efe5306..99efe5306 100644 --- a/op-mode-definitions/monitor-log.xml +++ b/op-mode-definitions/monitor-log.xml.in diff --git a/op-mode-definitions/monitor-ndp.xml b/op-mode-definitions/monitor-ndp.xml.in index 1ac6ce39b..1ac6ce39b 100644 --- a/op-mode-definitions/monitor-ndp.xml +++ b/op-mode-definitions/monitor-ndp.xml.in diff --git a/op-mode-definitions/nat.xml b/op-mode-definitions/nat.xml.in index f6c0fa748..4b09816f9 100644 --- a/op-mode-definitions/nat.xml +++ b/op-mode-definitions/nat.xml.in @@ -16,7 +16,7 @@ <properties> <help>Show configured source NAT rules</help> </properties> - <command>echo To be migrated to Python - https://phabricator.vyos.net/T2459</command> + <command>echo To be migrated to Python - Phabricator T2459</command> </node> <node name="statistics"> <properties> @@ -58,7 +58,7 @@ <properties> <help>Show configured destination NAT rules</help> </properties> - <command>echo To be migrated to Python - https://phabricator.vyos.net/T2459</command> + <command>echo To be migrated to Python - Phabricator T2459</command> </node> <node name="statistics"> <properties> diff --git a/op-mode-definitions/openconnect.xml b/op-mode-definitions/openconnect.xml.in index 9b82b114e..9b82b114e 100644 --- a/op-mode-definitions/openconnect.xml +++ b/op-mode-definitions/openconnect.xml.in diff --git a/op-mode-definitions/openvpn.xml b/op-mode-definitions/openvpn.xml.in index b9cb06dca..e9420904a 100644 --- a/op-mode-definitions/openvpn.xml +++ b/op-mode-definitions/openvpn.xml.in @@ -19,7 +19,6 @@ key_path=$4 full_path= - # Prepend /config/auth if the path is not absolute if echo $key_path | egrep -ve '^/.*' > /dev/null; then full_path=/config/auth/$key_path else diff --git a/op-mode-definitions/ping.xml b/op-mode-definitions/ping.xml.in index 4c25a59ab..4c25a59ab 100644 --- a/op-mode-definitions/ping.xml +++ b/op-mode-definitions/ping.xml.in diff --git a/op-mode-definitions/poweroff.xml b/op-mode-definitions/poweroff.xml.in index b4163bcb9..b4163bcb9 100644 --- a/op-mode-definitions/poweroff.xml +++ b/op-mode-definitions/poweroff.xml.in diff --git a/op-mode-definitions/pppoe-server.xml b/op-mode-definitions/pppoe-server.xml.in index 5ac9d9497..5ac9d9497 100644 --- a/op-mode-definitions/pppoe-server.xml +++ b/op-mode-definitions/pppoe-server.xml.in diff --git a/op-mode-definitions/pptp-server.xml b/op-mode-definitions/pptp-server.xml.in index 59be68611..59be68611 100644 --- a/op-mode-definitions/pptp-server.xml +++ b/op-mode-definitions/pptp-server.xml.in diff --git a/op-mode-definitions/reboot.xml b/op-mode-definitions/reboot.xml.in index 2c8daec5d..2c8daec5d 100644 --- a/op-mode-definitions/reboot.xml +++ b/op-mode-definitions/reboot.xml.in diff --git a/op-mode-definitions/reset-conntrack.xml b/op-mode-definitions/reset-conntrack.xml.in index 827ba4af4..827ba4af4 100644 --- a/op-mode-definitions/reset-conntrack.xml +++ b/op-mode-definitions/reset-conntrack.xml.in diff --git a/op-mode-definitions/reset-ip-bgp.xml b/op-mode-definitions/reset-ip-bgp.xml.in index 931a2a9bc..931a2a9bc 100644 --- a/op-mode-definitions/reset-ip-bgp.xml +++ b/op-mode-definitions/reset-ip-bgp.xml.in diff --git a/op-mode-definitions/reset-ip-igmp.xml b/op-mode-definitions/reset-ip-igmp.xml.in index 143553d33..143553d33 100644 --- a/op-mode-definitions/reset-ip-igmp.xml +++ b/op-mode-definitions/reset-ip-igmp.xml.in diff --git a/op-mode-definitions/reset-ip-multicast.xml b/op-mode-definitions/reset-ip-multicast.xml.in index d610add16..d610add16 100644 --- a/op-mode-definitions/reset-ip-multicast.xml +++ b/op-mode-definitions/reset-ip-multicast.xml.in diff --git a/op-mode-definitions/reset-ipv6-bgp.xml b/op-mode-definitions/reset-ipv6-bgp.xml.in index 3c4275331..3c4275331 100644 --- a/op-mode-definitions/reset-ipv6-bgp.xml +++ b/op-mode-definitions/reset-ipv6-bgp.xml.in diff --git a/op-mode-definitions/reset-mpls.xml b/op-mode-definitions/reset-mpls.xml.in index 4e5d37d5b..4e5d37d5b 100644 --- a/op-mode-definitions/reset-mpls.xml +++ b/op-mode-definitions/reset-mpls.xml.in diff --git a/op-mode-definitions/reset-vpn.xml b/op-mode-definitions/reset-vpn.xml.in index ae553c272..71dbb4ed9 100644 --- a/op-mode-definitions/reset-vpn.xml +++ b/op-mode-definitions/reset-vpn.xml.in @@ -17,31 +17,31 @@ <children> <node name="all"> <properties> - <help>Terminate all user's current remote access VPN session(s)</help> + <help>Terminate all users current remote access VPN session(s)</help> </properties> <children> <node name="protocol"> <properties> - <help>Terminate specified user's current remote access VPN session(s) with specified protocol</help> + <help>Terminate specified users current remote access VPN session(s) with specified protocol</help> </properties> <children> <leafNode name="l2tp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with L2TP protocol</help> + <help>Terminate all users current remote access VPN session(s) with L2TP protocol</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="l2tp"</command> + <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="l2tp"</command> </leafNode> <leafNode name="pptp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with PPTP protocol</help> + <help>Terminate all users current remote access VPN session(s) with PPTP protocol</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="pptp"</command> + <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="pptp"</command> </leafNode> <leafNode name="sstp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with SSTP protocol</help> + <help>Terminate all users current remote access VPN session(s) with SSTP protocol</help> </properties> - <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="sstp"</command> + <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="all_users" --protocol="sstp"</command> </leafNode> </children> </node> @@ -56,29 +56,29 @@ </tagNode> <tagNode name="user"> <properties> - <help>Terminate specified user's current remote access VPN session(s)</help> + <help>Terminate specified users current remote access VPN session(s)</help> </properties> <children> <node name="protocol"> <properties> - <help>Terminate specified user's current remote access VPN session(s) with specified protocol</help> + <help>Terminate specified users current remote access VPN session(s) with specified protocol</help> </properties> <children> <leafNode name="l2tp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with L2TP protocol</help> + <help>Terminate all users current remote access VPN session(s) with L2TP protocol</help> </properties> <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="$5" --protocol="l2tp"</command> </leafNode> <leafNode name="pptp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with PPTP protocol</help> + <help>Terminate all users current remote access VPN session(s) with PPTP protocol</help> </properties> <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="$5" --protocol="pptp"</command> </leafNode> <leafNode name="sstp"> <properties> - <help>Terminate all user's current remote access VPN session(s) with SSTP protocol</help> + <help>Terminate all users current remote access VPN session(s) with SSTP protocol</help> </properties> <command>sudo ${vyos_op_scripts_dir}/reset_vpn.py --username="$5" --protocol="sstp"</command> </leafNode> diff --git a/op-mode-definitions/restart-frr.xml b/op-mode-definitions/restart-frr.xml.in index 96ad1a650..96ad1a650 100644 --- a/op-mode-definitions/restart-frr.xml +++ b/op-mode-definitions/restart-frr.xml.in diff --git a/op-mode-definitions/restart.xml b/op-mode-definitions/restart.xml.in index c74ec9013..c74ec9013 100644 --- a/op-mode-definitions/restart.xml +++ b/op-mode-definitions/restart.xml.in diff --git a/op-mode-definitions/show-acceleration.xml b/op-mode-definitions/show-acceleration.xml.in index d0dcea2d6..d0dcea2d6 100644 --- a/op-mode-definitions/show-acceleration.xml +++ b/op-mode-definitions/show-acceleration.xml.in diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml.in index 8c1f7c398..8c1f7c398 100644 --- a/op-mode-definitions/show-bridge.xml +++ b/op-mode-definitions/show-bridge.xml.in diff --git a/op-mode-definitions/show-configuration.xml b/op-mode-definitions/show-configuration.xml.in index 318942ab0..318942ab0 100644 --- a/op-mode-definitions/show-configuration.xml +++ b/op-mode-definitions/show-configuration.xml.in diff --git a/op-mode-definitions/show-console-server.xml b/op-mode-definitions/show-console-server.xml.in index 77a7f3376..77a7f3376 100644 --- a/op-mode-definitions/show-console-server.xml +++ b/op-mode-definitions/show-console-server.xml.in diff --git a/op-mode-definitions/show-environment.xml b/op-mode-definitions/show-environment.xml.in index 95b658785..95b658785 100644 --- a/op-mode-definitions/show-environment.xml +++ b/op-mode-definitions/show-environment.xml.in diff --git a/op-mode-definitions/show-hardware.xml b/op-mode-definitions/show-hardware.xml.in index c3ff3a60f..0df2e4404 100644 --- a/op-mode-definitions/show-hardware.xml +++ b/op-mode-definitions/show-hardware.xml.in @@ -21,7 +21,7 @@ </node> <node name="summary"> <properties> - <help>Show CPU's on system</help> + <help>Show system CPUs</help> </properties> <command>${vyos_op_scripts_dir}/cpu_summary.py</command> </node> diff --git a/op-mode-definitions/show-history.xml b/op-mode-definitions/show-history.xml.in index 7fb286264..7fb286264 100644 --- a/op-mode-definitions/show-history.xml +++ b/op-mode-definitions/show-history.xml.in diff --git a/op-mode-definitions/show-host.xml b/op-mode-definitions/show-host.xml.in index eee1288a1..eee1288a1 100644 --- a/op-mode-definitions/show-host.xml +++ b/op-mode-definitions/show-host.xml.in diff --git a/op-mode-definitions/show-interfaces-bonding.xml b/op-mode-definitions/show-interfaces-bonding.xml.in index f6d9b3508..f6d9b3508 100644 --- a/op-mode-definitions/show-interfaces-bonding.xml +++ b/op-mode-definitions/show-interfaces-bonding.xml.in diff --git a/op-mode-definitions/show-interfaces-bridge.xml b/op-mode-definitions/show-interfaces-bridge.xml.in index cc4b248b6..cc4b248b6 100644 --- a/op-mode-definitions/show-interfaces-bridge.xml +++ b/op-mode-definitions/show-interfaces-bridge.xml.in diff --git a/op-mode-definitions/show-interfaces-dummy.xml b/op-mode-definitions/show-interfaces-dummy.xml.in index 7c24c6921..7c24c6921 100644 --- a/op-mode-definitions/show-interfaces-dummy.xml +++ b/op-mode-definitions/show-interfaces-dummy.xml.in diff --git a/op-mode-definitions/show-interfaces-ethernet.xml b/op-mode-definitions/show-interfaces-ethernet.xml.in index fc79f44bf..fc79f44bf 100644 --- a/op-mode-definitions/show-interfaces-ethernet.xml +++ b/op-mode-definitions/show-interfaces-ethernet.xml.in diff --git a/op-mode-definitions/show-interfaces-input.xml b/op-mode-definitions/show-interfaces-input.xml.in index 15e8203e5..15e8203e5 100644 --- a/op-mode-definitions/show-interfaces-input.xml +++ b/op-mode-definitions/show-interfaces-input.xml.in diff --git a/op-mode-definitions/show-interfaces-l2tpv3.xml b/op-mode-definitions/show-interfaces-l2tpv3.xml.in index 60fee34a1..60fee34a1 100644 --- a/op-mode-definitions/show-interfaces-l2tpv3.xml +++ b/op-mode-definitions/show-interfaces-l2tpv3.xml.in diff --git a/op-mode-definitions/show-interfaces-loopback.xml b/op-mode-definitions/show-interfaces-loopback.xml.in index b30b57909..b30b57909 100644 --- a/op-mode-definitions/show-interfaces-loopback.xml +++ b/op-mode-definitions/show-interfaces-loopback.xml.in diff --git a/op-mode-definitions/show-interfaces-macsec.xml b/op-mode-definitions/show-interfaces-macsec.xml.in index 6aeab66af..6aeab66af 100644 --- a/op-mode-definitions/show-interfaces-macsec.xml +++ b/op-mode-definitions/show-interfaces-macsec.xml.in diff --git a/op-mode-definitions/show-interfaces-pppoe.xml b/op-mode-definitions/show-interfaces-pppoe.xml.in index 393ca912f..393ca912f 100644 --- a/op-mode-definitions/show-interfaces-pppoe.xml +++ b/op-mode-definitions/show-interfaces-pppoe.xml.in diff --git a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in index 195944745..195944745 100644 --- a/op-mode-definitions/show-interfaces-pseudo-ethernet.xml +++ b/op-mode-definitions/show-interfaces-pseudo-ethernet.xml.in diff --git a/op-mode-definitions/show-interfaces-tunnel.xml b/op-mode-definitions/show-interfaces-tunnel.xml.in index 416de0299..416de0299 100644 --- a/op-mode-definitions/show-interfaces-tunnel.xml +++ b/op-mode-definitions/show-interfaces-tunnel.xml.in diff --git a/op-mode-definitions/show-interfaces-vti.xml b/op-mode-definitions/show-interfaces-vti.xml.in index f51be2d19..f51be2d19 100644 --- a/op-mode-definitions/show-interfaces-vti.xml +++ b/op-mode-definitions/show-interfaces-vti.xml.in diff --git a/op-mode-definitions/show-interfaces-vxlan.xml b/op-mode-definitions/show-interfaces-vxlan.xml.in index 4e3cb93cd..4e3cb93cd 100644 --- a/op-mode-definitions/show-interfaces-vxlan.xml +++ b/op-mode-definitions/show-interfaces-vxlan.xml.in diff --git a/op-mode-definitions/show-interfaces-wirelessmodem.xml b/op-mode-definitions/show-interfaces-wirelessmodem.xml.in index c0ab9c66f..c0ab9c66f 100644 --- a/op-mode-definitions/show-interfaces-wirelessmodem.xml +++ b/op-mode-definitions/show-interfaces-wirelessmodem.xml.in diff --git a/op-mode-definitions/show-interfaces.xml b/op-mode-definitions/show-interfaces.xml.in index 39b0f0a2c..39b0f0a2c 100644 --- a/op-mode-definitions/show-interfaces.xml +++ b/op-mode-definitions/show-interfaces.xml.in diff --git a/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml b/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in index a5ec65c94..a5ec65c94 100644 --- a/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml +++ b/op-mode-definitions/show-ip-access-paths-prefix-community-lists.xml.in diff --git a/op-mode-definitions/show-ip-bgp.xml b/op-mode-definitions/show-ip-bgp.xml.in index 5eb2ae56e..a92a78266 100644 --- a/op-mode-definitions/show-ip-bgp.xml +++ b/op-mode-definitions/show-ip-bgp.xml.in @@ -32,7 +32,7 @@ <properties> <help>Display routes matching the specified communities</help> <completionHelp> - <list><AA:NN> local-AS no-advertise no-export</list> + <list><AA:NN> local-AS no-advertise no-export</list> </completionHelp> </properties> <command>/usr/bin/vtysh -c "show ip bgp community $5"</command> @@ -97,11 +97,11 @@ </properties> <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast community"</command> </node> - <tagNode name="community"> + <tagNode name="community"> <properties> <help>Display routes matching the specified communities</help> <completionHelp> - <list><AA:NN> local-AS no-advertise no-export</list> + <list><AA:NN> local-AS no-advertise no-export</list> </completionHelp> </properties> <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast community $7"</command> @@ -160,7 +160,7 @@ <command>/usr/bin/vtysh -c "show ip bgp ipv4 unicast neighbor $7 routes"</command> </leafNode> </children> - </tagNode> + </tagNode> <leafNode name="paths"> <properties> <help>Show BGP path information</help> @@ -190,7 +190,7 @@ <help>Show summary of BGP information</help> </properties> <command>/usr/bin/vtysh -c "show ip bgp summary"</command> - </leafNode> + </leafNode> </children> </node> <tagNode name="unicast"> @@ -227,7 +227,7 @@ <help>Show BGP memory usage</help> </properties> <command>/usr/bin/vtysh -c "show ip bgp memory"</command> - </leafNode> + </leafNode> <tagNode name="neighbors"> <properties> <help>Show detailed BGP IPv4 unicast neighbor information</help> @@ -287,7 +287,7 @@ <command>/usr/bin/vtysh -c "show ip bgp neighbor $5 routes"</command> </leafNode> </children> - </tagNode> + </tagNode> <leafNode name="paths"> <properties> <help>Show BGP path information</help> diff --git a/op-mode-definitions/show-ip-igmp.xml b/op-mode-definitions/show-ip-igmp.xml.in index b8f2f9107..b8f2f9107 100644 --- a/op-mode-definitions/show-ip-igmp.xml +++ b/op-mode-definitions/show-ip-igmp.xml.in diff --git a/op-mode-definitions/show-ip-multicast.xml b/op-mode-definitions/show-ip-multicast.xml.in index 5331d2e35..5331d2e35 100644 --- a/op-mode-definitions/show-ip-multicast.xml +++ b/op-mode-definitions/show-ip-multicast.xml.in diff --git a/op-mode-definitions/show-ip-ospf.xml b/op-mode-definitions/show-ip-ospf.xml.in index 15fa1db6c..50628d18e 100644 --- a/op-mode-definitions/show-ip-ospf.xml +++ b/op-mode-definitions/show-ip-ospf.xml.in @@ -75,7 +75,7 @@ <help>Show summary of self-originate IPv4 OSPF ASBR database</help> </properties> <command>show ip ospf database asbr-summary $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> <node name="external"> @@ -128,7 +128,7 @@ <help>Show self-originate IPv4 OSPF external database</help> </properties> <command>show ip ospf database external $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> <leafNode name="max-age"> @@ -187,7 +187,7 @@ <help>Show self-originate IPv4 OSPF network database</help> </properties> <command>show ip ospf database network $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> <node name="nssa-external"> @@ -240,7 +240,7 @@ <help>Show self-originate IPv4 OSPF NSSA external database</help> </properties> <command>show ip ospf database nssa-external $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> <node name="opaque-area"> @@ -293,7 +293,7 @@ <help>Show self-originate IPv4 OSPF opaque-area database</help> </properties> <command>show ip ospf database opaque-area $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> <node name="opaque-as"> @@ -346,7 +346,7 @@ <help>Show self-originate IPv4 OSPF opaque-as database</help> </properties> <command>show ip ospf database opaque-as $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> <node name="opaque-link"> @@ -399,7 +399,7 @@ <help>Show self-originate IPv4 OSPF opaque-link database</help> </properties> <command>show ip ospf database opaque-link $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> <node name="router"> @@ -452,7 +452,7 @@ <help>Show self-originate IPv4 OSPF router database</help> </properties> <command>show ip ospf database router $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> <leafNode name="self-originate"> @@ -511,7 +511,7 @@ <help>Show self-originate IPv4 OSPF summary database</help> </properties> <command>show ip ospf database summary $6 self-originate</command> - </leafNode> + </leafNode> </children> </tagNode> </children> diff --git a/op-mode-definitions/show-ip-pim.xml b/op-mode-definitions/show-ip-pim.xml.in index 3f4edc779..3f4edc779 100644 --- a/op-mode-definitions/show-ip-pim.xml +++ b/op-mode-definitions/show-ip-pim.xml.in diff --git a/op-mode-definitions/show-ip-ports.xml b/op-mode-definitions/show-ip-ports.xml.in index a74b68ffc..a74b68ffc 100644 --- a/op-mode-definitions/show-ip-ports.xml +++ b/op-mode-definitions/show-ip-ports.xml.in diff --git a/op-mode-definitions/show-ip-rip.xml b/op-mode-definitions/show-ip-rip.xml.in index b61ab10a7..b61ab10a7 100644 --- a/op-mode-definitions/show-ip-rip.xml +++ b/op-mode-definitions/show-ip-rip.xml.in diff --git a/op-mode-definitions/show-ip-route.xml b/op-mode-definitions/show-ip-route.xml.in index a98048785..a98048785 100644 --- a/op-mode-definitions/show-ip-route.xml +++ b/op-mode-definitions/show-ip-route.xml.in diff --git a/op-mode-definitions/show-ipv6-bgp.xml b/op-mode-definitions/show-ipv6-bgp.xml.in index aad61b97a..aad61b97a 100644 --- a/op-mode-definitions/show-ipv6-bgp.xml +++ b/op-mode-definitions/show-ipv6-bgp.xml.in diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml b/op-mode-definitions/show-ipv6-ospfv3.xml deleted file mode 100644 index 36bb5b40e..000000000 --- a/op-mode-definitions/show-ipv6-ospfv3.xml +++ /dev/null @@ -1,777 +0,0 @@ -<?xml version="1.0"?> -<interfaceDefinition> - <node name="show"> - <children> - <node name="ipv6"> - <properties> - <help>Show IPv6 routing information</help> - </properties> - <children> - <node name="ospfv3"> - <properties> - <help>Show IPv6 Open Shortest Path First (OSPF)</help> - </properties> - <command>vtysh -c "show ipv6 ospf6"</command> - <children> - <node name="area"> - <properties> - <help>Show Shortest Path First tree information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 spf tree"</command> - </node> - <tagNode name="area"> - <properties> - <help>Area ID (as an IPv4 notation)</help> - <completionHelp> - <path>protocols ospfv3 area</path> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 area $4 spf tree"</command> - <children> - <tagNode name="router"> - <properties> - <help> Simulate view point (Router ID)</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 simulate spf-tree $7 $4 $5"</command> - </tagNode> - </children> - </tagNode> - <node name="border-routers"> - <properties> - <help>Show OSPFv3 border-router (ABR and ASBR) information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 border-routers"</command> - <children> - <node name="detail"> - <properties> - <help>Show OSPFv3 detailed border-router information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 border-routers detail"</command> - </node> - </children> - </node> - <tagNode name="border-routers"> - <properties> - <help>Border router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 border-routers $5"</command> - </tagNode> - <node name="database"> - <properties> - <help>Show OSPFv3 Link state database information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database adv-router $6 linkstate-id $8 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database adv-router $6 linkstate-id $8 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database adv-router $6 linkstate-id $8 internal"</command> - </node> - </children> - </tagNode> - </children> - </tagNode> - <node name="any"> - <properties> - <help>Search by Any Link state Type</help> - </properties> - <children> - <tagNode name="any"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * * $7 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * * $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * * $7 internal"</command> - </node> - </children> - </tagNode> - </children> - </node> - <tagNode name="any"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 internal"</command> - </node> - <node name="node.tag"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 $7"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 $7 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database * $6 $7 internal"</command> - </node> - </children> - </node> - </children> - </tagNode> - - - - - - <node name="as-external"> - <properties> - <help>Show AS-External LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external"</command> - <children> - <tagNode name="adv-router"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external adv-router $7 linkstate-id $9 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external adv-router $7 linkstate-id $9 internal"</command> - </node> - </children> - </tagNode> - </children> - </tagNode> - <tagNode name="any"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external * $7"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external * $7 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external * $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external * $7 internal"</command> - </node> - </children> - </tagNode> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external internal"</command> - </node> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external linkstate-id $7 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external linkstate-id $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external linkstate-id $7 internal"</command> - </node> - </children> - </tagNode> - <node name="self-originated"> - <properties> - <help>Show Self-originated LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated internal"</command> - </node> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated linkstate-id $8 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated linkstate-id $8 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external self-originated linkstate-id $8 internal"</command> - </node> - </children> - </tagNode> - </children> - </node> - </children> - </node> - <tagNode name="as-external"> - <properties> - <help>Search by Advertising Router IDs</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 internal"</command> - </node> - <node name="self-originated"> - <properties> - <help>Show Self-originated LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database as-external $6 self-originated internal"</command> - </node> - </children> - </node> - <node name="node.tag"> - <properties> - <help>Search by Advertising Router ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>echo vtysh -c "show ipv6 ospf6 database as-external $6 $7 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>echo vtysh -c "show ipv6 ospf6 database as-external $6 $7 internal"</command> - </node> - </children> - </node> - </children> - </tagNode> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database dump"</command> - </node> - <tagNode name="linkstate-id"> - <properties> - <help>Search by Link state ID</help> - <completionHelp> - <list><x.x.x.x></list> - </completionHelp> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database linkstate-id $6 detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database linkstate-id $6 dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database linkstate-id $6 internal"</command> - </node> - </children> - </tagNode> - <node name="self-originated"> - <properties> - <help>Show Self-originated LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database self-originated"</command> - <children> - <node name="detail"> - <properties> - <help>Show details of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database self-originated detail"</command> - </node> - <node name="dump"> - <properties> - <help>Show dump of LSAs</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database self-originated dump"</command> - </node> - <node name="internal"> - <properties> - <help>Show LSAs internal information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 database self-originated internal"</command> - </node> - </children> - </node> - </children> - </node> - <node name="interface"> - <properties> - <help>Show OSPFv3 interface information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface"</command> - <children> - <node name="prefix"> - <properties> - <help>Show connected prefixes to advertise</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix"</command> - <children> - <node name="detail"> - <properties> - <help>More detailed interface prefix information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix detail"</command> - </node> - </children> - </node> - <tagNode name="prefix"> - <properties> - <help>Show interface prefix route specific information</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix $6"</command> - <children> - <node name="detail"> - <properties> - <help>More detailed information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix $6 detail"</command> - </node> - <node name="match"> - <properties> - <help>Matched interface prefix information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface prefix $6 match"</command> - </node> - </children> - </tagNode> - </children> - </node> - <tagNode name="interface"> - <properties> - <help>Specific insterface to examine</help> - <completionHelp> - <script>${vyos_completion_dir}/list_interfaces.py</script> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5"</command> - <children> - <node name="prefix"> - <properties> - <help>Show connected prefixes to advertise</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix"</command> - <children> - <node name="detail"> - <properties> - <help>More detailed interface prefix information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix detail"</command> - </node> - </children> - </node> - <tagNode name="prefix"> - <properties> - <help>Show interface prefix route specific information</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7"</command> - <children> - <node name="detail"> - <properties> - <help>More detailed information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7 detail"</command> - </node> - <node name="match"> - <properties> - <help>Matched interface prefix information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7 match"</command> - </node> - </children> - </tagNode> - </children> - </tagNode> - <node name="linkstate"> - <properties> - <help>Show OSPFv3 linkstate routing information</help> - </properties> - <children> - <node name="detail"> - <properties> - <help>Show detailed linkstate information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 linkstate detail"</command> - </node> - <node name="network"> - <properties> - <help>Show linkstate Network information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 linkstate network"</command> - </node> - <node name="router"> - <properties> - <help>Show linkstate Router information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 linkstate router"</command> - </node> - </children> - </node> - <node name="neighbor"> - <properties> - <help>Show OSPFv3 neighbor information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 neighbor"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed neighbor information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 neighbor detail"</command> - </node> - <node name="drchoice"> - <properties> - <help>Show neighbor DR choice information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 neighbor drchoice"</command> - </node> - </children> - </node> - <node name="redistribute"> - <properties> - <help>Show OSPFv3 redistribute external information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 redistribute"</command> - </node> - <node name="route"> - <properties> - <help>Show OSPFv3 routing table information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route"</command> - <children> - <node name="external-1"> - <properties> - <help>Show Type-1 External route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route external-1"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed Type-1 External route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route external-1 detail"</command> - </node> - </children> - </node> - <node name="external-2"> - <properties> - <help>Show Type-2 External route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route external-2"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed Type-2 External route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route external-2 detail"</command> - </node> - </children> - </node> - <node name="inter-area"> - <properties> - <help>Show Inter-Area route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route inter-area"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed Inter-Area route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route inter-area detail"</command> - </node> - </children> - </node> - <node name="intra-area"> - <properties> - <help>Show Intra-Area route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route intra-area"</command> - <children> - <node name="detail"> - <properties> - <help>Show detailed Intra-Area route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route intra-area detail"</command> - </node> - </children> - </node> - <node name="detail"> - <properties> - <help>Show detailed route information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route detail"</command> - </node> - <node name="summary"> - <properties> - <help>Show route table summary</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route summary"</command> - </node> - </children> - </node> - <tagNode name="route"> - <properties> - <help>Show specified route/prefix information</help> - <completionHelp> - <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> - </completionHelp> - </properties> - <command>vtysh -c "show ipv6 ospf6 route $5"</command> - <children> - <node name="longer"> - <properties> - <help>Show routes longer than specified prefix</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route $5 longer"</command> - </node> - <node name="match"> - <properties> - <help>Show routes matching specified prefix</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route $5 match"</command> - <children> - <node name="detail"> - <properties> - <help>Detailed information</help> - </properties> - <command>vtysh -c "show ipv6 ospf6 route $5 match detail"</command> - </node> - </children> - </node> - </children> - </tagNode> - </children> - </node> - </children> - </node> - </children> - </node> -</interfaceDefinition> diff --git a/op-mode-definitions/show-ipv6-ospfv3.xml.in b/op-mode-definitions/show-ipv6-ospfv3.xml.in new file mode 100644 index 000000000..bbae74c75 --- /dev/null +++ b/op-mode-definitions/show-ipv6-ospfv3.xml.in @@ -0,0 +1,348 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="show"> + <children> + <node name="ipv6"> + <properties> + <help>Show IPv6 routing information</help> + </properties> + <children> + <node name="ospfv3"> + <properties> + <help>Show IPv6 Open Shortest Path First (OSPF)</help> + </properties> + <command>vtysh -c "show ipv6 ospf6"</command> + <children> + <node name="area"> + <properties> + <help>Show Shortest Path First tree information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 spf tree"</command> + </node> + <tagNode name="area"> + <properties> + <help>Area ID (as an IPv4 notation)</help> + <completionHelp> + <path>protocols ospfv3 area</path> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 area $4 spf tree"</command> + <children> + <tagNode name="router"> + <properties> + <help> Simulate view point (Router ID)</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 simulate spf-tree $7 $4 $5"</command> + </tagNode> + </children> + </tagNode> + <node name="border-routers"> + <properties> + <help>Show OSPFv3 border-router (ABR and ASBR) information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 border-routers"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <tagNode name="border-routers"> + <properties> + <help>Border router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 border-routers $5"</command> + </tagNode> + <node name="database"> + <properties> + <help>Show OSPFv3 Link state database information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 database"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + <node name="any"> + <properties> + <help>Search by Any Link state Type</help> + </properties> + <children> + <tagNode name="any"> + <properties> + <help>Search by Link state ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> + </tagNode> + </children> + </node> + <tagNode name="any"> + <properties> + <help>Search by Link state ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 database * $6"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-adv-router-id-node-tag.xml.i> + </children> + </tagNode> + <node name="as-external"> + <properties> + <help>Show AS-External LSAs</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 database as-external"</command> + <children> + #include <include/ospfv3-adv-router.xml.i> + <tagNode name="any"> + <properties> + <help>Search by Advertising Router ID</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 database as-external * $7"</command> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + </children> + </tagNode> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <tagNode name="as-external"> + <properties> + <help>Search by Advertising Router IDs</help> + <completionHelp> + <list><x.x.x.x></list> + </completionHelp> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-dump.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-self-originated.xml.i> + #include <include/ospfv3-adv-router-id-node-tag.xml.i> + </children> + </tagNode> + #include <include/ospfv3-detail.xml.i> + #include <include/ospfv3-internal.xml.i> + #include <include/ospfv3-linkstate-id.xml.i> + #include <include/ospfv3-self-originated.xml.i> + </children> + </node> + <node name="interface"> + <properties> + <help>Show OSPFv3 interface information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface"</command> + <children> + <node name="prefix"> + <properties> + <help>Show connected prefixes to advertise</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface prefix"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <tagNode name="prefix"> + <properties> + <help>Show interface prefix route specific information</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface prefix $6"</command> + <children> + #include <include/ospfv3-detail.xml.i> + <node name="match"> + <properties> + <help>Matched interface prefix information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface prefix $6 match"</command> + </node> + </children> + </tagNode> + </children> + </node> + <tagNode name="interface"> + <properties> + <help>Specific insterface to examine</help> + <completionHelp> + <script>${vyos_completion_dir}/list_interfaces.py</script> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface $5"</command> + <children> + <node name="prefix"> + <properties> + <help>Show connected prefixes to advertise</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface $5 prefix"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <tagNode name="prefix"> + <properties> + <help>Show interface prefix route specific information</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7"</command> + <children> + #include <include/ospfv3-detail.xml.i> + <node name="match"> + <properties> + <help>Matched interface prefix information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 interface $5 prefix $7 match"</command> + </node> + </children> + </tagNode> + </children> + </tagNode> + <node name="linkstate"> + <properties> + <help>Show OSPFv3 linkstate routing information</help> + </properties> + <children> + #include <include/ospfv3-detail.xml.i> + <node name="network"> + <properties> + <help>Show linkstate Network information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 linkstate network"</command> + </node> + <node name="router"> + <properties> + <help>Show linkstate Router information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 linkstate router"</command> + </node> + </children> + </node> + <node name="neighbor"> + <properties> + <help>Show OSPFv3 neighbor information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 neighbor"</command> + <children> + #include <include/ospfv3-detail.xml.i> + <node name="drchoice"> + <properties> + <help>Show neighbor DR choice information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 neighbor drchoice"</command> + </node> + </children> + </node> + <node name="redistribute"> + <properties> + <help>Show OSPFv3 redistribute external information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 redistribute"</command> + </node> + <node name="route"> + <properties> + <help>Show OSPFv3 routing table information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route"</command> + <children> + <node name="external-1"> + <properties> + <help>Show Type-1 External route information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route external-1"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <node name="external-2"> + <properties> + <help>Show Type-2 External route information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route external-2"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <node name="inter-area"> + <properties> + <help>Show Inter-Area route information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route inter-area"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + <node name="intra-area"> + <properties> + <help>Show Intra-Area route information</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route intra-area"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + #include <include/ospfv3-detail.xml.i> + <node name="summary"> + <properties> + <help>Show route table summary</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route summary"</command> + </node> + </children> + </node> + <tagNode name="route"> + <properties> + <help>Show specified route/prefix information</help> + <completionHelp> + <list><h:h:h:h:h:h:h:h> <h:h:h:h:h:h:h:h/x></list> + </completionHelp> + </properties> + <command>vtysh -c "show ipv6 ospf6 route $5"</command> + <children> + <node name="longer"> + <properties> + <help>Show routes longer than specified prefix</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route $5 longer"</command> + </node> + <node name="match"> + <properties> + <help>Show routes matching specified prefix</help> + </properties> + <command>vtysh -c "show ipv6 ospf6 route $5 match"</command> + <children> + #include <include/ospfv3-detail.xml.i> + </children> + </node> + </children> + </tagNode> + </children> + </node> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/op-mode-definitions/show-ipv6-prefix-list.xml b/op-mode-definitions/show-ipv6-prefix-list.xml.in index e003ad110..e003ad110 100644 --- a/op-mode-definitions/show-ipv6-prefix-list.xml +++ b/op-mode-definitions/show-ipv6-prefix-list.xml.in diff --git a/op-mode-definitions/show-ipv6-route.xml b/op-mode-definitions/show-ipv6-route.xml.in index fafd615ea..fafd615ea 100644 --- a/op-mode-definitions/show-ipv6-route.xml +++ b/op-mode-definitions/show-ipv6-route.xml.in diff --git a/op-mode-definitions/show-ipv6.xml b/op-mode-definitions/show-ipv6.xml.in index a59c8df0c..a59c8df0c 100644 --- a/op-mode-definitions/show-ipv6.xml +++ b/op-mode-definitions/show-ipv6.xml.in diff --git a/op-mode-definitions/show-isis.xml b/op-mode-definitions/show-isis.xml.in index 4e308730f..4e308730f 100644 --- a/op-mode-definitions/show-isis.xml +++ b/op-mode-definitions/show-isis.xml.in diff --git a/op-mode-definitions/show-license.xml b/op-mode-definitions/show-license.xml.in index 2ce11567d..2ce11567d 100644 --- a/op-mode-definitions/show-license.xml +++ b/op-mode-definitions/show-license.xml.in diff --git a/op-mode-definitions/show-log.xml b/op-mode-definitions/show-log.xml.in index b00e4cfec..b00e4cfec 100644 --- a/op-mode-definitions/show-log.xml +++ b/op-mode-definitions/show-log.xml.in diff --git a/op-mode-definitions/show-login.xml b/op-mode-definitions/show-login.xml.in index 6d8c782c4..6d8c782c4 100644 --- a/op-mode-definitions/show-login.xml +++ b/op-mode-definitions/show-login.xml.in diff --git a/op-mode-definitions/show-monitoring.xml b/op-mode-definitions/show-monitoring.xml.in index 2651b3438..2651b3438 100644 --- a/op-mode-definitions/show-monitoring.xml +++ b/op-mode-definitions/show-monitoring.xml.in diff --git a/op-mode-definitions/show-mpls.xml b/op-mode-definitions/show-mpls.xml.in index 833ac98eb..833ac98eb 100644 --- a/op-mode-definitions/show-mpls.xml +++ b/op-mode-definitions/show-mpls.xml.in diff --git a/op-mode-definitions/show-ntp.xml b/op-mode-definitions/show-ntp.xml.in index b7f0acdf8..b7f0acdf8 100644 --- a/op-mode-definitions/show-ntp.xml +++ b/op-mode-definitions/show-ntp.xml.in diff --git a/op-mode-definitions/show-poweroff.xml b/op-mode-definitions/show-poweroff.xml.in index 1fd2afcc3..1fd2afcc3 100644 --- a/op-mode-definitions/show-poweroff.xml +++ b/op-mode-definitions/show-poweroff.xml.in diff --git a/op-mode-definitions/show-protocols-bfd.xml b/op-mode-definitions/show-protocols-bfd.xml.in index 3d9b67c67..3d9b67c67 100644 --- a/op-mode-definitions/show-protocols-bfd.xml +++ b/op-mode-definitions/show-protocols-bfd.xml.in diff --git a/op-mode-definitions/show-protocols-static.xml b/op-mode-definitions/show-protocols-static.xml.in index aaf875072..aaf875072 100644 --- a/op-mode-definitions/show-protocols-static.xml +++ b/op-mode-definitions/show-protocols-static.xml.in diff --git a/op-mode-definitions/show-raid.xml b/op-mode-definitions/show-raid.xml.in index 8bf394552..8bf394552 100644 --- a/op-mode-definitions/show-raid.xml +++ b/op-mode-definitions/show-raid.xml.in diff --git a/op-mode-definitions/show-reboot.xml b/op-mode-definitions/show-reboot.xml.in index c85966bcb..c85966bcb 100644 --- a/op-mode-definitions/show-reboot.xml +++ b/op-mode-definitions/show-reboot.xml.in diff --git a/op-mode-definitions/show-route-map.xml b/op-mode-definitions/show-route-map.xml.in index 0e376757b..0e376757b 100644 --- a/op-mode-definitions/show-route-map.xml +++ b/op-mode-definitions/show-route-map.xml.in diff --git a/op-mode-definitions/show-rpki.xml b/op-mode-definitions/show-rpki.xml.in index d68c3b862..d68c3b862 100644 --- a/op-mode-definitions/show-rpki.xml +++ b/op-mode-definitions/show-rpki.xml.in diff --git a/op-mode-definitions/show-system.xml b/op-mode-definitions/show-system.xml.in index 0623e3b62..0623e3b62 100644 --- a/op-mode-definitions/show-system.xml +++ b/op-mode-definitions/show-system.xml.in diff --git a/op-mode-definitions/show-table.xml b/op-mode-definitions/show-table.xml.in index b093a5de7..b093a5de7 100644 --- a/op-mode-definitions/show-table.xml +++ b/op-mode-definitions/show-table.xml.in diff --git a/op-mode-definitions/show-users.xml b/op-mode-definitions/show-users.xml.in index a026e47e7..a026e47e7 100644 --- a/op-mode-definitions/show-users.xml +++ b/op-mode-definitions/show-users.xml.in diff --git a/op-mode-definitions/show-version.xml b/op-mode-definitions/show-version.xml.in index 2202d27b3..2202d27b3 100644 --- a/op-mode-definitions/show-version.xml +++ b/op-mode-definitions/show-version.xml.in diff --git a/op-mode-definitions/show-vpn.xml b/op-mode-definitions/show-vpn.xml.in index 0e7fc38e9..3fbc74ad1 100644 --- a/op-mode-definitions/show-vpn.xml +++ b/op-mode-definitions/show-vpn.xml.in @@ -11,7 +11,7 @@ <properties> <help>Show active VPN server sessions</help> </properties> - <command>${vyos_op_scripts_dir}/show_vpn_ra.py</command> + <command>${vyos_op_scripts_dir}/show_vpn_ra.py</command> </leafNode> </children> </node> diff --git a/op-mode-definitions/show-vrf.xml b/op-mode-definitions/show-vrf.xml.in index 438e7c334..438e7c334 100644 --- a/op-mode-definitions/show-vrf.xml +++ b/op-mode-definitions/show-vrf.xml.in diff --git a/op-mode-definitions/snmp.xml b/op-mode-definitions/snmp.xml.in index a0a47da40..a0a47da40 100644 --- a/op-mode-definitions/snmp.xml +++ b/op-mode-definitions/snmp.xml.in diff --git a/op-mode-definitions/sstp-server.xml b/op-mode-definitions/sstp-server.xml.in index 03dfc4262..03dfc4262 100644 --- a/op-mode-definitions/sstp-server.xml +++ b/op-mode-definitions/sstp-server.xml.in diff --git a/op-mode-definitions/telnet.xml b/op-mode-definitions/telnet.xml.in index c5bb6d283..c5bb6d283 100644 --- a/op-mode-definitions/telnet.xml +++ b/op-mode-definitions/telnet.xml.in diff --git a/op-mode-definitions/terminal.xml b/op-mode-definitions/terminal.xml.in index 9c4e629cb..9c4e629cb 100644 --- a/op-mode-definitions/terminal.xml +++ b/op-mode-definitions/terminal.xml.in diff --git a/op-mode-definitions/traceroute.xml b/op-mode-definitions/traceroute.xml.in index 1b619ed43..1b619ed43 100644 --- a/op-mode-definitions/traceroute.xml +++ b/op-mode-definitions/traceroute.xml.in diff --git a/op-mode-definitions/traffic-dump.xml b/op-mode-definitions/traffic-dump.xml.in index 6d86f7423..6d86f7423 100644 --- a/op-mode-definitions/traffic-dump.xml +++ b/op-mode-definitions/traffic-dump.xml.in diff --git a/op-mode-definitions/vrrp.xml b/op-mode-definitions/vrrp.xml.in index 856fb440d..856fb440d 100644 --- a/op-mode-definitions/vrrp.xml +++ b/op-mode-definitions/vrrp.xml.in diff --git a/op-mode-definitions/wake-on-lan.xml b/op-mode-definitions/wake-on-lan.xml.in index 1a9b88596..1a9b88596 100644 --- a/op-mode-definitions/wake-on-lan.xml +++ b/op-mode-definitions/wake-on-lan.xml.in diff --git a/op-mode-definitions/webproxy.xml b/op-mode-definitions/webproxy.xml.in index f8ec8fb0a..f8ec8fb0a 100644 --- a/op-mode-definitions/webproxy.xml +++ b/op-mode-definitions/webproxy.xml.in diff --git a/op-mode-definitions/wireguard.xml b/op-mode-definitions/wireguard.xml.in index a7bfa36a3..69ba8043d 100644 --- a/op-mode-definitions/wireguard.xml +++ b/op-mode-definitions/wireguard.xml.in @@ -135,4 +135,3 @@ </children> </node> </interfaceDefinition> - diff --git a/op-mode-definitions/wireless.xml b/op-mode-definitions/wireless.xml.in index a3a9d1f55..a3a9d1f55 100644 --- a/op-mode-definitions/wireless.xml +++ b/op-mode-definitions/wireless.xml.in diff --git a/sphinx/source/.gitignore b/sphinx/source/.gitignore new file mode 100644 index 000000000..30d85567b --- /dev/null +++ b/sphinx/source/.gitignore @@ -0,0 +1 @@ +*.rst |