fix: Mikrotik system resource print (#1866)

networktocode · Oct 10, 2024 · d234429 · d234429
1 parent 516443b
commit d234429
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 1 deletion.
diff --git a/ntc_templates/templates/mikrotik_routeros_system_resource_print.textfsm b/ntc_templates/templates/mikrotik_routeros_system_resource_print.textfsm
@@ -18,7 +18,7 @@ Value TOTAL_HDD_SPACE (\d+\.\d{1}(K|M|G)iB)
 Value WRITE_SECT_SINCE_REBOOT (\d+)
 Value WRITE_SECT_TOTAL (\d+)
 Value BAD_BLOCKS (\d{1,3}(\.\d+)?%)
-Value ARCHITECTURE_NAME (powerpc|x86|mipsbe|mipsle)
+Value ARCHITECTURE_NAME (\S*)
 Value BOARD_NAME (.+)
 Value PLATFORM (.+)
 

diff --git a/tests/mikrotik_routeros/system_resource_print/mikrotik_routeros_system_resource_print_3.raw b/tests/mikrotik_routeros/system_resource_print/mikrotik_routeros_system_resource_print_3.raw
@@ -0,0 +1,17 @@
+				   uptime: 5w3d20m51s
+                  version: 7.12.2 (stable)
+               build-time: Dec/20/2023 08:41:00
+         factory-software: 7.1
+              free-memory: 36.7MiB
+             total-memory: 192.0MiB
+                      cpu: Common
+                cpu-count: 2
+            cpu-frequency: 2294MHz
+                 cpu-load: 53%
+           free-hdd-space: 69.8MiB
+          total-hdd-space: 89.2MiB
+  write-sect-since-reboot: 213432
+         write-sect-total: 213432
+        architecture-name: x86_64
+               board-name: CHR
+                 platform: MikroTik
diff --git a/tests/mikrotik_routeros/system_resource_print/mikrotik_routeros_system_resource_print_3.yml b/tests/mikrotik_routeros/system_resource_print/mikrotik_routeros_system_resource_print_3.yml
@@ -0,0 +1,25 @@
+---
+parsed_sample:
+  - architecture_name: "x86_64"
+    bad_blocks: ""
+    board_name: "CHR"
+    build_time: "Dec/20/2023 08:41:00"
+    cpu: "Common"
+    cpu_count: "2"
+    cpu_frequency: "2294MHz"
+    cpu_load: "53%"
+    factory_software: "7.1"
+    free_hdd_space: "69.8MiB"
+    free_memory: "36.7MiB"
+    platform: "MikroTik"
+    total_hdd_space: "89.2MiB"
+    total_memory: "192.0MiB"
+    uptime: "5w3d20m51s"
+    uptime_days: "3"
+    uptime_hours: ""
+    uptime_minutes: "20"
+    uptime_seconds: "51"
+    uptime_weeks: "5"
+    version: "7.12.2 (stable)"
+    write_sect_since_reboot: "213432"
+    write_sect_total: "213432"
diff --git a/tests/mikrotik_routeros/system_resource_print/mikrotik_routeros_system_resource_print_4.raw b/tests/mikrotik_routeros/system_resource_print/mikrotik_routeros_system_resource_print_4.raw
@@ -0,0 +1,17 @@
+                   uptime: 10w2d6h21m59s
+                  version: 7.12.2 (stable)
+               build-time: Dec/20/2023 08:41:00
+         factory-software: 7.6
+              free-memory: 3704.1MiB
+             total-memory: 4032.0MiB
+                      cpu: ARM64
+                cpu-count: 4
+                 cpu-load: 36%
+           free-hdd-space: 104.4MiB
+          total-hdd-space: 128.0MiB
+  write-sect-since-reboot: 54120
+         write-sect-total: 291965
+               bad-blocks: 0%
+        architecture-name: arm64
+               board-name: CCR2004-1G-12S+2XS
+                 platform: MikroTik
diff --git a/tests/mikrotik_routeros/system_resource_print/mikrotik_routeros_system_resource_print_4.yml b/tests/mikrotik_routeros/system_resource_print/mikrotik_routeros_system_resource_print_4.yml
@@ -0,0 +1,25 @@
+---
+parsed_sample:
+  - architecture_name: "arm64"
+    bad_blocks: "0%"
+    board_name: "CCR2004-1G-12S+2XS"
+    build_time: "Dec/20/2023 08:41:00"
+    cpu: "ARM64"
+    cpu_count: "4"
+    cpu_frequency: ""
+    cpu_load: "36%"
+    factory_software: "7.6"
+    free_hdd_space: "104.4MiB"
+    free_memory: "3704.1MiB"
+    platform: "MikroTik"
+    total_hdd_space: "128.0MiB"
+    total_memory: "4032.0MiB"
+    uptime: "10w2d6h21m59s"
+    uptime_days: "2"
+    uptime_hours: "6"
+    uptime_minutes: "21"
+    uptime_seconds: "59"
+    uptime_weeks: "10"
+    version: "7.12.2 (stable)"
+    write_sect_since_reboot: "54120"
+    write_sect_total: "291965"