From 362255656884000574c96f4d3b5db0e7f310b4e3 Mon Sep 17 00:00:00 2001
From: Michael Bear <38406045+mjbear@users.noreply.github.com>
Date: Sat, 5 Aug 2023 23:58:43 -0400
Subject: [PATCH] split PREFIX into its parts of NETWORK and PREFIX_LENGTH
 (alcatel_sros_show_router_bgp_routes_vpn-ipv4)

---
 ...os_show_router_bgp_routes_vpn-ipv4.textfsm |  5 ++--
 ...l_sros_show_router_bgp_routes_vpn-ipv4.yml | 28 ++++++++++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ntc_templates/templates/alcatel_sros_show_router_bgp_routes_vpn-ipv4.textfsm b/ntc_templates/templates/alcatel_sros_show_router_bgp_routes_vpn-ipv4.textfsm
index fb88ec712f..a5eb7c88d7 100644
--- a/ntc_templates/templates/alcatel_sros_show_router_bgp_routes_vpn-ipv4.textfsm
+++ b/ntc_templates/templates/alcatel_sros_show_router_bgp_routes_vpn-ipv4.textfsm
@@ -1,6 +1,7 @@
 Value IN_OUT_USE (\*>i|u\*>i|\*i)
 Value RD (\d+\:\d+)
-Value Required PREFIX (\d+\.\d+\.\d+\.\d+\/[1-9][0-9]?)
+Value Required NETWORK (\d+(\.\d+){3})
+Value Required PREFIX_LENGTH (\d{1,2})
 Value LOCAL_PREF (\d+)
 Value MED (None|d\+)
 Value NEXT_HOP (\d+\.\d+\.\d+\.\d+)
@@ -12,6 +13,6 @@ Start
   ^----------- -> Prefix
 
 Prefix
-  ^${IN_OUT_USE}\s+${RD}\:${PREFIX}\s+${LOCAL_PREF}\s+${MED}
+  ^${IN_OUT_USE}\s+${RD}\:${NETWORK}\/${PREFIX_LENGTH}\s+${LOCAL_PREF}\s+${MED}
   ^\s+${NEXT_HOP}\s+${PATH_ID}\s+${LABEL}
   ^\s+${AS_PATH} -> Record
diff --git a/tests/alcatel_sros/show_router_bgp_routes_vpn-ipv4/alcatel_sros_show_router_bgp_routes_vpn-ipv4.yml b/tests/alcatel_sros/show_router_bgp_routes_vpn-ipv4/alcatel_sros_show_router_bgp_routes_vpn-ipv4.yml
index a9a4dcbf8c..9416c4df5b 100644
--- a/tests/alcatel_sros/show_router_bgp_routes_vpn-ipv4/alcatel_sros_show_router_bgp_routes_vpn-ipv4.yml
+++ b/tests/alcatel_sros/show_router_bgp_routes_vpn-ipv4/alcatel_sros_show_router_bgp_routes_vpn-ipv4.yml
@@ -1,20 +1,22 @@
 ---
 parsed_sample:
-  - med: "None"
-    as_path: "No As-Path"
-    label: "262132"
-    rd: "65500:11"
-    path_id: "None"
-    prefix: "192.0.2.4/32"
-    next_hop: "10.11.5.5"
+  - as_path: "No As-Path"
     in_out_use: "*>i"
-    local_pref: "100"
-  - med: "None"
-    as_path: "No As-Path"
     label: "262132"
-    rd: "65500:11"
+    local_pref: "100"
+    med: "None"
+    network: "192.0.2.4"
+    next_hop: "10.11.5.5"
     path_id: "None"
-    prefix: "192.0.2.14/32"
-    next_hop: "192.0.2.2"
+    prefix_length: "32"
+    rd: "65500:11"
+  - as_path: "No As-Path"
     in_out_use: "u*>i"
+    label: "262132"
     local_pref: "100"
+    med: "None"
+    network: "192.0.2.14"
+    next_hop: "192.0.2.2"
+    path_id: "None"
+    prefix_length: "32"
+    rd: "65500:11"