From 379593fafd6f6b53b1b8d677f46344e5fc2062ec Mon Sep 17 00:00:00 2001
From: PavloSkliarenko <78343937+PavloSkliarenko@users.noreply.github.com>
Date: Tue, 26 Dec 2023 19:48:49 +0400
Subject: [PATCH] Mikrotik routeros ip address print FLAGS value fix (#1574)

* Template + test
* Fix template for Mikrotik's command '/ip address print'
---
 ...mikrotik_routeros_ip_address_print.textfsm |  2 +-
 .../mikrotik_routeros_ip_address_print_1.raw  |  8 +++++
 .../mikrotik_routeros_ip_address_print_1.yml  | 30 +++++++++++++++++++
 .../mikrotik_routeros_ip_address_print_2.raw  |  6 ++++
 .../mikrotik_routeros_ip_address_print_2.yml  | 30 +++++++++++++++++++
 5 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_1.raw
 create mode 100644 tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_1.yml
 create mode 100644 tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_2.raw
 create mode 100644 tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_2.yml

diff --git a/ntc_templates/templates/mikrotik_routeros_ip_address_print.textfsm b/ntc_templates/templates/mikrotik_routeros_ip_address_print.textfsm
index 2a56a8424d..6f15ca36a2 100644
--- a/ntc_templates/templates/mikrotik_routeros_ip_address_print.textfsm
+++ b/ntc_templates/templates/mikrotik_routeros_ip_address_print.textfsm
@@ -1,5 +1,5 @@
 Value NUM (\d+)
-Value FLAGS (X|I|D)
+Value FLAGS ((?:X|I|D)+)
 Value COMMENT (.*)
 Value IP (\S+)
 Value SUBNET (\d+)
diff --git a/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_1.raw b/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_1.raw
new file mode 100644
index 0000000000..9985d9f4dd
--- /dev/null
+++ b/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_1.raw
@@ -0,0 +1,8 @@
+Flags: X - disabled, I - invalid, D - dynamic
+ #   ADDRESS            NETWORK         INTERFACE
+ 0   1.2.3.6/30         1.2.3.4         ether1
+ 1   ;;; test ip1
+     192.167.1.5/27     192.167.1.0     eth2_vlan1
+ 2 D 192.168.1.53/24    192.168.1.0     lte1
+ 3 X ;;; test ip2
+     192.167.1.99/27    192.167.1.0     eth2_vlan2
diff --git a/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_1.yml b/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_1.yml
new file mode 100644
index 0000000000..9db49d151d
--- /dev/null
+++ b/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_1.yml
@@ -0,0 +1,30 @@
+---
+parsed_sample:
+  - num: "0"
+    flags: ""
+    comment: ""
+    ip: "1.2.3.6"
+    subnet: "30"
+    network: "1.2.3.4"
+    interface: "ether1"
+  - num: "1"
+    flags: ""
+    comment: "test ip1"
+    ip: "192.167.1.5"
+    subnet: "27"
+    network: "192.167.1.0"
+    interface: "eth2_vlan1"
+  - num: "2"
+    flags: "D"
+    comment: ""
+    ip: "192.168.1.53"
+    subnet: "24"
+    network: "192.168.1.0"
+    interface: "lte1"
+  - num: "3"
+    flags: "X"
+    comment: "test ip2"
+    ip: "192.167.1.99"
+    subnet: "27"
+    network: "192.167.1.0"
+    interface: "eth2_vlan2"
diff --git a/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_2.raw b/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_2.raw
new file mode 100644
index 0000000000..e944ec28cf
--- /dev/null
+++ b/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_2.raw
@@ -0,0 +1,6 @@
+Flags: X - disabled, I - invalid, D - dynamic
+ #   ADDRESS            NETWORK         INTERFACE
+ 0   10.156.1.229/30    10.156.1.228    ether4_CiscoPhone3
+ 1   10.152.1.229/30    10.152.1.228    ether5_KFCcisco
+ 2   10.160.1.229/30    10.160.1.228    ether2_BOX
+ 3 XI 10.100.3.200/27    10.100.3.192    bridge70
diff --git a/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_2.yml b/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_2.yml
new file mode 100644
index 0000000000..b032a233be
--- /dev/null
+++ b/tests/mikrotik_routeros/ip_address_print/mikrotik_routeros_ip_address_print_2.yml
@@ -0,0 +1,30 @@
+---
+parsed_sample:
+  - comment: ""
+    flags: ""
+    interface: "ether4_CiscoPhone3"
+    ip: "10.156.1.229"
+    network: "10.156.1.228"
+    num: "0"
+    subnet: "30"
+  - comment: ""
+    flags: ""
+    interface: "ether5_KFCcisco"
+    ip: "10.152.1.229"
+    network: "10.152.1.228"
+    num: "1"
+    subnet: "30"
+  - comment: ""
+    flags: ""
+    interface: "ether2_BOX"
+    ip: "10.160.1.229"
+    network: "10.160.1.228"
+    num: "2"
+    subnet: "30"
+  - comment: ""
+    flags: "XI"
+    interface: "bridge70"
+    ip: "10.100.3.200"
+    network: "10.100.3.192"
+    num: "3"
+    subnet: "27"