diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-02-16 07:46:26 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-16 07:46:26 +0700 |
| commit | 366f04449ef9d98e31326f194c07f5d7255a59d6 (patch) | |
| tree | 8c0d48a6d757d5563572f47e5513d81461f752b3 | |
| parent | eabbef4dd3b3e9a6a4cff57f72d2c82d88294968 (diff) | |
| parent | df9ec27eafefce2f280ea35a9b91d7783a7d419d (diff) | |
| download | vyatta-cfg-quagga-366f04449ef9d98e31326f194c07f5d7255a59d6.tar.gz vyatta-cfg-quagga-366f04449ef9d98e31326f194c07f5d7255a59d6.zip | |
T545: Merge pull request #17 from nicko170/current
Fixing IPv6 next-hop in route-map
3 files changed, 11 insertions, 31 deletions
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def deleted file mode 100644 index 18b6a1ce..00000000 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/access-list/node.def +++ /dev/null @@ -1,15 +0,0 @@ -type: txt -help: IPv6 access-list6 to match -val_help: IPv6 access list - -commit:expression: $VAR(../prefix-list/) == ""; "you may only specify a prefix-list or access-list" -commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list6 $VAR(@)\" "; "access-list6 $VAR(@) does not exist" -commit:expression: $VAR(../../../../action/) != ""; "you must specify an action" - -update: vtysh -c "configure terminal" \ - -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ - -c "match ipv6 next-hop $VAR(@)" - -delete: vtysh -c "configure terminal" \ - -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ - -c "no match ipv6 next-hop $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def index 31b6bd93..b5757965 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/node.def @@ -1 +1,11 @@ -help: IP next-hop of route to match +help: IPv6 next-hop of route to match +type: ipv6 +val_help: next-hop ipv6 address IPv6 + +update: vtysh -c "configure terminal" \ + -c "route-map $VAR(../../../../@) $VAR(../../../action/@) $VAR(../../../@)" \ + -c "match ipv6 next-hop $VAR(@)" + +delete: vtysh -c "configure terminal" \ + -c "route-map $VAR(../../../../@) $VAR(../../../action/@) $VAR(../../../@)" \ + -c "no match ipv6 next-hop $VAR(@)" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def deleted file mode 100644 index ec9a4d2f..00000000 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/nexthop/prefix-list/node.def +++ /dev/null @@ -1,15 +0,0 @@ -type: txt -help: IPv6 prefix-list to match -val_help: IPv6 prefix list name - -commit:expression: $VAR(../access-list/) == ""; "you can only specify a prefix-list or access-list" -commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $VAR(@)\" "; "prefix-list $VAR(@) does not exist" -commit:expression: $VAR(../../../../action/) != ""; "you must specify an action" - -update: vtysh -c "configure terminal" \ - -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ - -c "match ipv6 next-hop prefix-list $VAR(@)" - -delete: vtysh -c "configure terminal" \ - -c "route-map $VAR(../../../../../@) $VAR(../../../../action/@) $VAR(../../../../@)" \ - -c "no match ipv6 next-hop prefix-list $VAR(@)" |