diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-06-23 18:43:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 18:43:15 +0200 |
| commit | 48ee777481e4dedf645c6b618ce94597bbcd20d4 (patch) | |
| tree | 2822edd550a613e21ecb50fea6cd971d11cc681b /interface-definitions | |
| parent | 7e4bd9459dc7a319604922dc4df4549163b82fcb (diff) | |
| parent | f4ed92200cda5fbc25be3195e7e8f21b3ada2e24 (diff) | |
| download | vyos-1x-48ee777481e4dedf645c6b618ce94597bbcd20d4.tar.gz vyos-1x-48ee777481e4dedf645c6b618ce94597bbcd20d4.zip | |
Merge pull request #472 from thomas-mangin/T2633
tunnel: T2633: add support for ip (arp) commands
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/interface-ipv4.xml.i | 11 | ||||
| -rw-r--r-- | interface-definitions/include/interface-ipv6.xml.i | 10 | ||||
| -rw-r--r-- | interface-definitions/interfaces-tunnel.xml.in | 9 |
3 files changed, 23 insertions, 7 deletions
diff --git a/interface-definitions/include/interface-ipv4.xml.i b/interface-definitions/include/interface-ipv4.xml.i new file mode 100644 index 000000000..15932a9d3 --- /dev/null +++ b/interface-definitions/include/interface-ipv4.xml.i @@ -0,0 +1,11 @@ +<node name="ip"> + <properties> + <help>IPv4 routing parameters</help> + </properties> + <children> + #include <include/interface-disable-arp-filter.xml.i> + #include <include/interface-enable-arp-accept.xml.i> + #include <include/interface-enable-arp-announce.xml.i> + #include <include/interface-enable-arp-ignore.xml.i> + </children> +</node> diff --git a/interface-definitions/include/interface-ipv6.xml.i b/interface-definitions/include/interface-ipv6.xml.i new file mode 100644 index 000000000..23362f75a --- /dev/null +++ b/interface-definitions/include/interface-ipv6.xml.i @@ -0,0 +1,10 @@ +<node name="ipv6"> + <properties> + <help>IPv6 routing parameters</help> + </properties> + <children> + #include <include/ipv6-address.xml.i> + #include <include/ipv6-disable-forwarding.xml.i> + #include <include/ipv6-dup-addr-detect-transmits.xml.i> + </children> +</node> diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in index a38a73e15..64520ce99 100644 --- a/interface-definitions/interfaces-tunnel.xml.in +++ b/interface-definitions/interfaces-tunnel.xml.in @@ -22,13 +22,8 @@ #include <include/interface-disable-link-detect.xml.i> #include <include/interface-vrf.xml.i> #include <include/interface-mtu-64-8024.xml.i> - <node name="ipv6"> - <children> - #include <include/ipv6-address.xml.i> - #include <include/ipv6-disable-forwarding.xml.i> - #include <include/ipv6-dup-addr-detect-transmits.xml.i> - </children> - </node> + #include <include/interface-ipv4.xml.i> + #include <include/interface-ipv6.xml.i> <leafNode name="local-ip"> <properties> <help>Local IP address for this tunnel</help> |