diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-05-12 18:38:48 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-05-12 18:40:54 -0700 |
| commit | ab587ce0c92b5aeeb26eb678946a7e1faa6f9db1 (patch) | |
| tree | 93a9ef4f52ffc332c3a76e842c614a03d389fc03 /templates | |
| parent | 8f2edd81ecdbfa74beff7f54deac1d83dab82416 (diff) | |
| download | vyatta-cfg-system-ab587ce0c92b5aeeb26eb678946a7e1faa6f9db1.tar.gz vyatta-cfg-system-ab587ce0c92b5aeeb26eb678946a7e1faa6f9db1.zip | |
Better version of SNMP IPv6 support
Need to use different syntax for community values on IPv6
versus IPv4
Diffstat (limited to 'templates')
7 files changed, 24 insertions, 4 deletions
diff --git a/templates/service/snmp/community6/node.def b/templates/service/snmp/community6/node.def new file mode 100644 index 00000000..32eb4800 --- /dev/null +++ b/templates/service/snmp/community6/node.def @@ -0,0 +1,5 @@ +tag: +type: txt +help: Set community name [REQUIRED] +syntax:expression: pattern $VAR(@) "^[^%]+$" ; \ + "Community string may not contain %" diff --git a/templates/service/snmp/community6/node.tag/authorization/node.def b/templates/service/snmp/community6/node.tag/authorization/node.def new file mode 100644 index 00000000..c8918d43 --- /dev/null +++ b/templates/service/snmp/community6/node.tag/authorization/node.def @@ -0,0 +1,7 @@ +type: txt +default: "ro" +help: Set authorization type (rw or ro) (default: ro) +syntax:expression: $VAR(@) in "ro", "rw"; "Authorization type must be either rw or ro" + + + diff --git a/templates/service/snmp/community6/node.tag/client/node.def b/templates/service/snmp/community6/node.tag/client/node.def new file mode 100644 index 00000000..fddbcb91 --- /dev/null +++ b/templates/service/snmp/community6/node.tag/client/node.def @@ -0,0 +1,3 @@ +multi: +type: ipv6 +help: Set IPv6 address of SNMP client allowed to contact system diff --git a/templates/service/snmp/community6/node.tag/network/node.def b/templates/service/snmp/community6/node.tag/network/node.def new file mode 100644 index 00000000..266a1bce --- /dev/null +++ b/templates/service/snmp/community6/node.tag/network/node.def @@ -0,0 +1,4 @@ +multi: +type: ipv6net +help: Set subnet of SNMP client(s) allowed to contact system +syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)" diff --git a/templates/service/snmp/node.def b/templates/service/snmp/node.def index 13b39fa7..2952eb34 100644 --- a/templates/service/snmp/node.def +++ b/templates/service/snmp/node.def @@ -1,6 +1,7 @@ priority: 980 help: Configure Simple Network Management Protocol (SNMP) -commit:expression: $VAR(community/) != ""; "must configure a community" +commit:expression: $VAR(community/) != "" || $VAR(community6/) != "" \ + ; "must configure a community or community6" delete: touch /tmp/snmp.$PPID end:if [ -f "/tmp/snmp.$PPID" ] diff --git a/templates/service/snmp/trap-source/node.def b/templates/service/snmp/trap-source/node.def index d8add72c..61a8cd6a 100644 --- a/templates/service/snmp/trap-source/node.def +++ b/templates/service/snmp/trap-source/node.def @@ -1,2 +1,2 @@ -type: ipv4 +type: ipv4,ipv6 help: Set SNMP trap source address diff --git a/templates/service/snmp/trap-target/node.def b/templates/service/snmp/trap-target/node.def index 493484b7..561bc1ac 100644 --- a/templates/service/snmp/trap-target/node.def +++ b/templates/service/snmp/trap-target/node.def @@ -1,3 +1,3 @@ tag: -type: ipv4 -help: Set IP address of trap target +type: ipv4,ipv6 +help: Set address of trap target |