Merge pull request #178 from c-po/t1843-xml-preprocessor
be09f1ec2bbc
Actions

Description

Merge pull request #178 from c-po/t1843-xml-preprocessor

Add GCC preprocessor support for XML files

Details

Provenance

dmbaturin	Authored on Dec 9 2019, 10:12 PM
GitHub	Committed on Dec 9 2019, 10:12 PM

Parents

rVYOSONEXeced4a49c67d: vyos.config: T1764: allow for list argument to exists, in value case
rVYOSONEX0b3e8ee97760: T1843: use include files for interface proxy-arp-pvlan option

Branches

Tags

Event Timeline

GitHub <noreply@github.com> committed rVYOSONEXbe09f1ec2bbc: Merge pull request #178 from c-po/t1843-xml-preprocessor (authored by dmbaturin).Dec 9 2019, 10:12 PM

Merged Changes

0b3e8ee97760 T1843: use include files for interface proxy-arp-pvlan option
Author
c-po
Browse Repository
No Builds
No Audits
81c3919271b2 T1843: use include files for interface proxy-arp configuration
Author
c-po
Browse Repository
No Builds
No Audits
22091b99ce88 T1843: use include files for interface arp-cache-timeout configuration
Author
c-po
Browse Repository
No Builds
No Audits
24c99947f4a7 T1843: use include files for interface link-detect feature
Author
c-po
Browse Repository
No Builds
No Audits
1053b3311722 T1843: use include files for interface MTU size
Author
c-po
Browse Repository
No Builds
No Audits
7b548edefc9e T1843: use include files for interface MAC address
Author
c-po
Browse Repository
No Builds
No Audits
9b116825b44c T1843: use include files to disable interface (admin down)
Author
c-po
Browse Repository
No Builds
No Audits
85349b54ab4d T1843: use include files for interface description
Author
c-po
Browse Repository
No Builds
No Audits
6c51461bfe1e T1843: use include files for DHCP/DHCPv6 options
Author
c-po
Browse Repository
No Builds
No Audits
48d44c5471e9 T1843: recursively include IP address definitions in VIF/VIF-S definitions
Author
c-po
Browse Repository
No Builds
No Audits
6f42d44586fb T1843: add support for recursive includes
Author
c-po
Browse Repository
No Builds
No Audits
2d96dbe667de T1843: use include files for VIF/VIF-S interfaces
Author
c-po
Browse Repository
No Builds
No Audits
939c7c16a5ad T1843: use include files for IPv4/IPv6 interface address configuration
Author
c-po
Browse Repository
No Builds
No Audits
0d4d4dd840e0 T1843: run interface-definitions though GCC preprocessor
Author
c-po
Browse Repository
No Builds
No Audits

Changes (96)

Path

Size

Makefile

interface-definitions/

arp.xml

	arp.xml.in
	arp.xml

bcast-relay.xml

	bcast-relay.xml.in
	bcast-relay.xml

beep-on-boot.xml

	beep-on-boot.xml.in
	beep-on-boot.xml

cron.xml

	cron.xml.in
	cron.xml

dhcp-relay.xml

	dhcp-relay.xml.in
	dhcp-relay.xml

dhcp-server.xml

	dhcp-server.xml.in
	dhcp-server.xml

dhcpv6-relay.xml

	dhcpv6-relay.xml.in
	dhcpv6-relay.xml

dhcpv6-server.xml

	dhcpv6-server.xml.in
	dhcpv6-server.xml

dns-domain-name.xml

	dns-domain-name.xml.in
	dns-domain-name.xml

dns-dynamic.xml

	dns-dynamic.xml.in
	dns-dynamic.xml

dns-forwarding.xml

	dns-forwarding.xml.in
	dns-forwarding.xml

firewall-options.xml

	firewall-options.xml.in
	firewall-options.xml

https.xml

	https.xml.in
	https.xml

igmp-proxy.xml

	igmp-proxy.xml.in
	igmp-proxy.xml

include

address-ipv4-ipv6-dhcp.xml.i

