From 96d846d27ac818ee9a23bb7194bb58cfb7093387 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Tue, 16 May 2023 20:49:59 -0500
Subject: T5226: Combine ipv4-address and ipv6-address validators

Use a single ip-address validator to combine and replace ipv4-address
and ipv6-address validators.
---
 interface-definitions/include/bgp/neighbor-update-source.xml.i | 3 +--
 interface-definitions/include/bgp/protocol-common-config.xml.i | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'interface-definitions/include/bgp')

diff --git a/interface-definitions/include/bgp/neighbor-update-source.xml.i b/interface-definitions/include/bgp/neighbor-update-source.xml.i
index c6aa776c2..92e817166 100644
--- a/interface-definitions/include/bgp/neighbor-update-source.xml.i
+++ b/interface-definitions/include/bgp/neighbor-update-source.xml.i
@@ -20,8 +20,7 @@
       <description>Interface as route source</description>
     </valueHelp>
     <constraint>
-      <validator name="ipv4-address"/>
-      <validator name="ipv6-address"/>
+      <validator name="ip-address"/>
       #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 527eaf991..2d36f7de6 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -940,8 +940,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      <validator name="ipv4-address"/>
-      <validator name="ipv6-address"/>
+      <validator name="ip-address"/>
       #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
-- 
cgit v1.2.3