diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-10-07 17:22:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-07 17:22:17 +0200 |
| commit | e8c65fafc1ea5c8682b717302a876fcff2067f3d (patch) | |
| tree | 804002269ae2dcfa2f0225ded4bc473f6c6d8a58 /interface-definitions | |
| parent | 09a4b463bf1c4b87832039f2c1d868a6c1d9c4f9 (diff) | |
| parent | 9c291d115d987cc635d1ef56898119c7d2bdfee6 (diff) | |
| download | vyos-1x-e8c65fafc1ea5c8682b717302a876fcff2067f3d.tar.gz vyos-1x-e8c65fafc1ea5c8682b717302a876fcff2067f3d.zip | |
Merge pull request #3938 from talmakion/feature/T6430-local-pbr
pbr: T6430: Local IP rules targeting VRFs by name as well as route table IDs
Diffstat (limited to 'interface-definitions')
3 files changed, 23 insertions, 18 deletions
diff --git a/interface-definitions/include/firewall/set-packet-modifications-table-and-vrf.xml.i b/interface-definitions/include/firewall/set-packet-modifications-table-and-vrf.xml.i index c7875b31d..5eb1984a5 100644 --- a/interface-definitions/include/firewall/set-packet-modifications-table-and-vrf.xml.i +++ b/interface-definitions/include/firewall/set-packet-modifications-table-and-vrf.xml.i @@ -25,24 +25,7 @@ </completionHelp> </properties> </leafNode> - <leafNode name="vrf"> - <properties> - <help>VRF to forward packet with</help> - <valueHelp> - <format>txt</format> - <description>VRF instance name</description> - </valueHelp> - <valueHelp> - <format>default</format> - <description>Forward into default global VRF</description> - </valueHelp> - <completionHelp> - <list>default</list> - <path>vrf name</path> - </completionHelp> - #include <include/constraint/vrf.xml.i> - </properties> - </leafNode> + #include <include/firewall/vrf.xml.i> </children> </node> <!-- include end --> diff --git a/interface-definitions/include/firewall/vrf.xml.i b/interface-definitions/include/firewall/vrf.xml.i new file mode 100644 index 000000000..af8ce3ab4 --- /dev/null +++ b/interface-definitions/include/firewall/vrf.xml.i @@ -0,0 +1,20 @@ +<!-- include start from firewall/vrf.xml.i --> +<leafNode name="vrf"> + <properties> + <help>VRF to forward packet with</help> + <valueHelp> + <format>txt</format> + <description>VRF instance name</description> + </valueHelp> + <valueHelp> + <format>default</format> + <description>Forward into default global VRF</description> + </valueHelp> + <completionHelp> + <list>default</list> + <path>vrf name</path> + </completionHelp> + #include <include/constraint/vrf.xml.i> + </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/policy_local-route.xml.in b/interface-definitions/policy_local-route.xml.in index 7a019154a..9f6588db8 100644 --- a/interface-definitions/policy_local-route.xml.in +++ b/interface-definitions/policy_local-route.xml.in @@ -39,6 +39,7 @@ </completionHelp> </properties> </leafNode> + #include <include/firewall/vrf.xml.i> </children> </node> <leafNode name="fwmark"> @@ -113,6 +114,7 @@ </completionHelp> </properties> </leafNode> + #include <include/firewall/vrf.xml.i> </children> </node> <leafNode name="fwmark"> |