address-ipv4-ipv6.xml.i

dhcp-dhcpv6-options.xml.i

interface-arp-cache-timeout.xml.i

interface-description.xml.i

interface-disable-link-detect.xml.i

interface-disable.xml.i

interface-enable-proxy-arp.xml.i

interface-mac.xml.i

interface-mtu-1450-9000.xml.i

interface-mtu-68-9000.xml.i

interface-proxy-arp-pvlan.xml.i

vif-s.xml.i

vif.xml.i

intel_qat.xml

	intel_qat.xml.in
	intel_qat.xml

interfaces-bonding.xml

interfaces-bonding.xml.in

interfaces-bridge.xml

	interfaces-bridge.xml.in
	interfaces-bridge.xml

interfaces-dummy.xml

interfaces-dummy.xml.in

interfaces-ethernet.xml

interfaces-ethernet.xml.in

interfaces-geneve.xml

interfaces-geneve.xml.in

interfaces-loopback.xml

interfaces-loopback.xml.in

interfaces-openvpn.xml

	interfaces-openvpn.xml.in
	interfaces-openvpn.xml

interfaces-vxlan.xml

	interfaces-vxlan.xml.in
	interfaces-vxlan.xml

interfaces-wireguard.xml

	interfaces-wireguard.xml.in
	interfaces-wireguard.xml

interfaces-wireless.xml

	interfaces-wireless.xml.in
	interfaces-wireless.xml

ipoe-server.xml

	ipoe-server.xml.in
	ipoe-server.xml

ipsec-settings.xml

	ipsec-settings.xml.in
	ipsec-settings.xml

l2tp-server.xml

	l2tp-server.xml.in
	l2tp-server.xml

mdns-repeater.xml

	mdns-repeater.xml.in
	mdns-repeater.xml

ntp.xml

	ntp.xml.in
	ntp.xml

pppoe-server.xml

	pppoe-server.xml.in
	pppoe-server.xml

pptp-server.xml

	pptp-server.xml.in
	pptp-server.xml

protocols-bfd.xml

	protocols-bfd.xml.in
	protocols-bfd.xml

snmp.xml

	snmp.xml.in
	snmp.xml

ssh.xml

	ssh.xml.in
	ssh.xml

sstp.xml

	sstp.xml.in
	sstp.xml

system-proxy.xml

	system-proxy.xml.in
	system-proxy.xml

system-syslog.xml

	system-syslog.xml.in
	system-syslog.xml

tftp-server.xml

	tftp-server.xml.in
	tftp-server.xml

vrrp.xml

	vrrp.xml.in
	vrrp.xml

rVYOSONEXbe09f1ec2bbc

View Options

Makefile

View Options

interface-definitions/arp.xml

View Options

interface-definitions/arp.xml.in

View Options

interface-definitions/bcast-relay.xml

View Options

interface-definitions/bcast-relay.xml.in

View Options

interface-definitions/beep-on-boot.xml

View Options

interface-definitions/beep-on-boot.xml.in

View Options

interface-definitions/cron.xml

View Options

interface-definitions/cron.xml.in

View Options

interface-definitions/dhcp-relay.xml

View Options

interface-definitions/dhcp-relay.xml.in

View Options

interface-definitions/dhcp-server.xml

View Options

interface-definitions/dhcp-server.xml.in

View Options

interface-definitions/dhcpv6-relay.xml

View Options

interface-definitions/dhcpv6-relay.xml.in

View Options

interface-definitions/dhcpv6-server.xml

View Options

interface-definitions/dhcpv6-server.xml.in

View Options

interface-definitions/dns-domain-name.xml

View Options

interface-definitions/dns-domain-name.xml.in

View Options

interface-definitions/dns-dynamic.xml

View Options

interface-definitions/dns-dynamic.xml.in

View Options

interface-definitions/dns-forwarding.xml

View Options

interface-definitions/dns-forwarding.xml.in

View Options

interface-definitions/firewall-options.xml

View Options

interface-definitions/firewall-options.xml.in

