diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-04-02 11:16:54 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-04-02 11:16:54 +0200 |
| commit | 0f04a5e47e02984a044e90b631033d844eec9ed3 (patch) | |
| tree | fe572bf482f169a556565f5bb378c478688d0b74 /interface-definitions | |
| parent | b01065a762e3e56100d3eb73136bc279f2041ce3 (diff) | |
| download | vyos-1x-0f04a5e47e02984a044e90b631033d844eec9ed3.tar.gz vyos-1x-0f04a5e47e02984a044e90b631033d844eec9ed3.zip | |
Revert "static: route: arp: T3170: prevent empty node.def from beeing generated"
This reverts commit d8c27642a3753513ae1d3c433fa46858a5ee946c.
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/protocols-static-arp.xml.in | 37 | ||||
| -rw-r--r-- | interface-definitions/protocols-static.xml.in | 78 |
2 files changed, 63 insertions, 52 deletions
diff --git a/interface-definitions/protocols-static-arp.xml.in b/interface-definitions/protocols-static-arp.xml.in new file mode 100644 index 000000000..e5e8a9ad9 --- /dev/null +++ b/interface-definitions/protocols-static-arp.xml.in @@ -0,0 +1,37 @@ +<?xml version="1.0"?> +<interfaceDefinition> + <node name="protocols"> + <children> + <node name="static"> + <children> + <tagNode name="arp" owner="${vyos_conf_scripts_dir}/arp.py"> + <properties> + <help>Static ARP translation</help> + <valueHelp> + <format>ipv4</format> + <description>IPv4 destination address</description> + </valueHelp> + <constraint> + <validator name="ipv4-address"/> + </constraint> + </properties> + <children> + <leafNode name="hwaddr"> + <properties> + <help>Translation MAC address</help> + <valueHelp> + <format>macaddr</format> + <description>Hardware (MAC) address</description> + </valueHelp> + <constraint> + <validator name="mac-address"/> + </constraint> + </properties> + </leafNode> + </children> + </tagNode> + </children> + </node> + </children> + </node> +</interfaceDefinition> diff --git a/interface-definitions/protocols-static.xml.in b/interface-definitions/protocols-static.xml.in index 2b1b0082a..ab60649a0 100644 --- a/interface-definitions/protocols-static.xml.in +++ b/interface-definitions/protocols-static.xml.in @@ -2,58 +2,32 @@ <interfaceDefinition> <node name="protocols"> <children> - <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py"> - <properties> - <help>Static route parameters</help> - <priority>480</priority> - </properties> - <children> - <tagNode name="arp" owner="${vyos_conf_scripts_dir}/arp.py"> - <properties> - <help>Static ARP translation</help> - <valueHelp> - <format>ipv4</format> - <description>IPv4 destination address</description> - </valueHelp> - <constraint> - <validator name="ipv4-address"/> - </constraint> - </properties> - <children> - <leafNode name="hwaddr"> - <properties> - <help>Translation MAC address</help> - <valueHelp> - <format>macaddr</format> - <description>Hardware (MAC) address</description> - </valueHelp> - <constraint> - <validator name="mac-address"/> - </constraint> - </properties> - </leafNode> - </children> - </tagNode> - #include <include/static/static-route-map.xml.i> - #include <include/static/static-route.xml.i> - #include <include/static/static-route6.xml.i> - <tagNode name="table"> - <properties> - <help>Policy route table number</help> - <valueHelp> - <format>u32:1-200</format> - <description>Policy route table number</description> - </valueHelp> - <constraint> - <validator name="numeric" argument="--range 1-200"/> - </constraint> - </properties> - <children> - #include <include/static/static-route.xml.i> - #include <include/static/static-route6.xml.i> - </children> - </tagNode> - </children> + <node name="static" owner="${vyos_conf_scripts_dir}/protocols_static.py"> + <properties> + <help>Static route parameters</help> + <priority>480</priority> + </properties> + <children> + #include <include/static/static-route-map.xml.i> + #include <include/static/static-route.xml.i> + #include <include/static/static-route6.xml.i> + <tagNode name="table"> + <properties> + <help>Policy route table number</help> + <valueHelp> + <format>u32:1-200</format> + <description>Policy route table number</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-200"/> + </constraint> + </properties> + <children> + #include <include/static/static-route.xml.i> + #include <include/static/static-route6.xml.i> + </children> + </tagNode> + </children> </node> </children> </node> |