New Templates - Huawei VRP - display interface and display temp

templates/huawei_vrp_display_interface_brief.template

@@ -0,0 +1,18 @@
+Value INTERFACE (\S+)
+Value PHY (down|\*down|up|up\(s\))
+Value PROTOCOL (down|\*down|up|up\(s\))
+Value INUTI (\d*\.?\d*%|\-\-)
+Value OUTUTI (\d*\.?\d*%|\-\-)
+Value INERRORS (\d+)
+Value OUTERRORS (\d+)
+
+
+Start
+  ^\s*${INTERFACE}\s+${PHY}\s+${PROTOCOL}\s+${INUTI}\s+${OUTUTI}\s+${INERRORS}\s+${OUTERRORS} -> Record
+  ^PHY:\s+Physical
+  ^(?:\*|\^)down:
+  ^\(\w+\):\s+\S+
+  ^InUti/OutUti:
+  ^Interface\s+PHY\s+Protocol\s+InUti\s+OutUti\s+inErrors\s+outErrors\s*$$
+  ^\s*$$
+  ^. -> Error

templates/huawei_vrp_display_temperature.template

@@ -0,0 +1,14 @@
+Value Filldown SLOTID (\S+)
+Value Required PCB (\w+)
+Value Required STATUS (\w+)
+Value TEMPERATURE (\d+)
+
+Start
+  ^${SLOTID}\s+: 
+  ^${PCB}\s+\d+\s+\d+\s+\d+\s+${STATUS}\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+${TEMPERATURE} -> Record
+  ^\s*Base-Board,
+  ^PCB\s+I2C\s+Addr\s+Chl\s+Status\s+Minor\s+Major\s+Fatal\s+Adj_speed\s+Temp\s*$$
+  ^\s+TMin\s+Tmax\s+\(\S+\)\s*$$
+  ^-+
+  ^\s*$$
+  ^. -> Error

templates/index

@@ -305,6 +305,9 @@ hp_procurve_show_system.template, .*, hp_procurve, sh[[ow]] syst[[em]]
 hp_procurve_show_vlans.template, .*, hp_procurve, sh[[ow]] vl[[ans]]
 hp_procurve_show_arp.template, .*, hp_procurve, sh[[ow]] ar[[p]]
 
+huawei_vrp_display_interface_brief.template, .*, huawei_vrp, disp[[lay]] inter[[face]] br[[ief]]
+huawei_vrp_display_temperature.template, .*, huawei_vrp, disp[[lay]] tem[[perature]]
+
 juniper_junos_show_chassis_cluster_interfaces.template, .*, juniper_junos, sh[[ow]] ch[[assis]] c[[luster]] i[[nterface]]
 juniper_junos_show_chassis_cluster_status.template, .*, juniper_junos, sh[[ow]] ch[[assis]] c[[luster]] s[[tatus]]
 juniper_junos_show_chassis_firmware.template, .*, juniper_junos, sh[[ow]] ch[[assis]] fi[[rmware]]

tests/huawei_vrp/display_interface_brief/huawei_vrp_display_interface_brief.parsed

@@ -0,0 +1,129 @@
+---
+parsed_sample:
+
+-   interface: 'Aux0/0/1'
+    phy: 'down'
+    protocol: 'down'
+    inuti: '0%'
+    oututi: '0%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'Eth-Trunk2'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '0.38%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'GigabitEthernet8/1/16'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '0.04%'
+    inerrors: '0'
+    outerrors: '0' 
+-   interface: 'GigabitEthernet8/1/17'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '1.66%'
+    inerrors: '0'
+    outerrors: '0'  
+-   interface: 'GigabitEthernet8/1/18'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '0.01%'
+    inerrors: '0'
+    outerrors: '0'   
+-   interface: 'GigabitEthernet8/1/19'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '0%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'GigabitEthernet8/1/20'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '0.47%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'Eth-Trunk3'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '0%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'GigabitEthernet8/1/21'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '0%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'GigabitEthernet8/1/22'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0%'
+    oututi: '0%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'GigabitEthernet8/1/23'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0.01%'
+    oututi: '0.01%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'Eth-Trunk4'
+    phy: 'up'
+    protocol: 'down'
+    inuti: '0.69%'
+    oututi: '13.57%'
+    inerrors: '4625'
+    outerrors: '0'
+-   interface: 'GigabitEthernet15/1/0(10G)'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0.69%'
+    oututi: '14.30%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'GigabitEthernet16/0/1(10G)'
+    phy: 'up'
+    protocol: 'up'
+    inuti: '0.71%'
+    oututi: '12.84%'
+    inerrors: '4625'
+    outerrors: '0'
+-   interface: 'Eth-Trunk4.10'
+    phy: 'up'
+    protocol: 'up'
+    inuti:  '0.69%'
+    oututi: '13.57%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'Eth-Trunk5'
+    phy: 'up'
+    protocol: 'down'
+    inuti:  '0.01%'
+    oututi: '0%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'GigabitEthernet4/0/4(10G)'
+    phy: 'up'
+    protocol: 'up'
+    inuti:  '0.01%'
+    oututi: '0%'
+    inerrors: '0'
+    outerrors: '0'
+-   interface: 'Eth-Trunk5.100'
+    phy: 'up'
+    protocol: 'up'
+    inuti:  '0%'
+    oututi: '0%'
+    inerrors: '0'
+    outerrors: '0'

tests/huawei_vrp/display_interface_brief/huawei_vrp_display_interface_brief.raw

