In some versions of Alcatel AOS the command output is slighly different

networktocode · Dec 19, 2024 · 6508bc8 · 6508bc8
1 parent df99b8e
commit 6508bc8
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 5 deletions.
diff --git a/ntc_templates/templates/alcatel_aos_show_interfaces_port.textfsm b/ntc_templates/templates/alcatel_aos_show_interfaces_port.textfsm
@@ -7,19 +7,30 @@ Value RECOVERY_TIME (\d+)
 Value RECOVERY_MAX (\d+)
 Value WTR_RUNNING (\#?)
 Value WTR_TIME (\d+)
+Value WAIT_TO_SHUTDOWN (\d+)
 Value ALIAS (.*)
 
 Start
-  ^\s*-+\+ -> Table
   ^Legends: WTR - Wait To Restore
   ^\s+#
   ^\s+\*
-  ^\s*Slot/\s+Admin\s+Link\s+Violations\s+Recovery\s+Recovery\s+WTR\s+Alias\s*$$
-  ^\s*Port\s+Status\s+Status\s+Time\s+Max\s+\(sec\)\s*$$
+  ^\s+Chas\/\s*$$
+  ^\s*Slot\/\s+Admin\s+Link\s+Violations\s+Recovery\s+Recovery\s+WTR\s+Alias\s*$$
+  ^\s*Port\s+Status\s+Status\s+Time\s+Max\s+\(sec\)\s*$$ -> Table_1
+  ^\s*Slot\/\s+Admin\s+Link\s+WTR\s+WTS\s+Alias\s*$$
+  ^\s*Port\s+Status\s+Status\s+\(sec\)\s+\(msec\)\s*$$ -> Table_2
   ^\s*$$
   ^.*$$ -> Error
 
-Table
-  ^\s*${PERMANENT_SHUTDOWN}${PORT}\s+${ADMIN_STATUS}\s+${LINK_STATUS}\s+${VIOLATIONS}\s+${RECOVERY_TIME}\s+${RECOVERY_MAX}\s+(?:${WTR_RUNNING}\s+)?${WTR_TIME}\s+"${ALIAS}"\s*$$ -> Record
+Table_1
+  ^\s*-+\s*
+  ^\s*${PERMANENT_SHUTDOWN}${PORT}\s+${ADMIN_STATUS}\s+${LINK_STATUS}\s+${VIOLATIONS}\s+${RECOVERY_TIME}\s+${RECOVERY_MAX}\s+${WTR_RUNNING}\s+${WTR_TIME}\s+"${ALIAS}"\s*$$ -> Record
   ^\s*$$
   ^.*$$ -> Error
+
+Table_2
+  ^\s*-+\s*
+  ^\s*${PERMANENT_SHUTDOWN}${PORT}\s+${ADMIN_STATUS}\s+${LINK_STATUS}\s+${WTR_TIME}\s+${WAIT_TO_SHUTDOWN}\s+"${ALIAS}"\s*$$ -> Record
+  ^\s*$$
+  ^.*$$ -> Error
+
diff --git a/tests/alcatel_aos/show_interfaces_port/alcatel_aos_show_interfaces_port_R6.yml b/tests/alcatel_aos/show_interfaces_port/alcatel_aos_show_interfaces_port_R6.yml
@@ -8,6 +8,7 @@ parsed_sample:
     recovery_max: "10"
     recovery_time: "300"
     violations: "none"
+    wait_to_shutdown: ""
     wtr_running: ""
     wtr_time: "0"
   - admin_status: "enable"
@@ -18,6 +19,7 @@ parsed_sample:
     recovery_max: "10"
     recovery_time: "300"
     violations: "none"
+    wait_to_shutdown: ""
     wtr_running: ""
     wtr_time: "0"
   - admin_status: "enable"
@@ -28,6 +30,7 @@ parsed_sample:
     recovery_max: "10"
     recovery_time: "300"
     violations: "none"
+    wait_to_shutdown: ""
     wtr_running: "#"
     wtr_time: "10"
   - admin_status: "disable"
@@ -38,6 +41,7 @@ parsed_sample:
     recovery_max: "10"
     recovery_time: "300"
     violations: "none"
+    wait_to_shutdown: ""
     wtr_running: ""
     wtr_time: "0"
   - admin_status: "disable"
@@ -48,6 +52,7 @@ parsed_sample:
     recovery_max: "10"
     recovery_time: "300"
     violations: "none"
+    wait_to_shutdown: ""
     wtr_running: ""
     wtr_time: "0"
   - admin_status: "enable"
@@ -58,6 +63,7 @@ parsed_sample:
     recovery_max: "10"
     recovery_time: "300"
     violations: "none"
+    wait_to_shutdown: ""
     wtr_running: ""
     wtr_time: "0"
   - admin_status: "enable"
@@ -68,6 +74,7 @@ parsed_sample:
     recovery_max: "10"
     recovery_time: "300"
     violations: "none"
+    wait_to_shutdown: ""
     wtr_running: ""
     wtr_time: "0"
   - admin_status: "enable"
@@ -78,5 +85,6 @@ parsed_sample:
     recovery_max: "0"
     recovery_time: "0"
     violations: "none"
+    wait_to_shutdown: ""
     wtr_running: ""
     wtr_time: "0"
diff --git a/tests/alcatel_aos/show_interfaces_port/alcatel_aos_show_interfaces_port_R6_2.raw b/tests/alcatel_aos/show_interfaces_port/alcatel_aos_show_interfaces_port_R6_2.raw
@@ -0,0 +1,8 @@
+ Chas/
+ Slot/     Admin     Link        WTR      WTS       Alias
+ Port      Status   Status      (sec)    (msec)
+--------+----------+---------+----------+----------+-----------------------
+ 1/1/1     enable     up      0          0          "This is a test"
+ 1/1/2     enable     up      0          0          "This_is_a_test"
+ 1/1/3     enable     up      0          0          "This"
+ 1/1/4     enable     up      0          0          ""
diff --git a/tests/alcatel_aos/show_interfaces_port/alcatel_aos_show_interfaces_port_R6_2.yml b/tests/alcatel_aos/show_interfaces_port/alcatel_aos_show_interfaces_port_R6_2.yml
@@ -0,0 +1,46 @@
+---
+parsed_sample:
+  - admin_status: "enable"
+    alias: "This is a test"
+    link_status: "up"
+    permanent_shutdown: ""
+    port: "1/1/1"
+    recovery_max: ""
+    recovery_time: ""
+    violations: ""
+    wait_to_shutdown: "0"
+    wtr_running: ""
+    wtr_time: "0"
+  - admin_status: "enable"
+    alias: "This_is_a_test"
+    link_status: "up"
+    permanent_shutdown: ""
+    port: "1/1/2"
+    recovery_max: ""
+    recovery_time: ""
+    violations: ""
+    wait_to_shutdown: "0"
+    wtr_running: ""
+    wtr_time: "0"
+  - admin_status: "enable"
+    alias: "This"
+    link_status: "up"
+    permanent_shutdown: ""
+    port: "1/1/3"
+    recovery_max: ""
+    recovery_time: ""
+    violations: ""
+    wait_to_shutdown: "0"
+    wtr_running: ""
+    wtr_time: "0"
+  - admin_status: "enable"
+    alias: ""
+    link_status: "up"
+    permanent_shutdown: ""
+    port: "1/1/4"
+    recovery_max: ""
+    recovery_time: ""
+    violations: ""
+    wait_to_shutdown: "0"
+    wtr_running: ""
+    wtr_time: "0"