From 10b1b9cbd89c7aad8670ba7b255e2eec5aad30e3 Mon Sep 17 00:00:00 2001 From: ubnt-tim Date: Tue, 22 Oct 2019 06:32:48 +0800 Subject: [PATCH] Updated support for edgeswitch devices (#10515) * Add new discovery patterns in edgeswitch.yaml * Add test data * Update edgeswitch.yaml --- includes/definitions/edgeswitch.yaml | 6 ++++++ tests/snmpsim/edgeswitch_linux.snmprec | 2 ++ tests/snmpsim/edgeswitch_us48-pro.snmprec | 2 ++ ..._unifi-switch.snmprec => edgeswitch_usw-24p-250.snmprec} | 0 tests/snmpsim/edgeswitch_usw-5-flex.snmprec | 2 ++ 5 files changed, 12 insertions(+) create mode 100644 tests/snmpsim/edgeswitch_linux.snmprec create mode 100644 tests/snmpsim/edgeswitch_us48-pro.snmprec rename tests/snmpsim/{edgeswitch_unifi-switch.snmprec => edgeswitch_usw-24p-250.snmprec} (100%) create mode 100644 tests/snmpsim/edgeswitch_usw-5-flex.snmprec diff --git a/includes/definitions/edgeswitch.yaml b/includes/definitions/edgeswitch.yaml index ca5d1e0fa0..93af76eee3 100644 --- a/includes/definitions/edgeswitch.yaml +++ b/includes/definitions/edgeswitch.yaml @@ -17,3 +17,9 @@ discovery: - '/^EdgeSwitch/' - '/^EdgePoint/' - '/^USW-/' + - '/^UBNT US/' + - + sysObjectID: + - .1.3.6.1.4.1.8072.3.2.10 + sysDescr_regex: + - '/^Linux UBNT/' diff --git a/tests/snmpsim/edgeswitch_linux.snmprec b/tests/snmpsim/edgeswitch_linux.snmprec new file mode 100644 index 0000000000..0637cd9d88 --- /dev/null +++ b/tests/snmpsim/edgeswitch_linux.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|Linux UBNT 4.9.65 #0 Thu Aug 30 12:10:54 2018 mips +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.10 diff --git a/tests/snmpsim/edgeswitch_us48-pro.snmprec b/tests/snmpsim/edgeswitch_us48-pro.snmprec new file mode 100644 index 0000000000..afe5bbf8a5 --- /dev/null +++ b/tests/snmpsim/edgeswitch_us48-pro.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|UBNT US48PRO - 48 GE POE + 4 XE, 4.0.19.9951, Linux 3.6.5 +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.4413 diff --git a/tests/snmpsim/edgeswitch_unifi-switch.snmprec b/tests/snmpsim/edgeswitch_usw-24p-250.snmprec similarity index 100% rename from tests/snmpsim/edgeswitch_unifi-switch.snmprec rename to tests/snmpsim/edgeswitch_usw-24p-250.snmprec diff --git a/tests/snmpsim/edgeswitch_usw-5-flex.snmprec b/tests/snmpsim/edgeswitch_usw-5-flex.snmprec new file mode 100644 index 0000000000..56a2f9743a --- /dev/null +++ b/tests/snmpsim/edgeswitch_usw-5-flex.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|USW-5-Flex, develop.10723 +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.41112