diff options
| author | Nicolas Fort <nicolasfort1988@gmail.com> | 2023-01-18 16:17:17 +0000 |
|---|---|---|
| committer | Nicolas Fort <nicolasfort1988@gmail.com> | 2023-01-18 18:14:09 +0000 |
| commit | 67fa5f55ac79838768b4b0a5f6d2c4b3b4c8e762 (patch) | |
| tree | 3a2dac6fdd386c8b9ad2c23c73c40d9eb5ceca30 | |
| parent | 1ce8e672b57e03e144998cb0a56ad1622c667a1d (diff) | |
| download | vyos-1x-67fa5f55ac79838768b4b0a5f6d2c4b3b4c8e762.tar.gz vyos-1x-67fa5f55ac79838768b4b0a5f6d2c4b3b4c8e762.zip | |
T4857: change description in cli, and change word oid to uppercase OIDs in warning message
| -rw-r--r-- | interface-definitions/include/version/snmp-version.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/snmp.xml.in | 8 | ||||
| -rwxr-xr-x | src/conf_mode/snmp.py | 2 |
3 files changed, 6 insertions, 6 deletions
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) |