From 5ffc3d04434de0e463393c8e6d624072990c6a7e Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Thu, 27 Apr 2017 16:38:52 +0200
Subject: snmpd would not start when V3 was configured Updated all snmpd daemon
 commands to systemd type.

---
 templates/service/snmp/node.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/service/snmp/node.def')

diff --git a/templates/service/snmp/node.def b/templates/service/snmp/node.def
index 9fb161dc..7c8c372b 100644
--- a/templates/service/snmp/node.def
+++ b/templates/service/snmp/node.def
@@ -22,6 +22,6 @@ end:if [ -f "/tmp/snmp.$PPID" ]
 	  then
 	    sudo /opt/vyatta/sbin/vyatta-snmp-v3.pl --update-snmp;
 	  else
-	    sudo invoke-rc.d snmpd start  > /dev/null 2>&1;
+	    sudo systemctl start snmpd.service  > /dev/null 2>&1;
 	fi
       fi
-- 
cgit v1.2.3


From c7f0ea5d37da2c7e555e6f0aae1390c84a682c0e Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 4 Jun 2018 20:23:37 +0200
Subject: T652: Rewrite service snmp in new style XML interface definition

Perl scripts will be removed when op mode commands are implemented.
---
 templates/service/snmp/community/node.def          |  5 ----
 .../snmp/community/node.tag/authorization/node.def |  8 ------
 .../snmp/community/node.tag/client/node.def        |  3 ---
 .../snmp/community/node.tag/network/node.def       |  4 ---
 templates/service/snmp/contact/node.def            |  6 -----
 templates/service/snmp/description/node.def        |  6 -----
 templates/service/snmp/listen-address/node.def     |  3 ---
 .../snmp/listen-address/node.tag/port/node.def     |  7 -----
 templates/service/snmp/location/node.def           |  6 -----
 templates/service/snmp/node.def                    | 27 -------------------
 templates/service/snmp/smux-peer/node.def          |  4 ---
 templates/service/snmp/trap-source/node.def        |  2 --
 templates/service/snmp/trap-target/node.def        |  3 ---
 .../snmp/trap-target/node.tag/community/node.def   |  2 --
 .../snmp/trap-target/node.tag/port/node.def        |  6 -----
 templates/service/snmp/v3/engineid/node.def        |  3 ---
 templates/service/snmp/v3/group/node.def           |  8 ------
 .../service/snmp/v3/group/node.tag/mode/node.def   |  8 ------
 .../snmp/v3/group/node.tag/seclevel/node.def       |  7 -----
 .../service/snmp/v3/group/node.tag/view/node.def   | 11 --------
 templates/service/snmp/v3/node.def                 | 30 ----------------------
 templates/service/snmp/v3/trap-target/node.def     | 14 ----------
 .../node.tag/auth/encrypted-key/node.def           |  3 ---
 .../snmp/v3/trap-target/node.tag/auth/node.def     |  4 ---
 .../node.tag/auth/plaintext-key/node.def           |  3 ---
 .../v3/trap-target/node.tag/auth/type/node.def     |  8 ------
 .../snmp/v3/trap-target/node.tag/engineid/node.def |  3 ---
 .../snmp/v3/trap-target/node.tag/port/node.def     |  7 -----
 .../node.tag/privacy/encrypted-key/node.def        |  3 ---
 .../snmp/v3/trap-target/node.tag/privacy/node.def  |  4 ---
 .../node.tag/privacy/plaintext-key/node.def        |  3 ---
 .../v3/trap-target/node.tag/privacy/type/node.def  |  8 ------
 .../snmp/v3/trap-target/node.tag/protocol/node.def |  8 ------
 .../snmp/v3/trap-target/node.tag/type/node.def     |  8 ------
 .../snmp/v3/trap-target/node.tag/user/node.def     |  4 ---
 templates/service/snmp/v3/tsm/local-key/node.def   | 14 ----------
 templates/service/snmp/v3/tsm/node.def             |  3 ---
 templates/service/snmp/v3/tsm/port/node.def        |  7 -----
 templates/service/snmp/v3/user/node.def            |  7 -----
 .../v3/user/node.tag/auth/encrypted-key/node.def   |  2 --
 .../service/snmp/v3/user/node.tag/auth/node.def    |  3 ---
 .../v3/user/node.tag/auth/plaintext-key/node.def   |  6 -----
 .../snmp/v3/user/node.tag/auth/type/node.def       |  8 ------
 .../snmp/v3/user/node.tag/engineid/node.def        |  3 ---
 .../service/snmp/v3/user/node.tag/group/node.def   | 11 --------
 .../service/snmp/v3/user/node.tag/mode/node.def    |  8 ------
 .../user/node.tag/privacy/encrypted-key/node.def   |  2 --
 .../service/snmp/v3/user/node.tag/privacy/node.def |  3 ---
 .../user/node.tag/privacy/plaintext-key/node.def   |  6 -----
 .../snmp/v3/user/node.tag/privacy/type/node.def    |  8 ------
 .../service/snmp/v3/user/node.tag/tsm-key/node.def | 14 ----------
 templates/service/snmp/v3/view/node.def            |  6 -----
 .../service/snmp/v3/view/node.tag/oid/node.def     |  4 ---
 .../v3/view/node.tag/oid/node.tag/exclude/node.def |  1 -
 .../v3/view/node.tag/oid/node.tag/mask/node.def    |  4 ---
 55 files changed, 359 deletions(-)
 delete mode 100644 templates/service/snmp/community/node.def
 delete mode 100644 templates/service/snmp/community/node.tag/authorization/node.def
 delete mode 100644 templates/service/snmp/community/node.tag/client/node.def
 delete mode 100644 templates/service/snmp/community/node.tag/network/node.def
 delete mode 100644 templates/service/snmp/contact/node.def
 delete mode 100644 templates/service/snmp/description/node.def
 delete mode 100644 templates/service/snmp/listen-address/node.def
 delete mode 100644 templates/service/snmp/listen-address/node.tag/port/node.def
 delete mode 100644 templates/service/snmp/location/node.def
 delete mode 100644 templates/service/snmp/node.def
 delete mode 100644 templates/service/snmp/smux-peer/node.def
 delete mode 100644 templates/service/snmp/trap-source/node.def
 delete mode 100644 templates/service/snmp/trap-target/node.def
 delete mode 100644 templates/service/snmp/trap-target/node.tag/community/node.def
 delete mode 100644 templates/service/snmp/trap-target/node.tag/port/node.def
 delete mode 100644 templates/service/snmp/v3/engineid/node.def
 delete mode 100644 templates/service/snmp/v3/group/node.def
 delete mode 100644 templates/service/snmp/v3/group/node.tag/mode/node.def
 delete mode 100644 templates/service/snmp/v3/group/node.tag/seclevel/node.def
 delete mode 100644 templates/service/snmp/v3/group/node.tag/view/node.def
 delete mode 100644 templates/service/snmp/v3/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/auth/encrypted-key/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/auth/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/auth/plaintext-key/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/auth/type/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/engineid/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/port/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/privacy/encrypted-key/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/privacy/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/privacy/plaintext-key/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/privacy/type/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/protocol/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/type/node.def
 delete mode 100644 templates/service/snmp/v3/trap-target/node.tag/user/node.def
 delete mode 100644 templates/service/snmp/v3/tsm/local-key/node.def
 delete mode 100644 templates/service/snmp/v3/tsm/node.def
 delete mode 100644 templates/service/snmp/v3/tsm/port/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/auth/encrypted-key/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/auth/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/auth/plaintext-key/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/auth/type/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/engineid/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/group/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/mode/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/privacy/encrypted-key/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/privacy/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/privacy/plaintext-key/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/privacy/type/node.def
 delete mode 100644 templates/service/snmp/v3/user/node.tag/tsm-key/node.def
 delete mode 100644 templates/service/snmp/v3/view/node.def
 delete mode 100644 templates/service/snmp/v3/view/node.tag/oid/node.def
 delete mode 100644 templates/service/snmp/v3/view/node.tag/oid/node.tag/exclude/node.def
 delete mode 100644 templates/service/snmp/v3/view/node.tag/oid/node.tag/mask/node.def