@@ -0,0 +1,30 @@
+PHY: Physical
+*down: administratively down
+^down: standby
+(l): loopback
+(s): spoofing
+(E): E-Trunk down
+(b): BFD down
+(B): Bit-error-detection down
+(e): ETHOAM down
+(d): Dampening Suppressed
+InUti/OutUti: input utility/output utility
+Interface                   PHY   Protocol  InUti OutUti   inErrors  outErrors
+Aux0/0/1                    down  down         0%     0%          0          0
+Eth-Trunk2                  up    up           0%  0.38%          0          0
+  GigabitEthernet8/1/16     up    up           0%  0.04%          0          0
+  GigabitEthernet8/1/17     up    up           0%  1.66%          0          0
+  GigabitEthernet8/1/18     up    up           0%  0.01%          0          0
+  GigabitEthernet8/1/19     up    up           0%     0%          0          0
+  GigabitEthernet8/1/20     up    up           0%  0.47%          0          0
+Eth-Trunk3                  up    up           0%     0%          0          0
+  GigabitEthernet8/1/21     up    up           0%     0%          0          0
+  GigabitEthernet8/1/22     up    up           0%     0%          0          0
+  GigabitEthernet8/1/23     up    up        0.01%  0.01%          0          0
+Eth-Trunk4                  up    down      0.69% 13.57%       4625          0
+  GigabitEthernet15/1/0(10G) up    up        0.69% 14.30%          0          0
+  GigabitEthernet16/0/1(10G) up    up        0.71% 12.84%       4625          0
+Eth-Trunk4.10               up    up        0.69% 13.57%          0          0
+Eth-Trunk5                  up    down      0.01%     0%          0          0
+  GigabitEthernet4/0/4(10G) up    up        0.01%     0%          0          0
+Eth-Trunk5.100              up    up           0%     0%          0          0

tests/huawei_vrp/display_temperature/huawei_vrp_display_temperature.parsed

@@ -0,0 +1,47 @@
+---
+parsed_sample:
+
+- slotid: "SlotID2"
+  pcb: "LPUF41A"
+  status: "NORMAL"
+  temperature: "38"
+
+- slotid: "SlotID2"
+  pcb: "LPUF41A"
+  status: "NORMAL"
+  temperature: "36"
+
+- slotid: "SlotID2"
+  pcb: "LPUF41A"
+  status: "NORMAL"
+  temperature: "28"
+
+- slotid: "SlotID2"
+  pcb: "LPUF41A"
+  status: "NORMAL"
+  temperature: "55"
+
+- slotid: "SlotID2"
+  pcb: "LPUF41A"
+  status: "NORMAL"
+  temperature: "37"
+
+- slotid: "SlotID2"
+  pcb: "LPUF41A"
+  status: "NORMAL"
+  temperature: "41"
+
+- slotid: "SlotID2"
+  pcb: "EFGF"
+  status: "NORMAL"
+  temperature: "30"  
+
+- slotid: "SlotID2"
+  pcb: "EFGF"
+  status: "NORMAL"
+  temperature: "36"  
+
+- slotid: "SlotID27"
+  pcb: "FAN"
+  status: "NORMAL"
+  temperature: "25"  

tests/huawei_vrp/display_temperature/huawei_vrp_display_temperature.raw

@@ -0,0 +1,28 @@
+SlotID2 :
+ Base-Board, Unit:C, Slot2
+PCB       I2C Addr Chl  Status  Minor Major Fatal Adj_speed Temp
+                                               TMin Tmax (C)
+---------------------------------------------------------------
+LPUF41A   0   0    0    NORMAL  68    76    83    55   65   38
+LPUF41A   0   1    0    NORMAL  63    71    78    50   60   36
+LPUF41A   0   2    0    NORMAL  69    77    85    56   66   28
+LPUF41A   7   175  0    NORMAL  89    94    105   76   86   55
+LPUF41A   7   175  1    NORMAL  89    94    105   76   86   37
+LPUF41A   7   175  2    NORMAL  89    94    105   76   86   41
+EFGF      2   73   0    NORMAL  77    83    92    64   74   30
+EFGF      3   73   0    NORMAL  77    83    92    64   74   36
+
+SlotID25 :
+
+SlotID26 :
+
+SlotID27 :
+ Base-Board, Unit:C, SlotID27
+PCB   I2C Addr Chl  Status  Minor Major Fatal Adj_speed Temp
+                                              TMin Tmax (C)
+-----------------------------------------------------------------
+FAN   1   0    0    NORMAL  70    80    95    32   45   25
+
+
+
+SlotID31 : No temp sensors.

tests/test_index_order.py

@@ -61,8 +61,8 @@ def test_index_ordering():
         'brocade_fastiron', 'brocade_netiron', 'brocade_nos', 'brocade_vdx', 'brocade_vyos',
         'checkpoint_gaia', 'cisco_asa', 'cisco_ios', 'cisco_nxos', 'cisco_s300', 'cisco_wlc',
         'cisco_xe', 'cisco_xr', 'dell_force10', 'enterasys', 'extreme', 'f5_ltm', 'fortinet',
-        'hp_comware', 'hp_procurve', 'huawei', 'juniper', 'juniper_junos', 'juniper_screenos',
-        'alcatel_sros', 'linux', 'ovs_linux', 'paloalto_panos', 'quanta_mesh','ruckus_fastiron',
+        'hp_comware', 'hp_procurve', 'huawei_vrp', 'juniper', 'juniper_junos', 'juniper_screenos',
+        'linux', 'ovs_linux', 'paloalto_panos', 'quanta_mesh','ruckus_fastiron',
         'ubiquiti_edgeswitch', 'vmware_nsxv', 'vyatta_vyos', 'vyos', 'watchguard_firebox',
     ]