From 5bb2610488dbb15068da8b824b75eb689f765517 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Fri, 19 May 2017 13:30:11 -0500 Subject: [PATCH] newdevice: Update comware version and serial number polling (#6686) --- includes/polling/os/comware.inc.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/polling/os/comware.inc.php b/includes/polling/os/comware.inc.php index f1bae1baf4..590bf5ad36 100644 --- a/includes/polling/os/comware.inc.php +++ b/includes/polling/os/comware.inc.php @@ -8,7 +8,9 @@ echo 'Comware OS...'; $hardware = snmp_get($device, 'sysObjectID.0', '-Osqv', 'SNMPv2-MIB:HH3C-PRODUCT-ID-MIB'); -$data = str_replace(",", "", $poll_device['sysDescr']); -$explodeddata = explode(" ", $data); -$version = $explodeddata['6']; -$features = $explodeddata['8']; +preg_match('/Version ([0-9.]+).*Release ([0-9P]+)/', $poll_device['sysDescr'], $version_match); +$version = $version_match[1]; +$features = $version_match[2]; + +$serial_nums = explode("\n", trim(snmp_walk($device, 'hh3cEntityExtManuSerialNum', '-Osqv', 'HH3C-ENTITY-EXT-MIB'))); +$serial = $serial_nums[0]; // use the first s/n