(limited to 'templates/service/snmp/node.def')

diff --git a/templates/service/snmp/community/node.def b/templates/service/snmp/community/node.def
deleted file mode 100644
index d7e3ade7..00000000
--- a/templates/service/snmp/community/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: txt
-help: Community name [REQUIRED]
-syntax:expression: pattern $VAR(@) "^[^%]+$" ; \
-		   "Community string may not contain %"
diff --git a/templates/service/snmp/community/node.tag/authorization/node.def b/templates/service/snmp/community/node.tag/authorization/node.def
deleted file mode 100644
index 3d306d59..00000000
--- a/templates/service/snmp/community/node.tag/authorization/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "ro"
-allowed: echo ro rw
-help: 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/community/node.tag/client/node.def b/templates/service/snmp/community/node.tag/client/node.def
deleted file mode 100644
index 37493268..00000000
--- a/templates/service/snmp/community/node.tag/client/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-multi:
-type: ipv4,ipv6
-help: IP address of SNMP client allowed to contact system
diff --git a/templates/service/snmp/community/node.tag/network/node.def b/templates/service/snmp/community/node.tag/network/node.def
deleted file mode 100644
index d9afa4e5..00000000
--- a/templates/service/snmp/community/node.tag/network/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-multi:
-type: ipv4net,ipv6net
-help: 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/contact/node.def b/templates/service/snmp/contact/node.def
deleted file mode 100644
index 63a368cc..00000000
--- a/templates/service/snmp/contact/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Contact information
-
-syntax:expression: pattern $VAR(@) "^[[:print:]]{1,255}$" ; \
-                   "Contact information is limited to 255 characters or less"
-
diff --git a/templates/service/snmp/description/node.def b/templates/service/snmp/description/node.def
deleted file mode 100644
index cd88099a..00000000
--- a/templates/service/snmp/description/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Description information
-
-syntax:expression: pattern $VAR(@) "^[[:print:]]{1,255}$" ; \
-                   "Description is limited to 255 characters or less"
-
diff --git a/templates/service/snmp/listen-address/node.def b/templates/service/snmp/listen-address/node.def
deleted file mode 100644
index 9a9c591f..00000000
--- a/templates/service/snmp/listen-address/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-tag:
-type: ipv4,ipv6
-help: IP address to listen for incoming SNMP requests
diff --git a/templates/service/snmp/listen-address/node.tag/port/node.def b/templates/service/snmp/listen-address/node.tag/port/node.def
deleted file mode 100644
index b37939bd..00000000
--- a/templates/service/snmp/listen-address/node.tag/port/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type:  u32 
-default:  161
-help: Port for SNMP service
-
-val_help: u32:1-65535; Numeric IP port
-syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \
-	"Port number must be in range 1 to 65535"
diff --git a/templates/service/snmp/location/node.def b/templates/service/snmp/location/node.def
deleted file mode 100644
index 903b405f..00000000
--- a/templates/service/snmp/location/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Location information
-
-syntax:expression: pattern $VAR(@) "^[[:print:]]{1,255}$" ; \
-                   "Location is limited to 255 characters or less"
-
diff --git a/templates/service/snmp/node.def b/templates/service/snmp/node.def
deleted file mode 100644
index 7c8c372b..00000000
--- a/templates/service/snmp/node.def
+++ /dev/null
@@ -1,27 +0,0 @@
-priority: 980
-help: Simple Network Management Protocol (SNMP)
-commit:expression: $VAR(community/) != "" || $VAR(community6/) != "" || $VAR(v3/) != "" \
-		   ; "must configure a community or community6 or v3"
-
-create: if [ ! -d "/config/snmp" ]; then sudo mkdir /config/snmp ; fi
-delete: touch /tmp/snmp.$PPID
-end:if [ -f "/tmp/snmp.$PPID" ]
-      then
-	 sudo /opt/vyatta/sbin/vyatta-snmp.pl --stop-snmp;
-         rm /tmp/snmp.$PPID;
-	 sudo rm -f /etc/snmp/snmpd.conf;
-      else
-        if [ -n "$VAR(v3/)" ]; then
-	  sudo /opt/vyatta/sbin/vyatta-snmp-v3.pl --check-config;
-	  if [ $? != 0 ]; then
-	    exit 1;
-	  fi
-        fi
-        sudo /opt/vyatta/sbin/vyatta-snmp.pl --update-snmp;
-        if [ -n "$VAR(v3/)" ]
-	  then
-	    sudo /opt/vyatta/sbin/vyatta-snmp-v3.pl --update-snmp;
-	  else
-	    sudo systemctl start snmpd.service  > /dev/null 2>&1;
-	fi
-      fi
diff --git a/templates/service/snmp/smux-peer/node.def b/templates/service/snmp/smux-peer/node.def
deleted file mode 100644
index 638e9367..00000000
--- a/templates/service/snmp/smux-peer/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-multi:
-type: txt
-help: Register a subtree for SMUX-based processing
-val_help: oid; Object Identifier
diff --git a/templates/service/snmp/trap-source/node.def b/templates/service/snmp/trap-source/node.def
deleted file mode 100644
index a4b2617f..00000000
--- a/templates/service/snmp/trap-source/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4,ipv6
-help: SNMP trap source address
diff --git a/templates/service/snmp/trap-target/node.def b/templates/service/snmp/trap-target/node.def
deleted file mode 100644
index cf0c963c..00000000
--- a/templates/service/snmp/trap-target/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-tag:
-type: ipv4,ipv6
-help: Address of trap target
diff --git a/templates/service/snmp/trap-target/node.tag/community/node.def b/templates/service/snmp/trap-target/node.tag/community/node.def
deleted file mode 100644
index 3b4068a8..00000000
--- a/templates/service/snmp/trap-target/node.tag/community/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Community used when sending trap information
diff --git a/templates/service/snmp/trap-target/node.tag/port/node.def b/templates/service/snmp/trap-target/node.tag/port/node.def
deleted file mode 100644
index d5ee579a..00000000
--- a/templates/service/snmp/trap-target/node.tag/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: Destination port used for trap notification
-
-val_help: u32:1-65535; Numeric IP port
-syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \
-	"Port number must be in range 1 to 65535"
diff --git a/templates/service/snmp/v3/engineid/node.def b/templates/service/snmp/v3/engineid/node.def
deleted file mode 100644
index f8de80cc..00000000
--- a/templates/service/snmp/v3/engineid/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Specifies the EngineID as a hex value (e.g., 0xff42)
-syntax:expression: pattern $VAR(@) "^(0x){0,1}([0-9a-f][0-9a-f]){1,18}$" ; "id must contain an even number (from 2 to 36) of hex digits"
diff --git a/templates/service/snmp/v3/group/node.def b/templates/service/snmp/v3/group/node.def
deleted file mode 100644
index 95d0413c..00000000
--- a/templates/service/snmp/v3/group/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-type: txt
-help: Specifies the group with name groupname
-syntax:expression: pattern $VAR(@) "^[^\(\)\|\&-]+$" ; "illegal characters in name"
-syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_snmp_name.pl $VAR(@)"
-commit:expression: $VAR(view/) != "" ; "must specify view"
-commit:expression: $VAR(mode/) != "" ; "must specify mode"
-commit:expression: $VAR(seclevel/) != "" ; "must specify security level"
diff --git a/templates/service/snmp/v3/group/node.tag/mode/node.def b/templates/service/snmp/v3/group/node.tag/mode/node.def
deleted file mode 100644
index a6d36de5..00000000
--- a/templates/service/snmp/v3/group/node.tag/mode/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "ro"
-help: Defines the read/write access
-syntax:expression: $VAR(@) in "ro", "rw"
-allowed: echo ro rw
-
-val_help: ro;
-val_help: rw;
diff --git a/templates/service/snmp/v3/group/node.tag/seclevel/node.def b/templates/service/snmp/v3/group/node.tag/seclevel/node.def
deleted file mode 100644
index 2b0aa67b..00000000
--- a/templates/service/snmp/v3/group/node.tag/seclevel/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Defines security level
-syntax:expression: $VAR(@) in "auth", "priv"
-allowed: echo auth priv
-
-val_help: priv;
-val_help: auth;
diff --git a/templates/service/snmp/v3/group/node.tag/view/node.def b/templates/service/snmp/v3/group/node.tag/view/node.def
deleted file mode 100644
index af7d33c9..00000000
--- a/templates/service/snmp/v3/group/node.tag/view/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: txt
-help: Defines the name of view
-allowed: list=`cli-shell-api listNodes service snmp v3 view`
-  echo $list
-syntax:expression:exec "regex=\"(^| )$VAR(@)( |$)\"; \
-    if [[ \"$VAR(/service/snmp/v3/view/@@)\" =~ $regex ]] ; \
-    then \
-      exit 0; \
-    else \
-      exit 1; \
-    fi" ; "You must create \"$VAR(@)\" view first"
diff --git a/templates/service/snmp/v3/node.def b/templates/service/snmp/v3/node.def
deleted file mode 100644
index f89d2328..00000000
--- a/templates/service/snmp/v3/node.def
+++ /dev/null
@@ -1,30 +0,0 @@
-help: Simple Network Management Protocol (SNMP) v3
-
-create: if [ ! -d "/config/snmp/tls" ]; then
-      sudo mkdir /config/snmp/tls ; 
-      if [ -d "/etc/snmp/tls" ] ; then 
-	sudo mv /etc/snmp/tls/* /config/snmp/tls > /dev/null 2>&1;
-	sudo chmod -R 600 /config/snmp/tls;
-	sudo rmdir /etc/snmp/tls > /dev/null 2>&1;
-	sudo rm /etc/snmp/tls > /dev/null 2>&1;
-      fi
-      sudo ln -s /config/snmp/tls /etc/snmp/tls;
-    fi
-    lnk=`readlink /etc/snmp/tls`
-    if [ "$lnk" != "/config/snmp/tls" ]; then
-      sudo rm -f /etc/snmp/tls;
-      sudo ln -s /config/snmp/tls /etc/snmp/tls;
-    fi
-    
-begin: if [ -d "/config/snmp/tls" ]; then
-    sudo chown -R snmp /config/snmp/tls;
-    sudo chmod -R 600 /config/snmp/tls;
-  fi
-
-delete: touch /tmp/snmp-v3.$PPID
-
-end:if [ -f "/tmp/snmp-v3.$PPID" ]
-    then
-	 sudo /opt/vyatta/sbin/vyatta-snmp-v3.pl --delete-snmp
-         rm /tmp/snmp-v3.$PPID
-    fi
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.def b/templates/service/snmp/v3/trap-target/node.def
deleted file mode 100644
index 6c2717a8..00000000
--- a/templates/service/snmp/v3/trap-target/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-tag:
-type: txt
-help: Defines SNMP target for inform or traps for IP
-syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)/20"
-commit:expression: $VAR(type/) != ""; "must specify type"
-commit:expression: $VAR(auth/) != ""; "must specify auth"
-commit:expression: $VAR(protocol/) != ""; "must specify protocol"
-commit:expression: $VAR(user/) != ""; "must specify user"
-commit:expression: $VAR(port/) != ""; "must specify port"
-commit:expression: $VAR(type/@) == "inform" || ( $VAR(type/@) == "trap" && $VAR(engineid/) != "" ); \
-  "must specify engineid if type is 'trap'"
-
-val_help: <x.x.x.x>; IP address of trap target
-val_help: <h:h:h:h:h:h:h:h>; IPv6 address of trap target
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/auth/encrypted-key/node.def b/templates/service/snmp/v3/trap-target/node.tag/auth/encrypted-key/node.def
deleted file mode 100644
index 2365b055..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/auth/encrypted-key/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Defines the encrypted password for authentication
-syntax:expression: pattern $VAR(@) "^0x[0-9a-f]*$" ; "key must start from '0x' and contain hex digits"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/auth/node.def b/templates/service/snmp/v3/trap-target/node.tag/auth/node.def
deleted file mode 100644
index 5c7df0ef..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/auth/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Defines the authentication
-commit:expression: $VAR(type/) != "" ; "must specify type"
-commit:expression: $VAR(encrypted-key/) != "" || $VAR(plaintext-key/) != "" ; "must specify encrypted-key or plaintext-key"
-commit:expression: !($VAR(encrypted-key/) != "" && $VAR(plaintext-key/) != "") ; "must specify only one of encrypted-key and plaintext-key"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/auth/plaintext-key/node.def b/templates/service/snmp/v3/trap-target/node.tag/auth/plaintext-key/node.def
deleted file mode 100644
index 34563e73..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/auth/plaintext-key/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Defines the clear text password for authentication
-syntax:expression: pattern $VAR(@) "^.{8,}$" ; "key must contain 8 or more characters"
diff --git a/templates/service/snmp/v3/trap-target/node.tag/auth/type/node.def b/templates/service/snmp/v3/trap-target/node.tag/auth/type/node.def
deleted file mode 100644
index 5a2ffc52..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/auth/type/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "md5"
-help: Defines the protocol using for authentication
-syntax:expression: $VAR(@) in "md5", "sha"
-allowed: echo md5 sha
-
-val_help: md5; Message Digest 5
-val_help: sha; Secure Hash Algorithm
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/engineid/node.def b/templates/service/snmp/v3/trap-target/node.tag/engineid/node.def
deleted file mode 100644
index 45d522ea..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/engineid/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Defines the engineID. (needs for trap)
-syntax:expression: pattern $VAR(@) "^(0x){0,1}([0-9a-f][0-9a-f]){1,18}$" ; "id must contain from 2 to 36 hex digits"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/port/node.def b/templates/service/snmp/v3/trap-target/node.tag/port/node.def
deleted file mode 100644
index b38cd1e5..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/port/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-default: 162
-help: Specifies the TCP/UDP port of a destination for SNMP traps/informs.
-
-val_help: u32:1-65535; Numeric IP port
-syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \
-	"Port number must be in range 1 to 65535"
diff --git a/templates/service/snmp/v3/trap-target/node.tag/privacy/encrypted-key/node.def b/templates/service/snmp/v3/trap-target/node.tag/privacy/encrypted-key/node.def
deleted file mode 100644
index 4e762b9f..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/privacy/encrypted-key/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Defines the encrypted key for privacy protocol
-syntax:expression: pattern $VAR(@) "^0x[0-9a-f]*$" ; "key must start from '0x' and contain hex digits"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/privacy/node.def b/templates/service/snmp/v3/trap-target/node.tag/privacy/node.def
deleted file mode 100644
index 900cfc9d..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/privacy/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Defines the privacy
-commit:expression: $VAR(type/) != "" ; "must specify type"
-commit:expression: $VAR(encrypted-key/) != "" || $VAR(plaintext-key/) != "" ; "must specify encrypted-key or plaintext-key"
-commit:expression: !($VAR(encrypted-key/) != "" && $VAR(plaintext-key/) != "") ; "must specify only one of encrypted-key and plaintext-key"
diff --git a/templates/service/snmp/v3/trap-target/node.tag/privacy/plaintext-key/node.def b/templates/service/snmp/v3/trap-target/node.tag/privacy/plaintext-key/node.def
deleted file mode 100644
index a2442637..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/privacy/plaintext-key/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Defines the clear text key for privacy protocol
-syntax:expression: pattern $VAR(@) "^.{8,}$" ; "key must contain 8 or more characters"
diff --git a/templates/service/snmp/v3/trap-target/node.tag/privacy/type/node.def b/templates/service/snmp/v3/trap-target/node.tag/privacy/type/node.def
deleted file mode 100644
index bbfd5331..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/privacy/type/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "des"
-help: Defines the protocol for privacy
-syntax:expression: $VAR(@) in "des", "aes"
-allowed: echo des aes
-
-val_help: des; Data Encryption Standard
-val_help: aes; Advanced Encryption Standard
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/protocol/node.def b/templates/service/snmp/v3/trap-target/node.tag/protocol/node.def
deleted file mode 100644
index ce96ca38..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/protocol/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "udp"
-help: Defines protocol for notification between TCP and UDP
-syntax:expression: $VAR(@) in "tcp", "udp"
-allowed: echo tcp udp
-
-val_help: tcp;
-val_help: udp;
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/type/node.def b/templates/service/snmp/v3/trap-target/node.tag/type/node.def
deleted file mode 100644
index f678ae69..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/type/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "inform"
-help: Specifies the type of notification between inform and trap
-syntax:expression: $VAR(@) in "inform", "trap"
-allowed: echo inform trap
-
-val_help: inform;
-val_help: trap;
\ No newline at end of file
diff --git a/templates/service/snmp/v3/trap-target/node.tag/user/node.def b/templates/service/snmp/v3/trap-target/node.tag/user/node.def
deleted file mode 100644
index a0ed8cbf..00000000
--- a/templates/service/snmp/v3/trap-target/node.tag/user/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: txt
-help: Defines username for authentication
-allowed: list=`cli-shell-api listNodes service snmp v3 user`
-  echo $list
diff --git a/templates/service/snmp/v3/tsm/local-key/node.def b/templates/service/snmp/v3/tsm/local-key/node.def
deleted file mode 100644
index a630dff8..00000000
--- a/templates/service/snmp/v3/tsm/local-key/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: txt
-help: Defines the server certificate fingerprint or key-file name.
-allowed: if sudo [ -d /etc/snmp/tls/certs ]; then
-      sudo ls /etc/snmp/tls/certs 2> /dev/null
-    else
-      sudo ls /config/snmp/tls/certs 2> /dev/null
-    fi
-syntax:expression: pattern $VAR(@) "^[0-9A-F]{2}(:[0-9A-F]{2}){19}$" ||
-    exec "if sudo [ -f /etc/snmp/tls/certs/$VAR(@) -o -f /config/snmp/tls/certs/$VAR(@) ]; \
-      then \
-	 exit 0; \
-      else \
-        exit 1; \
-      fi" ; "value can be finger print key or filename in /config/snmp/tls/certs/ folder"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/tsm/node.def b/templates/service/snmp/v3/tsm/node.def
deleted file mode 100644
index 3d12f21d..00000000
--- a/templates/service/snmp/v3/tsm/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Specifies that the snmpd uses encryption.
-commit:expression: $VAR(port/) != "" ; "must specify port"
-commit:expression: $VAR(local-key/) != "" ; "must specify local-key"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/tsm/port/node.def b/templates/service/snmp/v3/tsm/port/node.def
deleted file mode 100644
index 86fd6cca..00000000
--- a/templates/service/snmp/v3/tsm/port/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type:  u32
-default: 10161
-help: Defines the port for tsm.
-
-val_help: u32:1-65535; Numeric IP port
-syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \
-	"Port number must be in range 1 to 65535"
diff --git a/templates/service/snmp/v3/user/node.def b/templates/service/snmp/v3/user/node.def
deleted file mode 100644
index 32e0f61f..00000000
--- a/templates/service/snmp/v3/user/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-tag:
-type: txt
-help: Specifies the user with name username
-syntax:expression: pattern $VAR(@) "^[^\(\)\|\&-]+$" ; "illegal characters in name"
-syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_snmp_name.pl $VAR(@)"
-commit:expression: $VAR(auth/) != "" || $VAR(tsm-key/) != ""; "must specify auth or tsm-key"
-commit:expression: $VAR(mode/) != ""; "must specify mode"
diff --git a/templates/service/snmp/v3/user/node.tag/auth/encrypted-key/node.def b/templates/service/snmp/v3/user/node.tag/auth/encrypted-key/node.def
deleted file mode 100644
index 3cf6bd31..00000000
--- a/templates/service/snmp/v3/user/node.tag/auth/encrypted-key/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Defines the encrypted key for authentication protocol
diff --git a/templates/service/snmp/v3/user/node.tag/auth/node.def b/templates/service/snmp/v3/user/node.tag/auth/node.def
deleted file mode 100644
index 68959a8e..00000000
--- a/templates/service/snmp/v3/user/node.tag/auth/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Specifies the auth
-commit:expression: $VAR(type/) != "" ; "must specify type"
-commit:expression: $VAR(plaintext-key/) != "" || $VAR(encrypted-key/) != ""  ; "must specify plaintext-key or encrypted-key"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/user/node.tag/auth/plaintext-key/node.def b/templates/service/snmp/v3/user/node.tag/auth/plaintext-key/node.def
deleted file mode 100644
index 7be1bc65..00000000
--- a/templates/service/snmp/v3/user/node.tag/auth/plaintext-key/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Defines the key in the clear text for authentication protocol
-syntax:expression: pattern $VAR(@) "^.{8,}$" ; "key must contain 8 or more characters"
-    
-update:expression: $VAR(../encrypted-key/@) = "" && $VAR(../../engineid/@) = ""
-update:expression: $VAR(../../../engineid/@) != "" || $VAR(../../../engineid/@) = ""
diff --git a/templates/service/snmp/v3/user/node.tag/auth/type/node.def b/templates/service/snmp/v3/user/node.tag/auth/type/node.def
deleted file mode 100644
index 5a2ffc52..00000000
--- a/templates/service/snmp/v3/user/node.tag/auth/type/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "md5"
-help: Defines the protocol using for authentication
-syntax:expression: $VAR(@) in "md5", "sha"
-allowed: echo md5 sha
-
-val_help: md5; Message Digest 5
-val_help: sha; Secure Hash Algorithm
\ No newline at end of file
diff --git a/templates/service/snmp/v3/user/node.tag/engineid/node.def b/templates/service/snmp/v3/user/node.tag/engineid/node.def
deleted file mode 100644
index 84cf1443..00000000
--- a/templates/service/snmp/v3/user/node.tag/engineid/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Specifies the EngineID
-syntax:expression: pattern $VAR(@) "^(0x){0,1}([0-9a-f][0-9a-f]){1,18}$" ; "id must contain from 2 to 36 hex digits"
diff --git a/templates/service/snmp/v3/user/node.tag/group/node.def b/templates/service/snmp/v3/user/node.tag/group/node.def
deleted file mode 100644
index 66543579..00000000
--- a/templates/service/snmp/v3/user/node.tag/group/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: txt
-help: Specifies group for user name
-allowed: list=`cli-shell-api listNodes service snmp v3 group`
-  echo $list
-syntax:expression:exec "regex=\"(^| )$VAR(@)( |$)\"; \
-    if [[ \"$VAR(/service/snmp/v3/group/@@)\" =~ $regex ]] ; \
-    then \
-      exit 0; \
-    else \
-      exit 1; \
-    fi" ; "You must create \"$VAR(@)\" group first"
diff --git a/templates/service/snmp/v3/user/node.tag/mode/node.def b/templates/service/snmp/v3/user/node.tag/mode/node.def
deleted file mode 100644
index 9855f5fb..00000000
--- a/templates/service/snmp/v3/user/node.tag/mode/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "ro"
-help: Specifies the mode for access rights of user, read only or write
-syntax:expression: $VAR(@) in "ro", "rw"
-allowed: echo ro rw
-
-val_help: ro;
-val_help: rw;
diff --git a/templates/service/snmp/v3/user/node.tag/privacy/encrypted-key/node.def b/templates/service/snmp/v3/user/node.tag/privacy/encrypted-key/node.def
deleted file mode 100644
index 8feef111..00000000
--- a/templates/service/snmp/v3/user/node.tag/privacy/encrypted-key/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Defines the encrypted key for privacy protocol
diff --git a/templates/service/snmp/v3/user/node.tag/privacy/node.def b/templates/service/snmp/v3/user/node.tag/privacy/node.def
deleted file mode 100644
index 94bf850c..00000000
--- a/templates/service/snmp/v3/user/node.tag/privacy/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Specifies the privacy
-commit:expression: $VAR(type/) != "" ; "must specify type"
-commit:expression: $VAR(plaintext-key/) != "" || $VAR(encrypted-key/) != ""  ; "must specify plaintext-key or encrypted-key"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/user/node.tag/privacy/plaintext-key/node.def b/templates/service/snmp/v3/user/node.tag/privacy/plaintext-key/node.def
deleted file mode 100644
index a9543530..00000000
--- a/templates/service/snmp/v3/user/node.tag/privacy/plaintext-key/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Defines the key in the clear text for protocol for privacy
-syntax:expression: pattern $VAR(@) "^.{8,}$" ; "key must contain 8 or more characters"
-
-update:expression: $VAR(../encrypted-key/@) = "" && $VAR(../../engineid/@) = ""
-update:expression: $VAR(../../../engineid/@) != "" || $VAR(../../../engineid/@) = ""
\ No newline at end of file
diff --git a/templates/service/snmp/v3/user/node.tag/privacy/type/node.def b/templates/service/snmp/v3/user/node.tag/privacy/type/node.def
deleted file mode 100644
index bbfd5331..00000000
--- a/templates/service/snmp/v3/user/node.tag/privacy/type/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-default: "des"
-help: Defines the protocol for privacy
-syntax:expression: $VAR(@) in "des", "aes"
-allowed: echo des aes
-
-val_help: des; Data Encryption Standard
-val_help: aes; Advanced Encryption Standard
\ No newline at end of file
diff --git a/templates/service/snmp/v3/user/node.tag/tsm-key/node.def b/templates/service/snmp/v3/user/node.tag/tsm-key/node.def
deleted file mode 100644
index b41be079..00000000
--- a/templates/service/snmp/v3/user/node.tag/tsm-key/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: txt
-help: Specifies finger print or file name of TSM certificate.
-allowed: if sudo [ -d /etc/snmp/tls/certs ]; then
-      sudo ls /etc/snmp/tls/certs 2> /dev/null
-    else
-      sudo ls /config/snmp/tls/certs 2> /dev/null
-    fi
-syntax:expression: pattern $VAR(@) "^[0-9A-F]{2}(:[0-9A-F]{2}){19}$" ||
-    exec "if sudo [ -f /etc/snmp/tls/certs/$VAR(@) -o -f /config/snmp/tls/certs/$VAR(@) ]; \
-      then \
-	 exit 0; \
-      else \
-        exit 1; \
-      fi" ; "value can be finger print key or filename in /etc/snmp/tls/certs folder"
\ No newline at end of file
diff --git a/templates/service/snmp/v3/view/node.def b/templates/service/snmp/v3/view/node.def
deleted file mode 100644
index 1fa589ae..00000000
--- a/templates/service/snmp/v3/view/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-tag:
-type: txt
-help: Specifies the view with name viewname
-syntax:expression: pattern $VAR(@) "^[^\(\)\|\&-]+$" ; "illegal characters in name"
-syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_snmp_name.pl $VAR(@)"
-commit:expression: $VAR(oid/) != ""; "must configure an oid"
diff --git a/templates/service/snmp/v3/view/node.tag/oid/node.def b/templates/service/snmp/v3/view/node.tag/oid/node.def
deleted file mode 100644
index ca2a5c5d..00000000
--- a/templates/service/snmp/v3/view/node.tag/oid/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-help: Specifies the oid
-syntax:expression: pattern $VAR(@) "^[0-9]+(\\.[0-9]+)*$" ; "oid must start from a number"
diff --git a/templates/service/snmp/v3/view/node.tag/oid/node.tag/exclude/node.def b/templates/service/snmp/v3/view/node.tag/oid/node.tag/exclude/node.def
deleted file mode 100644
index df3611cb..00000000
--- a/templates/service/snmp/v3/view/node.tag/oid/node.tag/exclude/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Exclude is optional argument.
diff --git a/templates/service/snmp/v3/view/node.tag/oid/node.tag/mask/node.def b/templates/service/snmp/v3/view/node.tag/oid/node.tag/mask/node.def
deleted file mode 100644
index bc500afe..00000000
--- a/templates/service/snmp/v3/view/node.tag/oid/node.tag/mask/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: txt
-help: Defines a bit-mask that is indicating which subidentifiers of the associated subtree OID should be regarded as significant.
-syntax:expression: pattern $VAR(@) "^[0-9a-f]{2}([\\.:][0-9a-f]{2})*$" ; \
-		   "MASK is a list of hex octets, separated by '.' or ':'"
\ No newline at end of file
-- 
cgit v1.2.3

