Changeset 407 for trunk

Timestamp:

Apr 16, 2019, 1:25:12 PM (6 years ago)

Author:

g7moreau

Message:

• Update Nexans and HPE description

Location:

trunk

Files:

• klask (modified) (2 diffs)
• sys-description.sample.txt (modified) (2 diffs)

trunk/klask

@@ -14 +14 @@
 use strict;
 use warnings;
-use version; our $VERSION = version->declare('0.7.9');
+use version; our $VERSION = version->declare('0.7.10');
 
 use Readonly;
@@ -144 +144 @@
    'MS440209PM-48G6'=> { type => 2, model => 'MS440209PM-48G6+',  match => 'MICROSENS G6 Switch'               },
    # Nexans
-   N3483G           => { type => 2, model => 'NA3483-6G',      match => 'GigaSwitch V3 TP SFP-I 48.+ ES3',     revision => qr{GigaSwitch .*?/SECURITY/V(\d[\d\.]+\w?)\)},  },
-   N3483P           => { type => 2, model => 'NA3483-6P',      match => 'GigaSwitch V3 TP.PSE.+ 48/54V ES3',   revision => qr{GigaSwitch .*?/SECURITY/V(\d[\d\.]+\w?)\)},  },
-   N5541G           => { type => 2, model => 'NA5541-6G',      match => 'GigaSwitch V5 TP SFP-VI 54VDC',       revision => qr{GigaSwitch .*?-OFFICE-V(\d[\d\.]+\w+?)\)},   },
-   N5542G           => { type => 2, model => 'NA5542-7G',      match => 'GigaSwitch V5 TP.PSE.+ SFP-2VI 54VDC',revision => qr{GigaSwitch .*?-OFFICE-V(\d[\d\.]+\w+?)\)},   },
+   N3483G           => { type => 2, model => 'NA3483-6G',      match => 'GigaSwitch V3 TP SFP-I 48.+ ES3',     revision => qr{(?:/SECURITY/|-OFFICE-)V(\d[\d\.]+\w?)\)},   },
+   N3483P           => { type => 2, model => 'NA3483-6P',      match => 'GigaSwitch V3 TP.PSE.+ 48/54V ES3',   revision => qr{(?:/SECURITY/|-OFFICE-)V(\d[\d\.]+\w?)\)},   },
+   N5541G           => { type => 2, model => 'NA5541-6G',      match => 'GigaSwitch V5 TP SFP-VI 54VDC',       revision => qr{-OFFICE-V(\d[\d\.]+\w+?)\)},                 },
+   N5542G           => { type => 2, model => 'NA5542-7G',      match => 'GigaSwitch V5 TP.PSE.+ SFP-2VI 54VDC',revision => qr{-OFFICE-V(\d[\d\.]+\w+?)\)},                 },
    # DELL
    PC7024           => { type => 2, model => 'DPC7024',        match => 'PowerConnect 7024,.+?VxWorks',        revision => qr{PowerConnect .*?, (\d[\d\.]+?), VxWorks},    },

trunk/sys-description.sample.txt

@@ -75 +75 @@
  - HP Comware Platform Software, Software Version 5.20.99 Release 2220P02  HP A5500-24G EI Switch with 2 Interface Slots  Copyright (c) 2010-2013 Hewlett-Packard Development Company, L.P. 
  - HP Comware Platform Software, Software Version 5.20 Release 2208P01  HP A5500-24G-SFP EI Switch with 2 Interface Slots  Copyright (c) 2010-2011 Hewlett-Packard Development Company, L.P.
+ - HPE Comware Platform Software, Software Version 7.1.045, Release 1122P02  HPE 5510 24G SFP 4SFP+ HI 1-slot Switch JH149A  Copyright (c) 2010-2017 Hewlett Packard Enterprise Development LP
 
 JUNIPER:
@@ -102 +103 @@
  - GigaSwitch V3 TP SFP-I 48/54VDC ES3 (HW3/ENHANCED/SECURITY/V4.14W)
  - GigaSwitch V3 TP(PSE+) SFP-I 48/54V ES3 (HW3/ENHANCED/SECURITY/V4.14W)
+ - GigaSwitch V3 TP SFP-I 48/54VDC ES3 (HW3-F21-P06-OFFICE-V5.02R)
  - GigaSwitch V5 TP SFP-VI 54VDC (HW5-F40-P07-OFFICE-V5.01fw)
  - GigaSwitch V5 TP(PSE+) SFP-2VI 54VDC (HW5-F40-P07-OFFICE-V5.01fn)