diff options
| author | Daniil Baturin <daniil@vyos.io> | 2021-06-19 17:31:57 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-19 17:31:57 +0700 |
| commit | 680d804eab15e0aa81d47aca7a292aa8007d6463 (patch) | |
| tree | 8e569d0fa2a62a94ec8042a9407206b23f8a46f4 | |
| parent | f6d9d6e3b9a30b9ce7194e13bacc066cc5218bcf (diff) | |
| parent | 2c6ec4330384606fb25b8afb5ef1831320715917 (diff) | |
| download | vyatta-cfg-quagga-680d804eab15e0aa81d47aca7a292aa8007d6463.tar.gz vyatta-cfg-quagga-680d804eab15e0aa81d47aca7a292aa8007d6463.zip | |
Merge pull request #82 from c-po/crux
route-map: T3632: fix invalid validation regex for extcommunity-rt and extcommunity-soo
| -rw-r--r-- | templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-rt/node.def | 6 | ||||
| -rw-r--r-- | templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-soo/node.def | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-rt/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-rt/node.def index 6338ca50..bffb449f 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-rt/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-rt/node.def @@ -1,8 +1,10 @@ type: txt help: Set route target value -val_help: ASN:nn_or_IP_address:nn VPN extended community +val_help: ASN:NN; based on autonomous system number +val_help: IP:NN; Based on a router-id IP address + +syntax:expression: exec "${vyos_libexec_dir}/validate-value.py --regex \'^((?:[0-9]{1,3}\\.){3}[0-9]{1,3}|\\d+):\\d+$\' --value \'$VAR(@)\'"; "Should be in form: ASN:NN or IPADDR:NN where ASN is autonomous system number" -syntax:expression: pattern $VAR(@) "\d+:\d+(\.\d+\.\d+\.\d+):\d+" ; "Should be in form: ASN:nn_or_IP_address:nn where ASN is autonomous system number" commit:expression: $VAR(../../action/) != ""; "you must specify an action" update: vtysh -c "configure terminal" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-soo/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-soo/node.def index e76243dd..ba51f23f 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-soo/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/set/extcommunity-soo/node.def @@ -1,8 +1,10 @@ type: txt -help: Set Site of Origin value. -val_help: ASN:nn_or_IP_address:nn VPN extended community +help: Set Site of Origin value +val_help: ASN:NN; based on autonomous system number +val_help: IP:NN; Based on a router-id IP address + +syntax:expression: exec "${vyos_libexec_dir}/validate-value.py --regex \'^((?:[0-9]{1,3}\\.){3}[0-9]{1,3}|\\d+):\\d+$\' --value \'$VAR(@)\'"; "Should be in form: ASN:NN or IPADDR:NN where ASN is autonomous system number" -syntax:expression: pattern $VAR(@) "\d+:\d+(\.\d+\.\d+\.\d+):\d+" ; "Should be in form: ASN:nn_or_IP_address:nn where ASN is autonomous system number" commit:expression: $VAR(../../action/) != ""; "you must specify an action" update: vtysh -c "configure terminal" \ |