View Options

interface-definitions/https.xml

View Options

interface-definitions/https.xml.in

View Options

interface-definitions/igmp-proxy.xml

View Options

interface-definitions/igmp-proxy.xml.in

View Options

interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i

View Options

interface-definitions/include/address-ipv4-ipv6.xml.i

View Options

interface-definitions/include/dhcp-dhcpv6-options.xml.i

View Options

interface-definitions/include/interface-arp-cache-timeout.xml.i

View Options

interface-definitions/include/interface-description.xml.i

View Options

interface-definitions/include/interface-disable-link-detect.xml.i

View Options

interface-definitions/include/interface-disable.xml.i

View Options

interface-definitions/include/interface-enable-proxy-arp.xml.i

View Options

interface-definitions/include/interface-mac.xml.i

View Options

interface-definitions/include/interface-mtu-1450-9000.xml.i

View Options

interface-definitions/include/interface-mtu-68-9000.xml.i

View Options

interface-definitions/include/interface-proxy-arp-pvlan.xml.i

View Options

interface-definitions/include/vif-s.xml.i

View Options

interface-definitions/include/vif.xml.i

View Options

interface-definitions/intel_qat.xml

View Options

interface-definitions/intel_qat.xml.in

View Options

interface-definitions/interfaces-bonding.xml

View Options

interface-definitions/interfaces-bonding.xml.in

View Options

interface-definitions/interfaces-bridge.xml

View Options

interface-definitions/interfaces-bridge.xml.in

View Options

interface-definitions/interfaces-dummy.xml

View Options

interface-definitions/interfaces-dummy.xml.in

View Options

interface-definitions/interfaces-ethernet.xml

View Options

interface-definitions/interfaces-ethernet.xml.in

View Options

interface-definitions/interfaces-geneve.xml

View Options

interface-definitions/interfaces-geneve.xml.in

View Options

interface-definitions/interfaces-loopback.xml

View Options

interface-definitions/interfaces-loopback.xml.in

View Options

interface-definitions/interfaces-openvpn.xml

View Options

interface-definitions/interfaces-openvpn.xml.in

View Options

interface-definitions/interfaces-vxlan.xml

View Options

interface-definitions/interfaces-vxlan.xml.in

View Options

interface-definitions/interfaces-wireguard.xml

View Options

interface-definitions/interfaces-wireguard.xml.in

View Options

interface-definitions/interfaces-wireless.xml

View Options

interface-definitions/interfaces-wireless.xml.in

View Options

interface-definitions/ipoe-server.xml

View Options

interface-definitions/ipoe-server.xml.in

View Options

interface-definitions/ipsec-settings.xml

View Options

interface-definitions/ipsec-settings.xml.in

View Options

interface-definitions/l2tp-server.xml

View Options

interface-definitions/l2tp-server.xml.in

View Options

interface-definitions/mdns-repeater.xml

View Options

interface-definitions/mdns-repeater.xml.in

View Options

interface-definitions/ntp.xml

View Options

interface-definitions/ntp.xml.in

View Options

interface-definitions/pppoe-server.xml

View Options

interface-definitions/pppoe-server.xml.in

View Options

interface-definitions/pptp-server.xml

View Options

interface-definitions/pptp-server.xml.in

View Options

interface-definitions/protocols-bfd.xml

View Options

interface-definitions/protocols-bfd.xml.in

View Options

interface-definitions/snmp.xml

View Options

interface-definitions/snmp.xml.in

View Options

interface-definitions/ssh.xml

View Options

interface-definitions/ssh.xml.in

View Options

interface-definitions/sstp.xml

View Options

interface-definitions/sstp.xml.in

View Options

interface-definitions/system-proxy.xml

View Options

interface-definitions/system-proxy.xml.in

View Options

interface-definitions/system-syslog.xml

View Options

interface-definitions/system-syslog.xml.in

View Options

interface-definitions/tftp-server.xml

View Options

interface-definitions/tftp-server.xml.in

View Options

interface-definitions/vrrp.xml

