Separating RX and TX and fixing small issue with whitespace at the end

networktocode · Dec 20, 2024 · 1d1ce4f · 1d1ce4f
1 parent f8cb39c
commit 1d1ce4f
Show file tree

Hide file tree

Showing 7 changed files with 136 additions and 69 deletions.
diff --git a/ntc_templates/templates/huawei_smartax_display_ont_info_summary_ont.textfsm b/ntc_templates/templates/huawei_smartax_display_ont_info_summary_ont.textfsm
@@ -11,8 +11,9 @@ Start
   ^\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*\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

diff --git a/ntc_templates/templates/huawei_smartax_display_ont_info_summary_sn.textfsm b/ntc_templates/templates/huawei_smartax_display_ont_info_summary_sn.textfsm
@@ -2,8 +2,9 @@ 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*$$
@@ -20,5 +21,5 @@ Start
 
 SNs
   ^\s+-\s*$$
-  ^\s+${ONT_ID}\s+${SERIAL_NUMBER}\s+${ONT_MODEL_TYPE}\s+${DISTANCE_M}\s+${RX_TX_POWER_DBM}\s+${DESCRIPTION} -> Record
+  ^\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
diff --git a/...awei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont.yml b/...awei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont.yml
@@ -9,8 +9,9 @@ parsed_sample:
     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"
@@ -20,8 +21,9 @@ parsed_sample:
     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"
@@ -31,8 +33,9 @@ parsed_sample:
     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"
@@ -42,8 +45,9 @@ parsed_sample:
     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"
@@ -53,8 +57,9 @@ parsed_sample:
     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"
@@ -64,8 +69,9 @@ parsed_sample:
     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"
@@ -75,8 +81,9 @@ parsed_sample:
     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"
@@ -86,8 +93,9 @@ parsed_sample:
     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"
@@ -97,8 +105,9 @@ parsed_sample:
     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"
@@ -108,8 +117,9 @@ parsed_sample:
     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"
@@ -119,8 +129,9 @@ parsed_sample:
     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"
@@ -130,8 +141,9 @@ parsed_sample:
     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"
@@ -141,8 +153,9 @@ parsed_sample:
     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"
@@ -152,8 +165,9 @@ parsed_sample:
     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"
@@ -163,8 +177,9 @@ parsed_sample:
     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"
@@ -174,8 +189,9 @@ parsed_sample:
     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"
@@ -185,8 +201,9 @@ parsed_sample:
     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"
@@ -196,8 +213,9 @@ parsed_sample:
     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"
@@ -207,8 +225,9 @@ parsed_sample:
     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"
@@ -218,8 +237,9 @@ parsed_sample:
     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"
@@ -229,8 +249,9 @@ parsed_sample:
     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"
@@ -240,8 +261,9 @@ parsed_sample:
     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"
@@ -251,5 +273,6 @@ parsed_sample:
     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"
diff --git a/...ei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont_2.yml b/...ei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont_2.yml
@@ -9,5 +9,6 @@ parsed_sample:
     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"
diff --git a/...ei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont_3.yml b/...ei_smartax/display_ont_info_summary_ont/huawei_smartax_display_ont_info_summary_ont_3.yml
@@ -9,8 +9,9 @@ parsed_sample:
     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"
@@ -20,5 +21,6 @@ parsed_sample:
     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: ""