Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fsas Si-R show system information template #1956

Merged
merged 9 commits into from
Jan 8, 2025
Merged

Add Fsas Si-R show system information template #1956

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cdee0f1
add Fsas Si-R show system information template
caribouHY Dec 31, 2024
8288b56
Update ntc_templates/templates/fsas_sir_show_system_information.textfsm
caribouHY Jan 1, 2025
afccab0
Update ntc_templates/templates/fsas_sir_show_system_information.textfsm
caribouHY Jan 1, 2025
151675c
Update ntc_templates/templates/fsas_sir_show_system_information.textfsm
caribouHY Jan 1, 2025
106a773
fix simpler regex
caribouHY Jan 1, 2025
fb26b25
add test case supported WWAN and muliti USB ports
caribouHY Jan 1, 2025
b662613
Update ntc_templates/templates/fsas_sir_show_system_information.textfsm
caribouHY Jan 8, 2025
c628f4d
Update ntc_templates/templates/fsas_sir_show_system_information.textfsm
caribouHY Jan 8, 2025
65b2c8d
Update tests/fsas_sir/show_system_information/fasa_sir_show_system_in…
caribouHY Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions ntc_templates/templates/fsas_sir_show_system_information.textfsm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Value VERSION (\d\d.\d\d)
caribouHY marked this conversation as resolved.
Show resolved Hide resolved
Value SERIAL (\d+)
Value SYSTEM (.+)
caribouHY marked this conversation as resolved.
Show resolved Hide resolved
Value FIRMWARE (firmware\d)
Value CONFIG_FILE (config\d)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm on the fence whether it's better to just match these two with a simpler regex.

Which way do you lean on the topic?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that FIRMWARE and CONFIG name may change in the future.
I fixed the regex.

Value FIRMWARE (\S+)
Value CONFIG_FILE (\S+)

Value STARTUP_TIME (.+)
Value CURRENT_TIME (.+)
caribouHY marked this conversation as resolved.
Show resolved Hide resolved
Value FIRMWARE1_VERSION (\d\d.\d\d)
Value FIRMWARE2_VERSION (\d\d.\d\d)
caribouHY marked this conversation as resolved.
Show resolved Hide resolved

Start
^Current-time\s+:\s+${CURRENT_TIME}\s*$$
^Startup-time\s+:\s+${STARTUP_TIME}\s*$$
^System\s+:\s+${SYSTEM}\s*$$
^Serial No.\s+:\s+${SERIAL}\s*$$
^ROM Ver.\s+:\s+.+$$
^Firm Ver.\s+:\s+V${VERSION}\s*.+$$
^Running-firmware\s+:\s+${FIRMWARE}\s*$$
^Firmware1 Ver.\s+:\s+V${FIRMWARE1_VERSION}\s*.+$$
^Firmware2 Ver.\s+:\s+V${FIRMWARE2_VERSION}\s*.+$$
^Security Software Ver.\s+:\s+.+$$
caribouHY marked this conversation as resolved.
Show resolved Hide resolved
^Startup-config\s+:\s+\w+\s+\w+\s+\d+\s+[\d:]+\s+\d+\s+${CONFIG_FILE}\s*$$
^Running-config\s+:\s+.+$$
^MAC\s+:\s+.+$$
^Memory\s+:\s+.+$$
^USB\d?\s+:\s+.+$$
^WWAN\d?\s+.+$$
Comment on lines +26 to +27
Copy link
Contributor

@mjbear mjbear Jan 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@caribouHY
Do you have test output that covers USB (and WWAN) followed by a number?

The question and goal is to have good test coverage. Thank you!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a test case from command reference. I don't hava a device supported Wireless WAN and multiple USB ports.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a test case from command reference. I don't hava a device supported Wireless WAN and multiple USB ports.

Understood.
I'd say that's reasonable. Thank you.

^\s*$$
^. -> Error
2 changes: 2 additions & 0 deletions ntc_templates/templates/index
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,8 @@ fortinet_execute_date.textfsm, .*, fortinet, exec[[ute]] da[[te]]
fortinet_execute_ping.textfsm, .*, fortinet, exec[[ute]] ping
fortinet_execute_time.textfsm, .*, fortinet, exec[[ute]] ti[[me]]

fsas_sir_show_system_information.textfsm, .*, fsas_sir, sh[[ow]] sys[[tem]] i[[nformation]]

hp_comware_display_lldp_neighbor-information_verbose.textfsm, .*, hp_comware, di[[splay]] ll[[dp]] n[[eighbor-information]] v[[erbose]]
hp_comware_display_lldp_neighbor-information_list.textfsm, .*, hp_comware, di[[splay]] ll[[dp]] n[[eighbor-information]] l[[ist]]
hp_comware_display_ip_vpn-instance_instance-name.textfsm, .*, hp_comware, di[[splay]] ip vpn[[-instance]] in[[instance-name]]
Expand Down
14 changes: 14 additions & 0 deletions tests/fsas_sir/show_system_information/fsas_sir_show_system_information.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Current-time : Tue Dec 31 21:29:06 2024
Startup-time : Tue Dec 31 11:29:03 2024
System : Si-R G120
Serial No. : 12130001
ROM Ver. : U-Boot 2018.03-00086-g4bcc5bcade
Firm Ver. : V20.54 NY0115 Wed Nov 15 12:38:13 JST 2023
Running-firmware : firmware2
Firmware1 Ver. : V20.14 NY0067 Thu Dec 16 18:14:38 JST 2021
Firmware2 Ver. : V20.54 NY0115 Wed Nov 15 12:38:13 JST 2023
Startup-config : Tue Dec 31 20:28:25 2024 config1
Running-config : Tue Dec 31 20:27:35 2024
MAC : 68847ebdabf7-68847ebdabff
Memory : 320MB
USB : ------
11 changes: 11 additions & 0 deletions tests/fsas_sir/show_system_information/fsas_sir_show_system_information.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
parsed_sample:
- config_file: "config1"
current_time: "Tue Dec 31 21:29:06 2024"
firmware: "firmware2"
firmware1_version: "20.14"
firmware2_version: "20.54"
serial: "12130001"
startup_time: "Tue Dec 31 11:29:03 2024"
system: "Si-R G120"
version: "20.54"
11 changes: 11 additions & 0 deletions tests/fsas_sir/show_system_information/fsas_sir_show_system_information2.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Current-time : Thu Jan 1 00:00:08 1970
Startup-time : Thu Jan 1 00:00:00 1970
System : Si-R G110B
Serial No. : 10000001
ROM Ver. : 1.1
Firm Ver. : V04.12 NY0040 Wed Aug 4 08:51:54 JST 2021
Startup-config : Thu Jan 1 00:03:26 1970 config1
Running-config : Thu Jan 1 00:00:00 1970
MAC : 2cd44fffff58-2cd44fffff5e
Memory : 256MB
USB : ------
11 changes: 11 additions & 0 deletions tests/fsas_sir/show_system_information/fsas_sir_show_system_information2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
parsed_sample:
- config_file: "config1"
current_time: "Thu Jan 1 00:00:08 1970"
firmware: ""
firmware1_version: ""
firmware2_version: ""
serial: "10000001"
startup_time: "Thu Jan 1 00:00:00 1970"
system: "Si-R G110B"
version: "04.12"
1 change: 1 addition & 0 deletions tests/test_index_order.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"extreme_slxos",
"f5_ltm",
"fortinet",
"fsas_sir",
"hp_comware",
"hp_procurve",
"huawei_smartax",
Expand Down