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

Updating template for Huawei SmartAX: display ont info summary ont #1943

Merged
merged 3 commits into from
Dec 20, 2024
Merged

Updating template for Huawei SmartAX: display ont info summary ont #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8cb39c
Updating template for Huawei SmartAX: `display ont info summary ont`
evilmonkey19 Dec 20, 2024
1d1ce4f
Separating RX and TX and fixing small issue with whitespace at the end
evilmonkey19 Dec 20, 2024
fc469da
Apply suggestions from code review
jmcgill298 Dec 20, 2024
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
20 changes: 13 additions & 7 deletions ntc_templates/templates/huawei_smartax_display_ont_info_summary_ont.textfsm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
Value Filldown PORT (\S+)
Value Key ONT_ID (\d+)
Value RUN_STATE (\w+)
Value Required RUN_STATE (\w+)
Value LAST_UPTIME (\S+\s*\S+)
Value LAST_DOWNTIME (\S+\s*\S+)
Value LAST_DOWNCAUSE (\S+)

Start
^\s+-
^\s+ONT\s+Run\s+Last\s+Last\s+Last
^\s+ID\s+State\s+UpTime\s+DownTime\s+DownCause -> ONTs
^\s*Command\s*is\s*being\s*executed\.\s*Please\s*wait\s*$$
^\s*-
^\s+ID\s+State\s+UpTime\s+DownTime\s+DownCause\s*$$ -> ONTs
^\s+ONT\s+Run\s+Last\s+Last\s+Last\s*$$
^\s*In\s*port\s*${PORT},\s*the\s*total\s*of\s*ONTs\s*are:\s*\d+,\s*online:\s*\d+\s*$$
^\s*\d+\s*\S+\s*(-|\S+)\s*(-|\d+)\s+(-?\d+\.\d+\/-?\d+\.\d+|\S+)\s+(\S.+\S)\s*$$
^\s+ID\s+\(m\)\s+\(dBm\)
^\s*$$
^. -> Error

ONTs
^\s*-+\s*$$
^\s+${ONT_ID}\s+${RUN_STATE}\s+(-|${LAST_UPTIME})\s*(-|${LAST_DOWNTIME})\s+(-|${LAST_DOWNCAUSE}) -> Record
^\s+-
^\s+ONT\s+SN\s+Type\s+Distance\s+Rx\/Tx\s+power\s+Description
^\s+ID\s+\(m\)\s+\(dBm\) -> EOF
^\s+ONT\s+SN\s+Type\s+Distance\s+Rx\/Tx\s+power\s+Description\s*$$ -> Start
^. -> Error
20 changes: 14 additions & 6 deletions ntc_templates/templates/huawei_smartax_display_ont_info_summary_sn.textfsm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@ Value Key ONT_ID (\d+)
Value SERIAL_NUMBER (\w+)
Value ONT_MODEL_TYPE (\S+)
Value DISTANCE_M (\d+|-)
Value RX_TX_POWER_DBM (-?\d+\.\d+\/-?\d+\.\d+|\S+)
Value DESCRIPTION (\S+)
Value RX_POWER_DBM (-?\d+\.\d+)
Value TX_POWER_DBM (-?\d+\.\d+)
Value DESCRIPTION (\S.+\S)

Start
^\s*Command\s*is\s*being\s*executed\.\s*Please\s*wait\s*$$
^\s*In\s*port\s*\S+,\s*the\s*total\s*of\s*ONTs\s*are:\s*\d+,\s*online:\s*\d+\s*$$
^\s*ONT\s*Run\s*Last\s*Last\s*Last\s*$$
^\s*ID\s*State\s*UpTime\s*DownTime\s*DownCause\s*$$
^\s*\d+\s*\S+\s*(-|\S+\s\S+)\s*(-|\S+\s*\S+)\s*\S+\s*$$
^\s+-
^\s+ONT\s+SN\s+Type\s+Distance\s+Rx\/Tx\s+power\s+Description
^\s+ID\s+\(m\)\s+\(dBm\) -> SNs

SNs
^\s+${ONT_ID}\s+${SERIAL_NUMBER}\s+${ONT_MODEL_TYPE}\s+${DISTANCE_M}\s+${RX_TX_POWER_DBM}\s+${DESCRIPTION} -> Record
^\s+-
^\s+-\s*$$
^\s*$$
^. -> Error

SNs
^\s+-\s*$$
^\s+${ONT_ID}\s+${SERIAL_NUMBER}\s+${ONT_MODEL_TYPE}\s+${DISTANCE_M}\s+(-|${RX_POWER_DBM})\/(-|${TX_POWER_DBM})\s+${DESCRIPTION} -> Record
^\s*$$ -> Start
92 changes: 69 additions & 23 deletions ...awei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,226 +7,272 @@ parsed_sample:
last_uptime: "2000-01-01 00:00:00"
ont_id: "0"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "1"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "2"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "3"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "4"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "5"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "6"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "7"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "8"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "9"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "10"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "11"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "12"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "13"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "14"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "15"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "16"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "17"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "18"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "19"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "20"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "21"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
- description: "AB12"
distance_m: "100"
last_downcause: "LOSi/LOBi"
last_downtime: "2000-01-01 00:00:00"
last_uptime: "2000-01-01 00:00:00"
ont_id: "22"
ont_model_type: "AB1234C5"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-10.12/2.03"
rx_power_dbm: "-10.12"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.03"
4 changes: 3 additions & 1 deletion ...ei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont_2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ parsed_sample:
last_uptime: "2000-01-06 07:43:46"
ont_id: "0"
ont_model_type: "EG8145X6-10"
port: "0/2/11"
run_state: "online"
rx_tx_power_dbm: "-7.92/2.21"
rx_power_dbm: "-7.92"
serial_number: "1234567890ABCDEF"
tx_power_dbm: "2.21"
8 changes: 6 additions & 2 deletions ...ei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont_3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,20 @@ parsed_sample:
last_uptime: "1/1/2000 00:00:00"
ont_id: "0"
ont_model_type: "P612E"
port: "0/1/0"
run_state: "online"
rx_tx_power_dbm: "-22.84/2.12"
rx_power_dbm: "-22.84"
serial_number: "AAAAAAAAAAAAAAAA"
tx_power_dbm: "2.12"
- description: "P871E"
distance_m: "-"
last_downcause: "LOSi/LOBi"
last_downtime: "01/01/2000 00:00:00"
last_uptime: "1/1/2000 00:00:00"
ont_id: "1"
ont_model_type: "P871E-G"
port: "0/1/0"
run_state: "offline"
rx_tx_power_dbm: "-/-"
rx_power_dbm: ""
serial_number: "AAAAAAAAAAAAAAAA"
tx_power_dbm: ""
Loading