From 1ce8e672b57e03e144998cb0a56ad1622c667a1d Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Wed, 18 Jan 2023 15:09:32 +0000
Subject: T4857: Cleaning pr

---
 interface-definitions/snmp.xml.in | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index 7ec60b2e7..bb6e91167 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -123,18 +123,31 @@
           </leafNode>
           <leafNode name="oid-enable">
             <properties>
-              <help>Enable specific OIDs</help>
+              <help>Enable specific OIDs that by default are disable</help>
               <completionHelp>
-                <list>route-table</list>
+                <list>ip-forward ip-route-table ip-net-to-media-table ip-net-to-physical-phys-address</list>
               </completionHelp>
               <valueHelp>
-                <format>route-table</format>
-                <description>Enable routing table OIDs (ipCidrRouteTable inetCidrRouteTable)</description>
+                <format>ip-forward</format>
+                <description>Enable oid .1.3.6.1.2.1.4.24</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ip-route-table</format>
+                <description>Enable oid .1.3.6.1.2.1.4.21</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ip-net-to-media-table</format>
+                <description>Enable oid .1.3.6.1.2.1.4.22</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ip-net-to-physical-phys-address</format>
+                <description>Enable oid .1.3.6.1.2.1.4.35</description>
               </valueHelp>
               <constraint>
-                <regex>(route-table)</regex>
+                <regex>(ip-forward|ip-route-table|ip-net-to-media-table|ip-net-to-physical-phys-address)</regex>
               </constraint>
-              <constraintErrorMessage>OID must be 'route-table'</constraintErrorMessage>
+              <constraintErrorMessage>OID must be one of the liste options</constraintErrorMessage>
+              <multi/>
             </properties>
           </leafNode>
           #include <include/snmp/protocol.xml.i>
-- 
cgit v1.2.3


From 67fa5f55ac79838768b4b0a5f6d2c4b3b4c8e762 Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Wed, 18 Jan 2023 16:17:17 +0000
Subject: T4857: change description in cli, and change word oid to uppercase
 OIDs in warning message

---
 interface-definitions/include/version/snmp-version.xml.i | 2 +-
 interface-definitions/snmp.xml.in                        | 8 ++++----
 src/conf_mode/snmp.py                                    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/version/snmp-version.xml.i b/interface-definitions/include/version/snmp-version.xml.i
index 0416288f0..fa58672a5 100644
--- a/interface-definitions/include/version/snmp-version.xml.i
+++ b/interface-definitions/include/version/snmp-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/snmp-version.xml.i -->
-<syntaxVersion component='snmp' version='2'></syntaxVersion>
+<syntaxVersion component='snmp' version='3'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index bb6e91167..10dd828a5 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -129,19 +129,19 @@
               </completionHelp>
               <valueHelp>
                 <format>ip-forward</format>
-                <description>Enable oid .1.3.6.1.2.1.4.24</description>
+                <description>Enable ipForward: .1.3.6.1.2.1.4.24</description>
               </valueHelp>
               <valueHelp>
                 <format>ip-route-table</format>
-                <description>Enable oid .1.3.6.1.2.1.4.21</description>
+                <description>Enable ipRouteTable: .1.3.6.1.2.1.4.21</description>
               </valueHelp>
               <valueHelp>
                 <format>ip-net-to-media-table</format>
-                <description>Enable oid .1.3.6.1.2.1.4.22</description>
+                <description>Enable ipNetToMediaTable: .1.3.6.1.2.1.4.22</description>
               </valueHelp>
               <valueHelp>
                 <format>ip-net-to-physical-phys-address</format>
-                <description>Enable oid .1.3.6.1.2.1.4.35</description>
+                <description>Enable ipNetToPhysicalPhysAddress: .1.3.6.1.2.1.4.35</description>
               </valueHelp>
               <constraint>
                 <regex>(ip-forward|ip-route-table|ip-net-to-media-table|ip-net-to-physical-phys-address)</regex>
diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py
index addfb9e26..9651b358e 100755
--- a/src/conf_mode/snmp.py
+++ b/src/conf_mode/snmp.py
@@ -167,7 +167,7 @@ def verify(snmp):
                 raise ConfigError(f'Trap target "{trap}" requires a community to be set!')
 
     if 'oid_enable' in snmp:
-        Warning(f'Custom oids are enabled and may lead to system instability and high resource consumption')
+        Warning(f'Custom OIDs are enabled and may lead to system instability and high resource consumption')
 
 
     verify_vrf(snmp)
-- 
cgit v1.2.3