Fix Zyxel sys atsh template when there message before data (#1197)

networktocode · Oct 12, 2022 · 593294e · 593294e
1 parent e3454fc
commit 593294e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/ntc_templates/templates/zyxel_os_sys_atsh.textfsm b/ntc_templates/templates/zyxel_os_sys_atsh.textfsm
@@ -6,6 +6,7 @@ Value SERIAL_NUMBER (\S+)
 Value MAC_ADDRESS ([0-9A-F]{12})
 
 Start
+  ^\d{4}-\d{2}-\d{2}.* -> Next
   ^Firmware\sVersion\s*:\s${VERSION}
   ^Bootbase\sVersion\s*:\s${BOOT_VERSION}
   ^Vendor\sName\s*:\s${VENDOR}

diff --git a/...s/zyxel_os/sys_atsh/zyxel_os_sys_atsh.raw → ...zyxel_os/sys_atsh/zyxel_os_sys_atsh_1.raw b/...s/zyxel_os/sys_atsh/zyxel_os_sys_atsh.raw → ...zyxel_os/sys_atsh/zyxel_os_sys_atsh_1.raw
diff --git a/...s/zyxel_os/sys_atsh/zyxel_os_sys_atsh.yml → ...zyxel_os/sys_atsh/zyxel_os_sys_atsh_1.yml b/...s/zyxel_os/sys_atsh/zyxel_os_sys_atsh.yml → ...zyxel_os/sys_atsh/zyxel_os_sys_atsh_1.yml
diff --git a/tests/zyxel_os/sys_atsh/zyxel_os_sys_atsh_2.raw b/tests/zyxel_os/sys_atsh/zyxel_os_sys_atsh_2.raw
@@ -0,0 +1,10 @@
+2022-10-03 17:47:51 sys<25123>, zcfg_msg.c:235, _msg_recv(), WARNING: EID = 51, select() wait forever, EID = 1, type = 16 with reply, oid = 127956
+Firmware Version        : V5.30(ABSB.5)C0
+Bootbase Version        : V1.45 | 08/02/2021 17:45:45
+Vendor Name             : Zyxel Communications Corp.
+Product Model           : VMG1312-T20B
+Serial Number           : S220Y04043424
+First MAC Address       : 5C648E88D4E0
+Last MAC Address        : 5C648E88D4E7
+MAC Address Quantity    : 08 
+Default Country Code    : E1
diff --git a/tests/zyxel_os/sys_atsh/zyxel_os_sys_atsh_2.yml b/tests/zyxel_os/sys_atsh/zyxel_os_sys_atsh_2.yml
@@ -0,0 +1,8 @@
+---
+parsed_sample:
+  - version: "V5.30(ABSB.5)C0"
+    boot_version: "V1.45 | 08/02/2021 17:45:45"
+    vendor: "Zyxel Communications Corp."
+    hardware_model: "VMG1312-T20B"
+    serial_number: "S220Y04043424"
+    mac_address: "5C648E88D4E0"