View Options

interface-definitions/vrrp.xml.in

Merge pull request #178 from c-po/t1843-xml-preprocessorbe09f1ec2bbcActions

Description

Details

Event Timeline

Merged Changes

Changes (96)

rVYOSONEXbe09f1ec2bbc

Makefile

interface-definitions/arp.xml

interface-definitions/arp.xml.in

interface-definitions/bcast-relay.xml

interface-definitions/bcast-relay.xml.in

interface-definitions/beep-on-boot.xml

interface-definitions/beep-on-boot.xml.in

interface-definitions/cron.xml

interface-definitions/cron.xml.in

interface-definitions/dhcp-relay.xml

interface-definitions/dhcp-relay.xml.in

interface-definitions/dhcp-server.xml

interface-definitions/dhcp-server.xml.in

interface-definitions/dhcpv6-relay.xml

interface-definitions/dhcpv6-relay.xml.in

interface-definitions/dhcpv6-server.xml

interface-definitions/dhcpv6-server.xml.in

interface-definitions/dns-domain-name.xml

interface-definitions/dns-domain-name.xml.in

interface-definitions/dns-dynamic.xml

interface-definitions/dns-dynamic.xml.in

interface-definitions/dns-forwarding.xml

interface-definitions/dns-forwarding.xml.in

interface-definitions/firewall-options.xml

interface-definitions/firewall-options.xml.in

interface-definitions/https.xml

interface-definitions/https.xml.in

interface-definitions/igmp-proxy.xml

interface-definitions/igmp-proxy.xml.in

interface-definitions/include/address-ipv4-ipv6-dhcp.xml.i

interface-definitions/include/address-ipv4-ipv6.xml.i

interface-definitions/include/dhcp-dhcpv6-options.xml.i

interface-definitions/include/interface-arp-cache-timeout.xml.i

interface-definitions/include/interface-description.xml.i

interface-definitions/include/interface-disable-link-detect.xml.i

interface-definitions/include/interface-disable.xml.i

interface-definitions/include/interface-enable-proxy-arp.xml.i

interface-definitions/include/interface-mac.xml.i

interface-definitions/include/interface-mtu-1450-9000.xml.i

interface-definitions/include/interface-mtu-68-9000.xml.i

interface-definitions/include/interface-proxy-arp-pvlan.xml.i

interface-definitions/include/vif-s.xml.i

interface-definitions/include/vif.xml.i

interface-definitions/intel_qat.xml

interface-definitions/intel_qat.xml.in

interface-definitions/interfaces-bonding.xml

interface-definitions/interfaces-bonding.xml.in

interface-definitions/interfaces-bridge.xml

interface-definitions/interfaces-bridge.xml.in

interface-definitions/interfaces-dummy.xml

interface-definitions/interfaces-dummy.xml.in

interface-definitions/interfaces-ethernet.xml

interface-definitions/interfaces-ethernet.xml.in

interface-definitions/interfaces-geneve.xml

interface-definitions/interfaces-geneve.xml.in

interface-definitions/interfaces-loopback.xml

interface-definitions/interfaces-loopback.xml.in

interface-definitions/interfaces-openvpn.xml

interface-definitions/interfaces-openvpn.xml.in

interface-definitions/interfaces-vxlan.xml

interface-definitions/interfaces-vxlan.xml.in

interface-definitions/interfaces-wireguard.xml

interface-definitions/interfaces-wireguard.xml.in

interface-definitions/interfaces-wireless.xml

interface-definitions/interfaces-wireless.xml.in

interface-definitions/ipoe-server.xml

interface-definitions/ipoe-server.xml.in

interface-definitions/ipsec-settings.xml

interface-definitions/ipsec-settings.xml.in

interface-definitions/l2tp-server.xml

interface-definitions/l2tp-server.xml.in

interface-definitions/mdns-repeater.xml

interface-definitions/mdns-repeater.xml.in

Merge pull request #178 from c-po/t1843-xml-preprocessor
be09f1ec2bbc
Actions