fix for V1 varbinds, V3 examples

Change-Id: Ic32dabbb356125384cc5eaa89f90e3c7c5c24128
Issue-ID: DCAEGEN2-842
Signed-off-by: Ladue, David (dl3158) <dl3158@att.com>

1 files changed, 241 insertions, 38 deletions

diff --git a/etc/snmptrapd.json b/etc/snmptrapd.json
index 2061631..12e75c5 100644
--- a/etc/snmptrapd.json
+++ b/etc/snmptrapd.json
@@ -30,7 +30,7 @@
                 "location": "mtl5",
                 "client_id": null,
                 "client_role": null,
-                "topic_url": "http://localhost:3904/events/ONAP-COLLECTOR-SNMPTRAP"
+                "topic_url": "http://localhost:3904/events/unauthenticated.ONAP-COLLECTOR-SNMPTRAP"
             },
             "aaf_username": null
         }
@@ -52,56 +52,259 @@
         "roll_frequency": "day",
         "minimum_severity_to_log": 0
     },
-    "trap_config": {
-        "sw_interval_in_seconds": 60,
-        "notify_oids": {
-            ".1.3.6.1.4.1.9.0.1": {
-                "sw_high_water_in_interval": 102,
-                "sw_low_water_in_interval": 7,
-                "category": "logonly"
-            },
-            ".1.3.6.1.4.1.9.0.2": {
-                "sw_high_water_in_interval": 101,
-                "sw_low_water_in_interval": 7,
-                "category": "logonly"
-            },
-            ".1.3.6.1.4.1.9.0.3": {
-                "sw_high_water_in_interval": 102,
-                "sw_low_water_in_interval": 7,
-                "category": "logonly"
-            },
-            ".1.3.6.1.4.1.9.0.4": {
-                "sw_high_water_in_interval": 10,
-                "sw_low_water_in_interval": 3,
-                "category": "logonly"
-            }
-        }
-    },
     "snmpv3_config": {
         "usm_users": [
             {
-                "user": "usr-sha-aes256",
-                "engineId": "8000000001020304",
-                "usmHMACSHAAuth": "authkey1",
-                "usmAesCfb256": "privkey1"
-            },
-            {
                 "user": "user1",
                 "engineId": "8000000000000001",
-                "usmHMACMD5Auth": "authkey1",
-                "usmDESPriv": "privkey1"
+                "usmHMACMD5AuthProtocol": "authkey1",
+                "usmDESPrivProtocol": "privkey1"
             },
             {
                 "user": "user2",
                 "engineId": "8000000000000002",
-                "usmHMACSHAAuth": "authkey2",
-                "usmAesCfb128": "privkey2"
+                "usmHMACMD5AuthProtocol": "authkey2",
+                "usm3DESEDEPrivProtocol": "privkey2"
             },
             {
                 "user": "user3",
                 "engineId": "8000000000000003",
-                "usmHMACSHAAuth": "authkey3",
-                "usmAesCfb256": "privkey3"
+                "usmHMACMD5AuthProtocol": "authkey3",
+                "usmAesCfb128Protocol": "privkey3"
+            },
+            {
+                "user": "user4",
+                "engineId": "8000000000000004",
+                "usmHMACMD5AuthProtocol": "authkey4",
+                "usmAesBlumenthalCfb192Protocol": "privkey4"
+            },
+            {
+                "user": "user5",
+                "engineId": "8000000000000005",
+                "usmHMACMD5AuthProtocol": "authkey5",
+                "usmAesBlumenthalCfb256Protocol": "privkey5"
+            },
+            {
+                "user": "user6",
+                "engineId": "8000000000000006",
+                "usmHMACMD5AuthProtocol": "authkey6",
+                "usmAesCfb192Protocol": "privkey6"
+            },
+            {
+                "user": "user7",
+                "engineId": "8000000000000007",
+                "usmHMACMD5AuthProtocol": "authkey7",
+                "usmAesCfb256Protocol": "privkey7"
+            },
+            {
+                "user": "user9",
+                "engineId": "8000000000000009",
+                "usmHMACSHAAuthProtocol": "authkey9",
+                "usmDESPrivProtocol": "privkey9"
+            },
+            {
+                "user": "user10",
+                "engineId": "8000000000000010",
+                "usmHMACSHAAuthProtocol": "authkey10",
+                "usm3DESEDEPrivProtocol": "privkey10"
+            },
+            {
+                "user": "user11",
+                "engineId": "8000000000000011",
+                "usmHMACSHAAuthProtocol": "authkey11",
+                "usmAesCfb128Protocol": "privkey11"
+            },
+            {
+                "user": "user12",
+                "engineId": "8000000000000012",
+                "usmHMACSHAAuthProtocol": "authkey12",
+                "usmAesBlumenthalCfb192Protocol": "privkey12"
+            },
+            {
+                "user": "user13",
+                "engineId": "8000000000000013",
+                "usmHMACSHAAuthProtocol": "authkey13",
+                "usmAesBlumenthalCfb256Protocol": "privkey13"
+            },
+            {
+                "user": "user14",
+                "engineId": "8000000000000014",
+                "usmHMACSHAAuthProtocol": "authkey14",
+                "usmAesCfb192Protocol": "privkey14"
+            },
+            {
+                "user": "user15",
+                "engineId": "8000000000000015",
+                "usmHMACSHAAuthProtocol": "authkey15",
+                "usmAesCfb256Protocol": "privkey15"
+            },
+            {
+                "user": "user17",
+                "engineId": "8000000000000017",
+                "usmHMAC128SHA224AuthProtocol": "authkey17",
+                "usmDESPrivProtocol": "privkey17"
+            },
+            {
+                "user": "user18",
+                "engineId": "8000000000000018",
+                "usmHMAC128SHA224AuthProtocol": "authkey18",
+                "usm3DESEDEPrivProtocol": "privkey18"
+            },
+            {
+                "user": "user19",
+                "engineId": "8000000000000019",
+                "usmHMAC128SHA224AuthProtocol": "authkey19",
+                "usmAesCfb128Protocol": "privkey19"
+            },
+            {
+                "user": "user20",
+                "engineId": "8000000000000020",
+                "usmHMAC128SHA224AuthProtocol": "authkey20",
+                "usmAesBlumenthalCfb192Protocol": "privkey20"
+            },
+            {
+                "user": "user21",
+                "engineId": "8000000000000021",
+                "usmHMAC128SHA224AuthProtocol": "authkey21",
+                "usmAesBlumenthalCfb256Protocol": "privkey21"
+            },
+            {
+                "user": "user22",
+                "engineId": "8000000000000022",
+                "usmHMAC128SHA224AuthProtocol": "authkey22",
+                "usmAesCfb192Protocol": "privkey22"
+            },
+            {
+                "user": "user23",
+                "engineId": "8000000000000023",
+                "usmHMAC128SHA224AuthProtocol": "authkey23",
+                "usmAesCfb256Protocol": "privkey23"
+            },
+            {
+                "user": "user25",
+                "engineId": "8000000000000025",
+                "usmHMAC192SHA256AuthProtocol": "authkey25",
+                "usmDESPrivProtocol": "privkey25"
+            },
+            {
+                "user": "user26",
+                "engineId": "8000000000000026",
+                "usmHMAC192SHA256AuthProtocol": "authkey26",
+                "usm3DESEDEPrivProtocol": "privkey26"
+            },
+            {
+                "user": "user27",
+                "engineId": "8000000000000027",
+                "usmHMAC192SHA256AuthProtocol": "authkey27",
+                "usmAesCfb128Protocol": "privkey27"
+            },
+            {
+                "user": "user28",
+                "engineId": "8000000000000028",
+                "usmHMAC192SHA256AuthProtocol": "authkey28",
+                "usmAesBlumenthalCfb192Protocol": "privkey28"
+            },
+            {
+                "user": "user29",
+                "engineId": "8000000000000029",
+                "usmHMAC192SHA256AuthProtocol": "authkey29",
+                "usmAesBlumenthalCfb256Protocol": "privkey29"
+            },
+            {
+                "user": "user30",
+                "engineId": "8000000000000030",
+                "usmHMAC192SHA256AuthProtocol": "authkey30",
+                "usmAesCfb192Protocol": "privkey30"
+            },
+            {
+                "user": "user31",
+                "engineId": "8000000000000031",
+                "usmHMAC192SHA256AuthProtocol": "authkey31",
+                "usmAesCfb256Protocol": "privkey31"
+            },
+            {
+                "user": "user33",
+                "engineId": "8000000000000033",
+                "usmHMAC256SHA384AuthProtocol": "authkey33",
+                "usmDESPrivProtocol": "privkey33"
+            },
+            {
+                "user": "user34",
+                "engineId": "8000000000000034",
+                "usmHMAC256SHA384AuthProtocol": "authkey34",
+                "usm3DESEDEPrivProtocol": "privkey34"
+            },
+            {
+                "user": "user35",
+                "engineId": "8000000000000035",
+                "usmHMAC256SHA384AuthProtocol": "authkey35",
+                "usmAesCfb128Protocol": "privkey35"
+            },
+            {
+                "user": "user36",
+                "engineId": "8000000000000036",
+                "usmHMAC256SHA384AuthProtocol": "authkey36",
+                "usmAesBlumenthalCfb192Protocol": "privkey36"
+            },
+            {
+                "user": "user37",
+                "engineId": "8000000000000037",
+                "usmHMAC256SHA384AuthProtocol": "authkey37",
+                "usmAesBlumenthalCfb256Protocol": "privkey37"
+            },
+            {
+                "user": "user38",
+                "engineId": "8000000000000038",
+                "usmHMAC256SHA384AuthProtocol": "authkey38",
+                "usmAesCfb192Protocol": "privkey38"
+            },
+            {
+                "user": "user39",
+                "engineId": "8000000000000039",
+                "usmHMAC256SHA384AuthProtocol": "authkey39",
+                "usmAesCfb256Protocol": "privkey39"
+            },
+            {
+                "user": "user41",
+                "engineId": "8000000000000041",
+                "usmHMAC384SHA512AuthProtocol": "authkey41",
+                "usmDESPrivProtocol": "privkey41"
+            },
+            {
+                "user": "user42",
+                "engineId": "8000000000000042",
+                "usmHMAC384SHA512AuthProtocol": "authkey42",
+                "usm3DESEDEPrivProtocol": "privkey42"
+            },
+            {
+                "user": "user43",
+                "engineId": "8000000000000043",
+                "usmHMAC384SHA512AuthProtocol": "authkey43",
+                "usmAesCfb128Protocol": "privkey43"
+            },
+            {
+                "user": "user44",
+                "engineId": "8000000000000044",
+                "usmHMAC384SHA512AuthProtocol": "authkey44",
+                "usmAesBlumenthalCfb192Protocol": "privkey44"
+            },
+            {
+                "user": "user45",
+                "engineId": "8000000000000045",
+                "usmHMAC384SHA512AuthProtocol": "authkey45",
+                "usmAesBlumenthalCfb256Protocol": "privkey45"
+            },
+            {
+                "user": "user46",
+                "engineId": "8000000000000046",
+                "usmHMAC384SHA512AuthProtocol": "authkey46",
+                "usmAesCfb192Protocol": "privkey46"
+            },
+            {
+                "user": "user47",
+                "engineId": "8000000000000047",
+                "usmHMAC384SHA512AuthProtocol": "authkey47",
+                "usmAesCfb256Protocol": "privkey47"
             }
         ]
     }