Fix time capture and handle 'under a minute' times in Aruba show syst…

…em (issue#1837) (networktocode#1858)
mjbear · Sep 30, 2024 · a4a5c3b · a4a5c3b
1 parent f591cb0
commit a4a5c3b
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 8 deletions.
diff --git a/ntc_templates/templates/aruba_aoscx_show_system.textfsm b/ntc_templates/templates/aruba_aoscx_show_system.textfsm
@@ -25,13 +25,10 @@ Start
   ^Base MAC Address\s+:\s+${BASE_MAC}	
   ^ArubaOS-CX Version\s+:\s+${VERSION}
   ^Time Zone\s+:\s+${TIME_ZONE}
-  ^Up Time\s+:\s+${UPTIME_WEEKS}\sweek -> Continue
-  ^.*${UPTIME_DAYS}\s+(day|days) -> Continue
-  ^.*${UPTIME_HOURS}\s+(hour|hours) -> Continue
-  ^.*${UPTIME_MINUTES}\s+(minute|minutes) -> Record
+  ^Up Time\s+:(\s+${UPTIME_WEEKS}\s+weeks?,?)?(\s+${UPTIME_DAYS}\s+days?,?)?(\s+${UPTIME_HOURS}\s+hours?,?)?(\s+(${UPTIME_MINUTES}|under\s+a)\s+minutes?)? -> Record
   ^CPU
   ^Memory
   ^-+$$
   ^\*+$$
   ^\s*$$
-  ^. -> Error "LINE NOT FOUND"
+  ^. -> Error "LINE NOT FOUND"
diff --git a/tests/aruba_aoscx/show_system/show_system.yml b/tests/aruba_aoscx/show_system/show_system.yml
@@ -9,7 +9,7 @@ parsed_sample:
     time_zone: "UTC"
     uptime_days: ""
     uptime_hours: ""
-    uptime_minutes: "2"
+    uptime_minutes: "12"
     uptime_weeks: ""
     vendor: "Aruba"
     version: "FL.10.11.1021"
diff --git a/tests/aruba_aoscx/show_system/show_system2.yml b/tests/aruba_aoscx/show_system/show_system2.yml
@@ -8,8 +8,8 @@ parsed_sample:
     serial: "XXXXXXXXXX"
     time_zone: "UTC"
     uptime_days: "1"
-    uptime_hours: "3"
-    uptime_minutes: "2"
+    uptime_hours: "23"
+    uptime_minutes: "32"
     uptime_weeks: ""
     vendor: "Aruba"
     version: "FL.10.11.1021"
diff --git a/tests/aruba_aoscx/show_system/show_system3.raw b/tests/aruba_aoscx/show_system/show_system3.raw
@@ -0,0 +1,16 @@
+Hostname           : 6300
+System Description : FL.10.10.1070
+System Contact     : 
+System Location    : 
+
+Vendor             : Aruba
+Product Name       : JL664A 6300M 24G 4SFP56 Swch
+Chassis Serial Nbr : xxxxxxxxxx
+Base MAC Address   : 001122-334455
+ArubaOS-CX Version : FL.10.10.1070
+
+Time Zone          : America/Edmonton
+
+Up Time            : 2 weeks, 22 hours under a minute
+CPU Util (%)       : 8
+Memory Usage (%)   : 25
diff --git a/tests/aruba_aoscx/show_system/show_system3.yml b/tests/aruba_aoscx/show_system/show_system3.yml
@@ -0,0 +1,15 @@
+---
+parsed_sample:
+  - base_mac: "001122-334455"
+    contact: ""
+    hostname: "6300"
+    location: ""
+    product: "JL664A 6300M 24G 4SFP56 Swch"
+    serial: "xxxxxxxxxx"
+    time_zone: "America/Edmonton"
+    uptime_days: ""
+    uptime_hours: "22"
+    uptime_minutes: ""
+    uptime_weeks: "2"
+    vendor: "Aruba"
+    version: "FL.10.10.1070"
diff --git a/tests/aruba_aoscx/show_system/show_system4.raw b/tests/aruba_aoscx/show_system/show_system4.raw
@@ -0,0 +1,16 @@
+Hostname           : 6300
+System Description : FL.10.10.1070
+System Contact     : 
+System Location    : 
+
+Vendor             : Aruba
+Product Name       : JL664A 6300M 24G 4SFP56 Swch
+Chassis Serial Nbr : xxxxxxxxxx
+Base MAC Address   : 001122-334455
+ArubaOS-CX Version : FL.10.10.1070
+
+Time Zone          : America/Edmonton
+
+Up Time            : 12 weeks, 13 days, 14 hours, under a minute
+CPU Util (%)       : 8
+Memory Usage (%)   : 25
diff --git a/tests/aruba_aoscx/show_system/show_system4.yml b/tests/aruba_aoscx/show_system/show_system4.yml
@@ -0,0 +1,15 @@
+---
+parsed_sample:
+  - base_mac: "001122-334455"
+    contact: ""
+    hostname: "6300"
+    location: ""
+    product: "JL664A 6300M 24G 4SFP56 Swch"
+    serial: "xxxxxxxxxx"
+    time_zone: "America/Edmonton"
+    uptime_days: "13"
+    uptime_hours: "14"
+    uptime_minutes: ""
+    uptime_weeks: "12"
+    vendor: "Aruba"
+    version: "FL.10.10.1070"