diff --git a/ntc_templates/templates/hp_comware_display_version.textfsm b/ntc_templates/templates/hp_comware_display_version.textfsm
new file mode 100644
index 0000000000..95734aceb3
--- /dev/null
+++ b/ntc_templates/templates/hp_comware_display_version.textfsm
@@ -0,0 +1,57 @@
+Value SOFTWARE_VERSION (\S+)
+Value SOFTWARE_RELEASE (\S+)
+Value MODEL (.+?)
+Value UPTIME (.+?)
+Value LAST_REBOOT_REASON (.+)
+Value SLOT_NUMBER (\d+)
+
+
+Start
+  ^\s*(HPE?\s+)?Comware\s+Software,\s+Version\s+${SOFTWARE_VERSION},\s+(Feature|Release)\s+${SOFTWARE_RELEASE}
+  ^\s*(H3C|HP)\s+Comware\s+
+  ^\s*Copyright\s+\(c\)
+  ^\s*(HPE?|H3C)\s+${MODEL}\s+(\d+-slot|EI|HI|Switch|\(\d+W\)).+uptime\s+is\s+${UPTIME}$$
+  ^\s*(HPE?|H3C)\s+${MODEL}\s+uptime\s+is\s+${UPTIME}$$ -> Record
+  ^\s*Hardware\s+Version
+  ^\s*Bootrom\s+Version
+  ^\s*CPLD
+  ^\s*\d+[A-Z]\s+bytes
+  ^\s*Last\s+reboot\s+reason\s+:\s+${LAST_REBOOT_REASON}
+  ^\s*Boot\s+image(\s+version)?:
+  ^\s*Compiled\s*.+
+  ^\s*System\s+image(\s+version)?: -> Record
+  ^\s*Feature\s+image
+  ^\s*Patch\s+image\(s\)\s*list:
+  ^\s*flash:
+  ^\s*(HPE?|H3C)\s+.+
+  ^\s*Slot\s*${SLOT_NUMBER}:?\s* -> Slot
+  ^\s*MPU\([MS]\)\s+(Slot\s*)?${SLOT_NUMBER}:?\s* -> Slot
+  ^\s*LPU\s+${SLOT_NUMBER}:?\s* -> Slot
+  ^\s*\[SubSlot\s*\d+\] 
+  ^\s*$$
+  ^. -> Error
+
+Slot
+  ^\s*Slot\s*${SLOT_NUMBER}:?\s*
+  ^\s*MPU\([MS]\)\s+(Slot\s*)?${SLOT_NUMBER}:?\s*
+  ^\s*LPU\s+${SLOT_NUMBER}:?\s*
+  ^\s*Uptime\s+is\s+${UPTIME}$$
+  ^\s*Release\s+Version:
+  ^\s*BOARD\s+TYPE:
+  ^\s*HPE?\s+${MODEL}\s+(Switch|with)
+  ^\s*${MODEL}\s+(Switch|with)
+  ^\s*(DRAM|FLASH|NVRAM):
+  ^\s*PCB
+  ^\s*(Basic|Extended)\s+BootWare\s+Version
+  ^\s*FPGA
+  ^\s*Boot[rR]om\s+Version:?
+  ^\s*(Bootware|Hardware)\s+Version
+  ^\s*CPLD
+  ^\s*Patch\s+Version\s*:
+  ^\s*Reboot\s+Cause\s*:\s+${LAST_REBOOT_REASON}
+  ^\s*Last\s+reboot\s+reason\s+:\s+${LAST_REBOOT_REASON}
+  ^\s*\d+[A-Z]\s+bytes
+  ^\s*Config\s+Register
+  ^\s*\[SubSlot\s*\d+\] -> Record 
+  ^\s*$$ -> Record
+  ^. -> Error
\ No newline at end of file
diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index
index 132d5a15fd..eabce257fd 100644
--- a/ntc_templates/templates/index
+++ b/ntc_templates/templates/index
@@ -668,6 +668,7 @@ hp_comware_display_mac-address.textfsm, .*, hp_comware, di[[splay]] mac-ad[[dres
 hp_comware_display_vlan_brief.textfsm, .*, hp_comware, di[[splay]] v[[lan]] b[[rief]]
 hp_comware_display_interface.textfsm, .*, hp_comware, dis[[play]] int[[erface]]
 hp_comware_display_vlan_all.textfsm, .*, hp_comware, di[[splay]] v[[lan]] a[[ll]]
+hp_comware_display_version.textfsm, .*, hp_comware, di[[splay]] ver[[sion]]
 hp_comware_display_clock.textfsm, .*, hp_comware, di[[splay]] clo[[ck]]
 hp_comware_display_arp.textfsm, .*, hp_comware, di[[splay]] a[[rp]]
 
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_1.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw5_1.raw
new file mode 100644
index 0000000000..f092f0b6fd
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_1.raw
@@ -0,0 +1,190 @@
+H3C Comware Platform Software
+Comware Software, Version 5.20, Feature 6709L25
+Copyright (c) 2004-2015 Hangzhou H3C Tech. Co., Ltd. All rights reserved.
+H3C S7510E uptime is 309 weeks, 1 day, 16 hours, 15 minutes
+
+LPU 0:
+Uptime is 309 weeks,1 days,17 hours,37 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 1:
+Uptime is 309 weeks,1 days,17 hours,36 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 2:
+Uptime is 309 weeks,1 days,17 hours,47 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 3:
+Uptime is 309 weeks,1 days,17 hours,37 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 4:
+Uptime is 309 weeks,1 days,17 hours,42 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+                
+MPU(M) 5:
+Uptime is 309 weeks,1 days,16 hours,15 minutes
+H3C S7510E MPU(M) with 1 BCM1125H Processor
+BOARD TYPE:         LSQ1SRP12GB
+DRAM:               512M bytes
+FLASH:              64M bytes
+NVRAM:              512K bytes
+PCB 1 Version:      VER.C
+PCB 2 Version:      VER.B
+Bootrom Version:    500
+CPLD 1 Version:     003
+CPLD 2 Version:     004
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+MPU(S) 6:
+Uptime is 309 weeks,1 days,17 hours,38 minutes
+H3C S7510E MPU(S) with 1 BCM1125H Processor
+BOARD TYPE:         LSQ1SRP12GB
+DRAM:               512M bytes
+FLASH:              64M bytes
+NVRAM:              512K bytes
+PCB 1 Version:      VER.C
+PCB 2 Version:      VER.B
+Bootrom Version:    500
+CPLD 1 Version:     003
+CPLD 2 Version:     004
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 7:
+Uptime is 309 weeks,1 days,17 hours,51 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 8:
+Uptime is 309 weeks,1 days,17 hours,43 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 9:
+Uptime is 309 weeks,1 days,17 hours,46 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+                
+LPU 10:
+Uptime is 309 weeks,1 days,17 hours,40 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 11:
+Uptime is 309 weeks,1 days,17 hours,37 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 12:
+Uptime is 309 weeks,1 days,18 hours,8 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         SRP12GBSLAVE
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      NA
+Bootware Version:   3.06
+CPLD 1 Version:     NA
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 13:
+Uptime is 309 weeks,1 days,18 hours,29 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         SRP12GBSLAVE
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      NA
+Bootware Version:   3.06
+CPLD 1 Version:     NA
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_1.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw5_1.yml
new file mode 100644
index 0000000000..68fd781301
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_1.yml
@@ -0,0 +1,92 @@
+---
+parsed_sample:
+  - last_reboot_reason: ""
+    model: "S7510E"
+    slot_number: ""
+    software_release: "6709L25"
+    software_version: "5.20"
+    uptime: "309 weeks, 1 day, 16 hours, 15 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "0"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,37 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,36 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "2"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,47 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "3"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,37 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "4"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,42 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E MPU(M)"
+    slot_number: "5"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,16 hours,15 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E MPU(S)"
+    slot_number: "6"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,38 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "7"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,51 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "8"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,43 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "9"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,46 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "10"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,40 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "11"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,37 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "12"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,18 hours,8 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "13"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,18 hours,29 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_2.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw5_2.raw
new file mode 100644
index 0000000000..f092f0b6fd
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_2.raw
@@ -0,0 +1,190 @@
+H3C Comware Platform Software
+Comware Software, Version 5.20, Feature 6709L25
+Copyright (c) 2004-2015 Hangzhou H3C Tech. Co., Ltd. All rights reserved.
+H3C S7510E uptime is 309 weeks, 1 day, 16 hours, 15 minutes
+
+LPU 0:
+Uptime is 309 weeks,1 days,17 hours,37 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 1:
+Uptime is 309 weeks,1 days,17 hours,36 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 2:
+Uptime is 309 weeks,1 days,17 hours,47 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 3:
+Uptime is 309 weeks,1 days,17 hours,37 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 4:
+Uptime is 309 weeks,1 days,17 hours,42 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+                
+MPU(M) 5:
+Uptime is 309 weeks,1 days,16 hours,15 minutes
+H3C S7510E MPU(M) with 1 BCM1125H Processor
+BOARD TYPE:         LSQ1SRP12GB
+DRAM:               512M bytes
+FLASH:              64M bytes
+NVRAM:              512K bytes
+PCB 1 Version:      VER.C
+PCB 2 Version:      VER.B
+Bootrom Version:    500
+CPLD 1 Version:     003
+CPLD 2 Version:     004
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+MPU(S) 6:
+Uptime is 309 weeks,1 days,17 hours,38 minutes
+H3C S7510E MPU(S) with 1 BCM1125H Processor
+BOARD TYPE:         LSQ1SRP12GB
+DRAM:               512M bytes
+FLASH:              64M bytes
+NVRAM:              512K bytes
+PCB 1 Version:      VER.C
+PCB 2 Version:      VER.B
+Bootrom Version:    500
+CPLD 1 Version:     003
+CPLD 2 Version:     004
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 7:
+Uptime is 309 weeks,1 days,17 hours,51 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 8:
+Uptime is 309 weeks,1 days,17 hours,43 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 9:
+Uptime is 309 weeks,1 days,17 hours,46 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+                
+LPU 10:
+Uptime is 309 weeks,1 days,17 hours,40 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 11:
+Uptime is 309 weeks,1 days,17 hours,37 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ3GV48SC
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   5.18
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 12:
+Uptime is 309 weeks,1 days,18 hours,8 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         SRP12GBSLAVE
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      NA
+Bootware Version:   3.06
+CPLD 1 Version:     NA
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
+
+LPU 13:
+Uptime is 309 weeks,1 days,18 hours,29 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         SRP12GBSLAVE
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      NA
+Bootware Version:   3.06
+CPLD 1 Version:     NA
+Release Version:    H3C S7510E-6709L25
+Patch Version  :    None
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_2.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw5_2.yml
new file mode 100644
index 0000000000..68fd781301
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_2.yml
@@ -0,0 +1,92 @@
+---
+parsed_sample:
+  - last_reboot_reason: ""
+    model: "S7510E"
+    slot_number: ""
+    software_release: "6709L25"
+    software_version: "5.20"
+    uptime: "309 weeks, 1 day, 16 hours, 15 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "0"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,37 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,36 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "2"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,47 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "3"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,37 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "4"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,42 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E MPU(M)"
+    slot_number: "5"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,16 hours,15 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E MPU(S)"
+    slot_number: "6"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,38 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "7"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,51 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "8"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,43 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "9"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,46 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "10"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,40 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "11"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,17 hours,37 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "12"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,18 hours,8 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "13"
+    software_release: ""
+    software_version: ""
+    uptime: "309 weeks,1 days,18 hours,29 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_3.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw5_3.raw
new file mode 100644
index 0000000000..a0f8274bf7
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_3.raw
@@ -0,0 +1,166 @@
+H3C Comware Platform Software
+Comware Software, Version 5.20, Feature 6709L05
+Copyright (c) 2004-2013 Hangzhou H3C Tech. Co., Ltd. All rights reserved.
+H3C S7510E uptime is 71 weeks, 1 day, 20 hours, 25 minutes
+
+LPU 0:
+Uptime is 71 weeks,1 days,20 hours,55 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         LSQ1GV48SC
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.D
+Bootware Version:   306
+CPLD 1 Version:     004
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 1:
+Uptime is 71 weeks,1 days,20 hours,58 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         LSQ1GV48SC
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.D
+Bootware Version:   305
+CPLD 1 Version:     004
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 2:
+Uptime is 71 weeks,1 days,20 hours,58 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         LSQ1GV48SC
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.D
+Bootware Version:   306
+CPLD 1 Version:     004
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 3:
+Uptime is 71 weeks,1 days,21 hours,8 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         LSQ1GV48SC
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.D
+Bootware Version:   303
+CPLD 1 Version:     004
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 4:
+Uptime is 71 weeks,1 days,21 hours,4 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         LSQ1GV48SC
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.D
+Bootware Version:   305
+CPLD 1 Version:     004
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+                
+MPU(M) 5:
+Uptime is 71 weeks,1 days,20 hours,25 minutes
+H3C S7510E MPU(M) with 1 BCM1125H Processor
+BOARD TYPE:         LSQ1SRP12GB
+DRAM:               512M bytes
+FLASH:              64M bytes
+NVRAM:              512K bytes
+PCB 1 Version:      VER.B
+PCB 2 Version:      VER.B
+Bootrom Version:    301
+CPLD 1 Version:     002
+CPLD 2 Version:     003
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+Slot 6 Without Board
+
+LPU 7:
+Uptime is 71 weeks,1 days,20 hours,57 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         LSQ1GV48SC
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.D
+Bootware Version:   305
+CPLD 1 Version:     004
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 8:
+Uptime is 71 weeks,1 days,21 hours,5 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         LSQ1GV48SC
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.D
+Bootware Version:   305
+CPLD 1 Version:     004
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 9:
+Uptime is 71 weeks,1 days,21 hours,3 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ1GV48SD
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   202
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 10:
+Uptime is 71 weeks,1 days,20 hours,59 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         LSQ1GV48SC
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.D
+Bootware Version:   306
+CPLD 1 Version:     004
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 11:
+Uptime is 71 weeks,1 days,20 hours,58 minutes
+H3C S7510E LPU with 1 XLS408 Processor
+BOARD TYPE:         LSQ1GV48SD
+DRAM:               1024M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.B
+Bootware Version:   202
+CPLD 1 Version:     003
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+LPU 12:
+Uptime is 71 weeks,1 days,20 hours,58 minutes
+H3C S7510E LPU with 1 BCM1122 Processor
+BOARD TYPE:         SRP12GBSLAVE
+DRAM:               512M bytes
+FLASH:              0M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      NA
+Bootware Version:   303
+CPLD 1 Version:     NA
+Release Version:    H3C S7510E-6709L05
+Patch Version  :    P003
+
+Slot 13 Without Board
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_3.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw5_3.yml
new file mode 100644
index 0000000000..b08af2c888
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_3.yml
@@ -0,0 +1,92 @@
+---
+parsed_sample:
+  - last_reboot_reason: ""
+    model: "S7510E"
+    slot_number: ""
+    software_release: "6709L05"
+    software_version: "5.20"
+    uptime: "71 weeks, 1 day, 20 hours, 25 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "0"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,20 hours,55 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,20 hours,58 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "2"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,20 hours,58 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "3"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,21 hours,8 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "4"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,21 hours,4 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E MPU(M)"
+    slot_number: "5"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,20 hours,25 minutes"
+  - last_reboot_reason: ""
+    model: ""
+    slot_number: "6"
+    software_release: ""
+    software_version: ""
+    uptime: ""
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "7"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,20 hours,57 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "8"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,21 hours,5 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "9"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,21 hours,3 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "10"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,20 hours,59 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "11"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,20 hours,58 minutes"
+  - last_reboot_reason: ""
+    model: "H3C S7510E LPU"
+    slot_number: "12"
+    software_release: ""
+    software_version: ""
+    uptime: "71 weeks,1 days,20 hours,58 minutes"
+  - last_reboot_reason: ""
+    model: ""
+    slot_number: "13"
+    software_release: ""
+    software_version: ""
+    uptime: ""
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_4.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw5_4.raw
new file mode 100644
index 0000000000..0417b6b62f
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_4.raw
@@ -0,0 +1,13 @@
+HP Comware Platform Software
+Comware Software, Version 5.20.99, Feature 2218
+Copyright (c) 2010-2012 Hewlett-Packard Development Company, L.P.
+HP A5120-48G-PoE+ EI Switch with 2 Interface Slots uptime is 413 weeks, 2 days, 13 hours, 54 minutes
+
+HP A5120-48G-PoE+ EI Switch with 2 Interface Slots with 1 Processor
+128M    bytes SDRAM
+16384K  bytes Flash Memory
+
+Hardware Version is REV.B
+CPLD Version is 007
+Bootrom Version is 616
+[SubSlot 0] 48GE+4SFP+POE Plus Hardware Version is REV.B
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_4.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw5_4.yml
new file mode 100644
index 0000000000..eac2162b37
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_4.yml
@@ -0,0 +1,8 @@
+---
+parsed_sample:
+  - last_reboot_reason: ""
+    model: "A5120-48G-PoE+"
+    slot_number: ""
+    software_release: "2218"
+    software_version: "5.20.99"
+    uptime: "413 weeks, 2 days, 13 hours, 54 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_5.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw5_5.raw
new file mode 100644
index 0000000000..e805cde0fa
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_5.raw
@@ -0,0 +1,13 @@
+H3C Comware Platform Software
+Comware Software, Version 5.20, Feature 2218
+Copyright (c) 2004-2012 Hangzhou H3C Tech. Co., Ltd. All rights reserved.
+H3C S5120-48P-EI uptime is 202 weeks, 1 day, 13 hours, 36 minutes
+
+H3C S5120-48P-EI with 1 Processor
+128M    bytes SDRAM
+16384K  bytes Flash Memory
+
+Hardware Version is REV.B
+CPLD Version is 007
+Bootrom Version is 616
+[SubSlot 0] 48GE+4SFP Hardware Version is REV.B
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw5_5.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw5_5.yml
new file mode 100644
index 0000000000..a40f9991e3
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw5_5.yml
@@ -0,0 +1,8 @@
+---
+parsed_sample:
+  - last_reboot_reason: ""
+    model: "S5120-48P-EI"
+    slot_number: ""
+    software_release: "2218"
+    software_version: "5.20"
+    uptime: "202 weeks, 1 day, 13 hours, 36 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_1.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw7_1.raw
new file mode 100644
index 0000000000..0d79e7d615
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_1.raw
@@ -0,0 +1,54 @@
+HPE Comware Software, Version 7.1.070, Release 6710P01-US
+Copyright (c) 2010-2023 Hewlett Packard Enterprise Development LP
+HPE FF 5945 32QSFP28 Switch uptime is 84 weeks, 2 days, 3 hours, 51 minutes
+Last reboot reason : Cold reboot
+
+Boot image: flash:/5945-cmw710-boot-r6710p01-US.bin
+Boot image version: 7.1.070-US, Release 6710P01-US
+  Compiled Feb 01 2023 11:00:00
+System image: flash:/5945-cmw710-system-r6710p01-US.bin
+System image version: 7.1.070, Release 6710P01-US
+  Compiled Feb 01 2023 11:00:00
+
+
+MPU(S) Slot 1:
+Uptime is 84 weeks,2 days,3 hours,47 minutes
+HPE FF 5945 32QSFP28 Switch MPU(S) with 1 C2538 Processor(s)
+BOARD TYPE:         FF 5945 32QSFP28 Switch
+DRAM:               8192M bytes
+FLASH:              3630M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.A
+PCB 2 Version:      VER.B
+PCB 3 Version:      VER.A
+Basic    BootWare Version: 112
+Extended BootWare Version: 112
+CPLD 1 Version:     002
+CPLD 2 Version:     001
+CPLD 3 Version:     002
+FPGA 1 Version:     001
+Release Version:    HPE FF 5945 32QSFP28 Switch-6710P01-US
+Patch Version:      None
+Reboot Cause:       ColdReboot
+[SubSlot 0] 32QSFP28 + 2SFP
+
+MPU(M) Slot 2:
+Uptime is 84 weeks,2 days,3 hours,51 minutes
+HPE FF 5945 32QSFP28 Switch MPU(M) with 1 C2538 Processor(s)
+BOARD TYPE:         FF 5945 32QSFP28 Switch
+DRAM:               8192M bytes
+FLASH:              3630M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.A
+PCB 2 Version:      VER.B
+PCB 3 Version:      VER.A
+Basic    BootWare Version: 112
+Extended BootWare Version: 112
+CPLD 1 Version:     002
+CPLD 2 Version:     001
+CPLD 3 Version:     002
+FPGA 1 Version:     001
+Release Version:    HPE FF 5945 32QSFP28 Switch-6710P01-US
+Patch Version:      None
+Reboot Cause:       ColdReboot
+[SubSlot 0] 32QSFP28 + 2SFP
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_1.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw7_1.yml
new file mode 100644
index 0000000000..2920eb3505
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_1.yml
@@ -0,0 +1,20 @@
+---
+parsed_sample:
+  - last_reboot_reason: "Cold reboot"
+    model: "FF 5945 32QSFP28"
+    slot_number: ""
+    software_release: "6710P01-US"
+    software_version: "7.1.070"
+    uptime: "84 weeks, 2 days, 3 hours, 51 minutes"
+  - last_reboot_reason: "ColdReboot"
+    model: "FF 5945 32QSFP28"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "84 weeks,2 days,3 hours,47 minutes"
+  - last_reboot_reason: "ColdReboot"
+    model: "FF 5945 32QSFP28"
+    slot_number: "2"
+    software_release: ""
+    software_version: ""
+    uptime: "84 weeks,2 days,3 hours,51 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_2.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw7_2.raw
new file mode 100644
index 0000000000..45f0dcf85d
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_2.raw
@@ -0,0 +1,44 @@
+HPE Comware Software, Version 7.1.045, Feature 2427
+Copyright (c) 2010-2016 Hewlett Packard Enterprise Development LP
+HPE FF 5930-32QSFP+ Switch uptime is 384 weeks, 5 days, 8 hours, 51 minutes
+Last reboot reason : USER reboot
+
+Boot image: flash:/5930-cmw710-boot-f2427.bin
+Boot image version: 7.1.045, Feature 2427
+  Compiled Feb 24 2016 16:00:00
+System image: flash:/5930-cmw710-system-f2427.bin
+System image version: 7.1.045, Feature 2427
+  Compiled Feb 24 2016 16:00:00
+
+
+Slot 1:
+Uptime is 50 weeks,2 days,12 hours,21 minutes
+FF 5930-32QSFP+ Switch with 2 Processors
+BOARD TYPE:         FF 5930-32QSFP+ Switch
+DRAM:               4096M bytes
+FLASH:              1024M bytes
+PCB 1 Version:      VER.A
+PCB 2 Version:      VER.A
+Bootrom Version:    219
+CPLD 1 Version:     002
+CPLD 2 Version:     003
+Release Version:    HPE FF 5930-32QSFP+ Switch-2427
+Patch Version  :    None
+Reboot Cause  :     UserReboot
+[SubSlot 0] 32QSFP Plus
+
+Slot 2:
+Uptime is 50 weeks,2 days,12 hours,9 minutes
+FF 5930-32QSFP+ Switch with 2 Processors
+BOARD TYPE:         FF 5930-32QSFP+ Switch
+DRAM:               4096M bytes
+FLASH:              1024M bytes
+PCB 1 Version:      VER.A
+PCB 2 Version:      VER.A
+Bootrom Version:    219
+CPLD 1 Version:     002
+CPLD 2 Version:     003
+Release Version:    HPE FF 5930-32QSFP+ Switch-2427
+Patch Version  :    None
+Reboot Cause  :     UserReboot
+[SubSlot 0] 32QSFP Plus
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_2.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw7_2.yml
new file mode 100644
index 0000000000..16f17e64e4
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_2.yml
@@ -0,0 +1,20 @@
+---
+parsed_sample:
+  - last_reboot_reason: "USER reboot"
+    model: "FF 5930-32QSFP+"
+    slot_number: ""
+    software_release: "2427"
+    software_version: "7.1.045"
+    uptime: "384 weeks, 5 days, 8 hours, 51 minutes"
+  - last_reboot_reason: "UserReboot"
+    model: "FF 5930-32QSFP+"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "50 weeks,2 days,12 hours,21 minutes"
+  - last_reboot_reason: "UserReboot"
+    model: "FF 5930-32QSFP+"
+    slot_number: "2"
+    software_release: ""
+    software_version: ""
+    uptime: "50 weeks,2 days,12 hours,9 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_3.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw7_3.raw
new file mode 100644
index 0000000000..6c2da05231
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_3.raw
@@ -0,0 +1,26 @@
+HPE Comware Software, Version 7.1.045, Release 1118P02
+Copyright (c) 2010-2015 Hewlett Packard Enterprise Development LP
+HPE 5130 48G 4SFP+ 1-slot HI Switch JH324A uptime is 497 weeks, 5 days, 15 hours, 4 minutes
+Last reboot reason : Cold reboot
+
+Boot image: flash:/5130hi-cmw710-boot-r1118p02.bin
+Boot image version: 7.1.045, Release 1118P02
+  Compiled Dec 14 2015 16:00:00
+System image: flash:/5130hi-cmw710-system-r1118p02.bin
+System image version: 7.1.045, Release 1118P02
+  Compiled Dec 14 2015 16:00:00
+
+
+Slot 1:
+Uptime is 497 weeks,5 days,15 hours,4 minutes
+HPE 5130 48G 4SFP+ 1-slot HI Switch JH324A with 2 Processors
+BOARD TYPE:         5130 48G 4SFP+ 1-slot HI Switch
+DRAM:               1984M bytes
+FLASH:              512M bytes
+PCB 1 Version:      VER.A
+Bootrom Version:    122
+CPLD 1 Version:     003
+Release Version:    HPE 5130 48G 4SFP+ 1-slot HI Switch JH324A-1118P02
+Patch Version  :    None
+Reboot Cause  :     ColdReboot
+[SubSlot 0] 48GE+4SFP Plus
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_3.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw7_3.yml
new file mode 100644
index 0000000000..27793425e6
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_3.yml
@@ -0,0 +1,14 @@
+---
+parsed_sample:
+  - last_reboot_reason: "Cold reboot"
+    model: "5130 48G 4SFP+"
+    slot_number: ""
+    software_release: "1118P02"
+    software_version: "7.1.045"
+    uptime: "497 weeks, 5 days, 15 hours, 4 minutes"
+  - last_reboot_reason: "ColdReboot"
+    model: "5130 48G 4SFP+ 1-slot HI"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "497 weeks,5 days,15 hours,4 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_4.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw7_4.raw
new file mode 100644
index 0000000000..e0273ea62d
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_4.raw
@@ -0,0 +1,26 @@
+HPE Comware Software, Version 7.1.045, Release 3113P02
+Copyright (c) 2010-2016 Hewlett Packard Enterprise Development LP
+HPE 5130-48G-PoE+-4SFP+ (370W) EI Switch uptime is 171 weeks, 5 days, 15 hours, 39 minutes
+Last reboot reason : Cold reboot
+
+Boot image: flash:/5130ei-cmw710-boot-r3113p02.bin
+Boot image version: 7.1.045, Release 3113P02
+  Compiled Apr 28 2016 16:00:00
+System image: flash:/5130ei-cmw710-system-r3113p02.bin
+System image version: 7.1.045, Release 3113P02
+  Compiled Apr 28 2016 16:00:00
+
+
+Slot 1:
+Uptime is 171 weeks,5 days,15 hours,39 minutes
+HPE 5130-48G-PoE+-4SFP+ (370W) EI JG937A with 1 Processor
+BOARD TYPE:         5130-48G-PoE+-4SFP+ EI
+DRAM:               1024M bytes
+FLASH:              512M bytes
+PCB 1 Version:      VER.B
+Bootrom Version:    143
+CPLD 1 Version:     002
+Release Version:    HPE 5130-48G-PoE+-4SFP+ (370W) EI JG937A-3113P02
+Patch Version  :    None
+Reboot Cause  :     ColdReboot
+[SubSlot 0] 48GE+4SFP Plus
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_4.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw7_4.yml
new file mode 100644
index 0000000000..901847edda
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_4.yml
@@ -0,0 +1,14 @@
+---
+parsed_sample:
+  - last_reboot_reason: "Cold reboot"
+    model: "5130-48G-PoE+-4SFP+"
+    slot_number: ""
+    software_release: "3113P02"
+    software_version: "7.1.045"
+    uptime: "171 weeks, 5 days, 15 hours, 39 minutes"
+  - last_reboot_reason: "ColdReboot"
+    model: "5130-48G-PoE+-4SFP+ (370W) EI JG937A"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "171 weeks,5 days,15 hours,39 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_5.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw7_5.raw
new file mode 100644
index 0000000000..d47dae3936
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_5.raw
@@ -0,0 +1,54 @@
+HPE Comware Software, Version 7.1.070, Release 6710P01-US
+Copyright (c) 2010-2023 Hewlett Packard Enterprise Development LP
+HPE FF 5945 32QSFP28 Switch uptime is 44 weeks, 1 day, 23 hours, 51 minutes
+Last reboot reason : Cold reboot
+
+Boot image: flash:/5945-cmw710-boot-r6710p01-US.bin
+Boot image version: 7.1.070-US, Release 6710P01-US
+  Compiled Feb 01 2023 11:00:00
+System image: flash:/5945-cmw710-system-r6710p01-US.bin
+System image version: 7.1.070, Release 6710P01-US
+  Compiled Feb 01 2023 11:00:00
+
+
+MPU(M) Slot 1:
+Uptime is 44 weeks,1 day,23 hours,51 minutes
+HPE FF 5945 32QSFP28 Switch MPU(M) with 1 C2538 Processor(s)
+BOARD TYPE:         FF 5945 32QSFP28 Switch
+DRAM:               8192M bytes
+FLASH:              3630M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.A
+PCB 2 Version:      VER.B
+PCB 3 Version:      VER.A
+Basic    BootWare Version: 112
+Extended BootWare Version: 112
+CPLD 1 Version:     002
+CPLD 2 Version:     001
+CPLD 3 Version:     002
+FPGA 1 Version:     001
+Release Version:    HPE FF 5945 32QSFP28 Switch-6710P01-US
+Patch Version:      None
+Reboot Cause:       ColdReboot
+[SubSlot 0] 32QSFP28 + 2SFP
+
+MPU(S) Slot 2:
+Uptime is 44 weeks,1 day,23 hours,51 minutes
+HPE FF 5945 32QSFP28 Switch MPU(S) with 1 C2538 Processor(s)
+BOARD TYPE:         FF 5945 32QSFP28 Switch
+DRAM:               8192M bytes
+FLASH:              3630M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.A
+PCB 2 Version:      VER.B
+PCB 3 Version:      VER.A
+Basic    BootWare Version: 112
+Extended BootWare Version: 112
+CPLD 1 Version:     002
+CPLD 2 Version:     001
+CPLD 3 Version:     002
+FPGA 1 Version:     001
+Release Version:    HPE FF 5945 32QSFP28 Switch-6710P01-US
+Patch Version:      None
+Reboot Cause:       ColdReboot
+[SubSlot 0] 32QSFP28 + 2SFP
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_5.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw7_5.yml
new file mode 100644
index 0000000000..97c82719bf
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_5.yml
@@ -0,0 +1,20 @@
+---
+parsed_sample:
+  - last_reboot_reason: "Cold reboot"
+    model: "FF 5945 32QSFP28"
+    slot_number: ""
+    software_release: "6710P01-US"
+    software_version: "7.1.070"
+    uptime: "44 weeks, 1 day, 23 hours, 51 minutes"
+  - last_reboot_reason: "ColdReboot"
+    model: "FF 5945 32QSFP28"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "44 weeks,1 day,23 hours,51 minutes"
+  - last_reboot_reason: "ColdReboot"
+    model: "FF 5945 32QSFP28"
+    slot_number: "2"
+    software_release: ""
+    software_version: ""
+    uptime: "44 weeks,1 day,23 hours,51 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_6.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw7_6.raw
new file mode 100644
index 0000000000..cb89131ca9
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_6.raw
@@ -0,0 +1,34 @@
+HPE Comware Software, Version 7.1.070, Release 6710P01-US
+Copyright (c) 2010-2023 Hewlett Packard Enterprise Development LP
+HPE FF 5945 48SFP28 8QSFP28 Switch uptime is 34 weeks, 2 days, 3 hours, 20 minutes
+Last reboot reason : User reboot
+
+Boot image: flash:/5945-cmw710-boot-r6710p01-US.bin
+Boot image version: 7.1.070-US, Release 6710P01-US
+  Compiled Feb 01 2023 11:00:00
+System image: flash:/5945-cmw710-system-r6710p01-US.bin
+System image version: 7.1.070, Release 6710P01-US
+  Compiled Feb 01 2023 11:00:00
+
+
+MPU(M) Slot 1:
+Uptime is 34 weeks,2 days,3 hours,20 minutes
+HPE FF 5945 48SFP28 8QSFP28 Switch MPU(M) with 1 C2538 Processor(s)
+BOARD TYPE:         FF 5945 48SFP28 8QSFP28 Switch
+DRAM:               8192M bytes
+FLASH:              3630M bytes
+NVRAM:              0K bytes
+PCB 1 Version:      VER.A
+PCB 2 Version:      VER.C
+PCB 3 Version:      VER.A
+Basic    BootWare Version: 112
+Extended BootWare Version: 112
+CPLD 1 Version:     002
+CPLD 2 Version:     002
+CPLD 3 Version:     002
+CPLD 4 Version:     002
+FPGA 1 Version:     001
+Release Version:    HPE FF 5945 48SFP28 8QSFP28 Switch-6710P01-US
+Patch Version:      None
+Reboot Cause:       UserReboot
+[SubSlot 0] 48SFP28 + 8QSFP28 + 2SFP
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_6.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw7_6.yml
new file mode 100644
index 0000000000..b7b9f9a506
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_6.yml
@@ -0,0 +1,14 @@
+---
+parsed_sample:
+  - last_reboot_reason: "User reboot"
+    model: "FF 5945 48SFP28 8QSFP28"
+    slot_number: ""
+    software_release: "6710P01-US"
+    software_version: "7.1.070"
+    uptime: "34 weeks, 2 days, 3 hours, 20 minutes"
+  - last_reboot_reason: "UserReboot"
+    model: "FF 5945 48SFP28 8QSFP28"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "34 weeks,2 days,3 hours,20 minutes"
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_7.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw7_7.raw
new file mode 100644
index 0000000000..259d7a9354
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_7.raw
@@ -0,0 +1,37 @@
+HP Comware Software, Version 7.1.045, Release 2310
+Copyright (c) 2010-2014 Hewlett-Packard Development Company, L.P.
+HP FF 5900CP-48XG-4QSFP+ Switch uptime is 44 weeks, 1 day, 23 hours, 18 minutes
+Last reboot reason : Power on
+
+Boot image: flash:/5900_5920-cmw710-boot-r2310.bin
+Boot image version: 7.1.045P13, Release 2310
+  Compiled May 23 2014 17:45:16
+System image: flash:/5900_5920-cmw710-system-r2310.bin
+System image version: 7.1.045, Release 2310
+  Compiled May 23 2014 17:45:30
+
+Slot 1
+HP FF 5900CP-48XG-4QSFP+ Switch with 2 Processors
+Last reboot reason : Power on
+2048M   bytes SDRAM
+4M      bytes Nor Flash Memory
+512M    bytes Nand Flash Memory
+Config Register points to Nand Flash
+
+Hardware Version is Ver.B
+CPLDA Version is 002, CPLDB Version is 002
+BootRom Version is 132
+[SubSlot 0] 48SFP Plus(Converged Port)+4QSFP Plus Hardware Version is Ver.B
+
+Slot 2
+HP FF 5900CP-48XG-4QSFP+ Switch with 2 Processors
+Last reboot reason : Power on
+2048M   bytes SDRAM
+4M      bytes Nor Flash Memory
+512M    bytes Nand Flash Memory
+Config Register points to Nand Flash
+
+Hardware Version is Ver.B
+CPLDA Version is 002, CPLDB Version is 002
+BootRom Version is 132
+[SubSlot 0] 48SFP Plus(Converged Port)+4QSFP Plus Hardware Version is Ver.B
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_7.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw7_7.yml
new file mode 100644
index 0000000000..61a1eaaebf
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_7.yml
@@ -0,0 +1,20 @@
+---
+parsed_sample:
+  - last_reboot_reason: "Power on"
+    model: "FF 5900CP-48XG-4QSFP+"
+    slot_number: ""
+    software_release: "2310"
+    software_version: "7.1.045"
+    uptime: "44 weeks, 1 day, 23 hours, 18 minutes"
+  - last_reboot_reason: "Power on"
+    model: "FF 5900CP-48XG-4QSFP+"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: ""
+  - last_reboot_reason: "Power on"
+    model: "FF 5900CP-48XG-4QSFP+"
+    slot_number: "2"
+    software_release: ""
+    software_version: ""
+    uptime: ""
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_8.raw b/tests/hp_comware/display_version/hp_comware_display_version_cw7_8.raw
new file mode 100644
index 0000000000..618b3e0fa8
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_8.raw
@@ -0,0 +1,45 @@
+HP Comware Software, Version 7.1.045, Release 2418P06
+Copyright (c) 2010-2015 Hewlett-Packard Development Company, L.P.
+HP 5900AF-48XG-4QSFP+ Switch uptime is 43 weeks, 6 days, 3 hours, 1 minute
+Last reboot reason : Cold reboot
+
+Boot image: flash:/5900_5920-cmw710-boot-r2418p06.bin
+Boot image version: 7.1.045, Release 2418P06
+  Compiled Aug 07 2015 15:40:53
+System image: flash:/5900_5920-cmw710-system-r2418p06.bin
+System image version: 7.1.045, Release 2418P06
+  Compiled Aug 07 2015 15:40:53
+Patch image(s) list:
+  flash:/5900_5920-cmw710-system-r2418p06h04.bin, version: Release 2418P06H04
+    Compiled Aug 07 2015 15:40:53
+
+
+Slot 1:
+Uptime is 43 weeks,6 days,2 hours,55 minutes
+5900AF-48XG-4QSFP+ Switch with 2 Processors
+BOARD TYPE:         5900AF-48XG-4QSFP+ Switch
+DRAM:               2048M bytes
+FLASH:              512M bytes
+PCB 1 Version:      VER.B
+Bootrom Version:    142
+CPLD 1 Version:     002
+CPLD 2 Version:     002
+Release Version:    HP 5900AF-48XG-4QSFP+ Switch-2418P06
+Patch Version  :    Release 2418P06H04
+Reboot Cause  :     ColdReboot
+[SubSlot 0] 48SFP Plus+4QSFP Plus
+
+Slot 2:
+Uptime is 43 weeks,6 days,3 hours,1 minute
+5900AF-48XG-4QSFP+ Switch with 2 Processors
+BOARD TYPE:         5900AF-48XG-4QSFP+ Switch
+DRAM:               2048M bytes
+FLASH:              512M bytes
+PCB 1 Version:      VER.B
+Bootrom Version:    142
+CPLD 1 Version:     002
+CPLD 2 Version:     002
+Release Version:    HP 5900AF-48XG-4QSFP+ Switch-2418P06
+Patch Version  :    Release 2418P06H04
+Reboot Cause  :     ColdReboot
+[SubSlot 0] 48SFP Plus+4QSFP Plus
\ No newline at end of file
diff --git a/tests/hp_comware/display_version/hp_comware_display_version_cw7_8.yml b/tests/hp_comware/display_version/hp_comware_display_version_cw7_8.yml
new file mode 100644
index 0000000000..d2c6e4831a
--- /dev/null
+++ b/tests/hp_comware/display_version/hp_comware_display_version_cw7_8.yml
@@ -0,0 +1,20 @@
+---
+parsed_sample:
+  - last_reboot_reason: "Cold reboot"
+    model: "5900AF-48XG-4QSFP+"
+    slot_number: ""
+    software_release: "2418P06"
+    software_version: "7.1.045"
+    uptime: "43 weeks, 6 days, 3 hours, 1 minute"
+  - last_reboot_reason: "ColdReboot"
+    model: "5900AF-48XG-4QSFP+"
+    slot_number: "1"
+    software_release: ""
+    software_version: ""
+    uptime: "43 weeks,6 days,2 hours,55 minutes"
+  - last_reboot_reason: "ColdReboot"
+    model: "5900AF-48XG-4QSFP+"
+    slot_number: "2"
+    software_release: ""
+    software_version: ""
+    uptime: "43 weeks,6 days,3 hours,1 minute"