From 2e480dbec54e3b31586f7660f7f88d8797ac2446 Mon Sep 17 00:00:00 2001 From: Max Kosmach Date: Mon, 28 Jul 2014 15:41:46 +0400 Subject: [PATCH] Small H3C fixes --- Info/Layer3/H3C.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Info/Layer3/H3C.pm b/Info/Layer3/H3C.pm index 99d4c8a3..c84ca3e4 100644 --- a/Info/Layer3/H3C.pm +++ b/Info/Layer3/H3C.pm @@ -82,7 +82,7 @@ $VERSION = '3.18'; sub vendor { my $h3c = shift; my $mfg = $h3c->entPhysicalMfgName(1) || {}; - return $mfg->{1}; + return $mfg->{1} || "H3C"; } sub os { @@ -90,7 +90,7 @@ sub os { my $descr = $h3c->description(); return $1 if ( $descr =~ /(\S+)\s+Platform Software/ ); - return; + return "H3C"; } sub os_ver { @@ -101,6 +101,7 @@ sub os_ver { my $os_ver = undef; $os_ver = "$1 $2" if ( $descr =~ /Software Version ([^,]+),.*(Release\s\S+)/i ); + $os_ver = "$1" if ( $descr =~ /Product Version ([0-9.]+)/i ); return $ver_release->{2} || $os_ver; }