diff options
| author | Saurabh Mohan <saurabh.mohan@vyatta.com> | 2013-01-22 12:30:17 -0800 |
|---|---|---|
| committer | Saurabh Mohan <saurabh.mohan@vyatta.com> | 2013-01-22 12:30:17 -0800 |
| commit | 318f4cd607204b98b323824127b3d969b41a8b86 (patch) | |
| tree | 23dd75af07275a1754ad5721cf1dc70093dc92db /templates/interfaces | |
| parent | ead1a08f4606b6eddf9d09b2820ba0dbc17f2495 (diff) | |
| download | vyatta-cfg-system-318f4cd607204b98b323824127b3d969b41a8b86.tar.gz vyatta-cfg-system-318f4cd607204b98b323824127b3d969b41a8b86.zip | |
Dmvpn merge with mirantis jan22-2013
Diffstat (limited to 'templates/interfaces')
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/encapsulation/node.def | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def index bb93e373..b858147c 100644 --- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def +++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def @@ -1,9 +1,9 @@ type: txt help: Encapsulation of this tunnel interface [REQUIRED] -syntax:expression: $VAR(@) in "ipip", "gre", "sit", "gre-bridge", "ipip6", "ip6ip6", "gre-multipoint"; "Must be (ipip, gre, gre-bridge, gre-multipoint, sit, ipip6, ip6ip6)" +syntax:expression: ((pattern $VAR(@) "^[-a-zA-Z0-9_]+$") && (exec "sudo /opt/vyatta/sbin/vyatta-encapsulation $VAR(@)")) -allowed: echo gre gre-bridge ipip sit ipip6 ip6ip6 gre-multipoint +allowed: sudo /opt/vyatta/sbin/vyatta-encapsulation commit:expression: (!(pattern $VAR(../local-ip/@) ".*:.*") && $VAR(@) == "gre-multipoint") || \ $VAR(@) != "gre-multipoint"; "IPv6 local-ip ($VAR(../local-ip/@)) is forbidden for gre-multipoint encapsulation type." @@ -30,7 +30,7 @@ update:expression: "false" ; \ val_help: gre; Generic Routing Encapsulation val_help: gre-bridge; Generic Routing Encapsulation bridge interface -val_help: gre-multipoint; Multipoint Generic Routing Encapsulation +val_help: gre-multipoint; Multipoint Generic Routing Encapsulation(allowed if the package vyatta-nhrp installed) val_help: ipip; IP in IP encapsulation val_help: sit; Simple Internet Transition encapsulation val_help: ipip6; IP in IP6 encapsulation |