Update SNMP resource model

models/enterprise_sonic/snmp/deleted_example_02.txt

@@ -9,7 +9,7 @@
 # md5 auth-password
 # U2FsdGVkX18J+L+L9OyQYWpAkGUrTgcg/6xzZoDjCbQw1ISHJ5mxmxrYZgQypEUXDeNe6rBupsc9sVDJBKxrwA==
 # priv aes-128 priv-password U2FsdGVkX1/Xs+ffZvdV9YzfyGHgIJ+zkLRPfF3/WgYIE1S4Ribvbzhu5chpHHI7ooCBpcVxYZotAXDzgetxvQ==
-# snmp-server group group-floor2 v3 priv read r_view write w_view notify n_view
+# snmp-server group group-floor2 v2c priv read r_view write w_view notify n_view
 # snmp-server community comm1 group group-lab
 # snmp-server user user2 group group-lab
 # auth sha auth-password U2FsdGVkX18J+L+L9OyQYWpAkGUrTgcg/6xzZoDjCbQw1ISHJ5mxmxrYZgQypEUXDeNe6rBupsc9sVDJBKxrwA==
@@ -26,5 +26,5 @@
 #
 # show running-configuration | grep snmp
 #
-# snmp-server group group-floor2 v3 priv read r_view write w_view notify n_view
+# snmp-server group group-floor2 v2c priv read r_view write w_view notify n_view
 # snmp-server community comm1 group group-lab

models/enterprise_sonic/snmp/merged_example_02.txt

@@ -13,7 +13,7 @@
       group:
         - name: group-floor2
           access:
-            security_model: v3
+            security_model: v2c
             security_level: auth-priv
             read_view: r_view
             write_view: w_view
@@ -29,4 +29,4 @@
 # show running-configuration | grep snmp
 #
 # snmp-server community comm1 group group-lab
-# snmp-server group group-floor2 v3 priv read r_view write w_view notify n_view
+# snmp-server group group-floor2 v2c priv read r_view write w_view notify n_view

models/enterprise_sonic/snmp/sonic_snmp.yml

@@ -29,6 +29,11 @@ DOCUMENTATION: |
             type: list
             elements: dict
             suboptions:
+              name:
+                description:
+                  - Name of this agentaddress entry
+                  - The name is auto-generated if not explicitly specified for agentaddress entry creation
+                type: str
               ip:
                 description:
                   - IPv4 or IPv6 address
@@ -158,6 +163,7 @@ DOCUMENTATION: |
           enable_trap:
             description:
               - Specify trap(s) to enable. The all choice indicates all traps should be enabled
+              - The "all" choice can not be specified unless none of the other choices is specified
             type: list
             elements: str
             choices:
@@ -182,6 +188,7 @@ DOCUMENTATION: |
               access:
                 description:
                   - List of access rights configuration for a group
+                  - The old access list will be replaced with the new access list
                 type: list
                 elements: dict
                 suboptions:
@@ -193,10 +200,12 @@ DOCUMENTATION: |
                     choices:
                       - any
                       - v2c
-                      - v3
+                      - usm
                   security_level:
                     description:
                       -  When I(security_model=v3), specifies the minimum security level under which the access rights apply.
+                    type: str
+                    required: true
                     choices:
                       - no-auth-no-priv
                       - auth-no-priv
@@ -216,14 +225,24 @@ DOCUMENTATION: |
           host: 
             description:
               - List of SNMP host configuration
+              - I(community) and I(user) are mutually exclusive
             type: list
             elements: dict
             suboptions:
+              name:
+                description:
+                  - Name of the host
+                  - The name is auto-generated if not explicitly specified for host entry creation
+                type: str
               ip:
                 description:
                   - IPv4 or IPv6 address
                 type: str
                 required: true
+              source_interface:
+                description:
+                  - Name of source interface
+              type: str
               community:
                 description:
                   - SNMP community for the host