-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into syslog_telemetry_…
…shared
- Loading branch information
Showing
13 changed files
with
244 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| CONSOLE_PORT=0x3f8 | ||
| CONSOLE_DEV=0 | ||
| CONSOLE_SPEED=9600 | ||
| ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="intel_iommu=off module_blacklist=gpio_ich crashkernel=0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M acpi_no_watchdog" | ||
| ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="intel_iommu=off modprobe.blacklist=gpio_ich,i2c-ismt,i2c_ismt,i2c-i801,i2c_i801 crashkernel=0M-2G:256M,2G-4G:320M,4G-8G:384M,8G-:448M acpi_no_watchdog" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule linkmgrd
updated
from 60b370 to 4bf8b3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
src/sonic-yang-models/tests/yang_model_tests/tests/snmp.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "SNMP_SYSTEM_TEST": { | ||
| "desc": "Load SNMP sysContact and sysLocation." | ||
| }, | ||
| "SNMP_SYSTEM_CONTACT_NEG_TEST": { | ||
| "desc": "Load SNMP sysContact with empty string", | ||
| "eStrKey": "Range" | ||
| }, | ||
| "SNMP_SYSTEM_LOCATION_NEG_TEST": { | ||
| "desc": "Load SNMP sysContact with empty string", | ||
| "eStrKey": "Range" | ||
| }, | ||
| "SNMP_COMMUNITY_TEST": { | ||
| "desc": "Load SNMP community string." | ||
| }, | ||
| "SNMP_COMMUNITY_MIN_NEG_TEST": { | ||
| "desc": "Load SNMP community string of length < 3.", | ||
| "eStrKey": "Range" | ||
| }, | ||
| "SNMP_COMMUNITY_MAX_NEG_TEST": { | ||
| "desc": "Load SNMP community string of lenth > 32.", | ||
| "eStrKey": "Range" | ||
| }, | ||
| "SNMP_COMMUNITY_WRONG_TYPE_TEST": { | ||
| "desc": "Load SNMP community string with un supported type.", | ||
| "eStrKey": "InvalidValue" | ||
| } | ||
| } |
83 changes: 83 additions & 0 deletions
83
src/sonic-yang-models/tests/yang_model_tests/tests_config/snmp.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| { | ||
| "SNMP_SYSTEM_TEST": { | ||
| "sonic-snmp:sonic-snmp": { | ||
| "sonic-snmp:SNMP": { | ||
| "CONTACT": { | ||
| "Contact": "support@xyz.com" | ||
| }, | ||
| "LOCATION": { | ||
| "Location": "Test location" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "SNMP_SYSTEM_CONTACT_NEG_TEST": { | ||
| "sonic-snmp:sonic-snmp": { | ||
| "sonic-snmp:SNMP": { | ||
| "CONTACT": { | ||
| "Contact": "" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "SNMP_SYSTEM_LOCATION_NEG_TEST": { | ||
| "sonic-snmp:sonic-snmp": { | ||
| "sonic-snmp:SNMP": { | ||
| "LOCATION": { | ||
| "Location": "" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "SNMP_COMMUNITY_TEST": { | ||
| "sonic-snmp:sonic-snmp": { | ||
| "sonic-snmp:SNMP_COMMUNITY": { | ||
| "SNMP_COMMUNITY_LIST": [ | ||
| { | ||
| "name": "sonicSnmp", | ||
| "TYPE": "RO" | ||
| }, | ||
| { | ||
| "name": "sonicSnmpRW", | ||
| "TYPE": "RW" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "SNMP_COMMUNITY_MIN_NEG_TEST": { | ||
| "sonic-snmp:sonic-snmp": { | ||
| "sonic-snmp:SNMP_COMMUNITY": { | ||
| "SNMP_COMMUNITY_LIST": [ | ||
| { | ||
| "name": "abc" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "SNMP_COMMUNITY_MAX_NEG_TEST": { | ||
| "sonic-snmp:sonic-snmp": { | ||
| "sonic-snmp:SNMP_COMMUNITY": { | ||
| "SNMP_COMMUNITY_LIST": [ | ||
| { | ||
| "name": "01234567890123456789012345678901234" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "SNMP_COMMUNITY_WRONG_TYPE_TEST": { | ||
| "sonic-snmp:sonic-snmp": { | ||
| "sonic-snmp:SNMP_COMMUNITY": { | ||
| "SNMP_COMMUNITY_LIST": [ | ||
| { | ||
| "name": "sonicSnmp", | ||
| "TYPE": "RR" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| module sonic-snmp { | ||
| namespace "http://github.com/Azure/sonic-snmp"; | ||
| prefix ssnmp; | ||
| yang-version 1.1; | ||
|
|
||
|
|
||
| organization | ||
| "SONiC"; | ||
|
|
||
| contact | ||
| "SONiC"; | ||
|
|
||
| description | ||
| "SONIC SNMP"; | ||
|
|
||
| revision 2022-05-13 { | ||
| description | ||
| "Initial revision."; | ||
| } | ||
|
|
||
|
|
||
| container sonic-snmp { | ||
|
|
||
| container SNMP { | ||
| container CONTACT { | ||
| leaf Contact { | ||
| type string { | ||
| length "1..255"; | ||
| } | ||
| description | ||
| "SNMP System Contact."; | ||
| } | ||
| } | ||
| container LOCATION { | ||
| leaf Location { | ||
| type string { | ||
| length "1..255"; | ||
| } | ||
| description | ||
| "SNMP System Location."; | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
| container SNMP_COMMUNITY { | ||
| list SNMP_COMMUNITY_LIST { | ||
| key name; | ||
| description | ||
| "List of communities."; | ||
|
|
||
| leaf name { | ||
| type string { | ||
| length "4..32"; | ||
| pattern '[^ @,\\' +"']*" { | ||
| error-message 'Invalid snmp community string (Valid chars are ASCII printable except SPACE, single quote,"@", "," and "\")'; | ||
| } | ||
| } | ||
| description | ||
| "Index into the community list which must be the community name."; | ||
| } | ||
|
|
||
| leaf TYPE { | ||
| type enumeration { | ||
| enum RO; | ||
| enum RW; | ||
| } | ||
| description | ||
| "Type of community, read-only or read-write."; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters