Merge pull request #4921 from hedrok/T7664-update-smoketest-script

T7664: support FRR 10.5

4 files changed, 7 insertions, 23 deletions

diff --git a/interface-definitions/include/system-ip-protocol.xml.i b/interface-definitions/include/system-ip-protocol.xml.i
index c630eb3f7..30d7ab04e 100644
--- a/interface-definitions/include/system-ip-protocol.xml.i
+++ b/interface-definitions/include/system-ip-protocol.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Filter routing info exchanged between routing protocol and zebra</help>
     <completionHelp>
-      <list>any babel bgp connected eigrp isis kernel ospf rip static table</list>
+      <list>any babel bgp eigrp isis ospf rip static</list>
     </completionHelp>
     <valueHelp>
       <format>any</format>
@@ -18,10 +18,6 @@
       <description>Border Gateway Protocol</description>
     </valueHelp>
     <valueHelp>
-      <format>connected</format>
-      <description>Connected routes (directly attached subnet or host)</description>
-    </valueHelp>
-    <valueHelp>
       <format>eigrp</format>
       <description>Enhanced Interior Gateway Routing Protocol</description>
     </valueHelp>
@@ -30,10 +26,6 @@
       <description>Intermediate System to Intermediate System</description>
     </valueHelp>
     <valueHelp>
-      <format>kernel</format>
-      <description>Kernel routes (not installed via the zebra RIB)</description>
-    </valueHelp>
-    <valueHelp>
       <format>ospf</format>
       <description>Open Shortest Path First (OSPFv2)</description>
     </valueHelp>
@@ -46,11 +38,11 @@
       <description>Statically configured routes</description>
     </valueHelp>
     <constraint>
-      <regex>(any|babel|bgp|connected|eigrp|isis|kernel|ospf|rip|static|table)</regex>
+      <regex>(any|babel|bgp|eigrp|isis|ospf|rip|static)</regex>
     </constraint>
   </properties>
   <children>
     #include <include/route-map.xml.i>
   </children>
 </tagNode>
-<!-- include end -->
\ No newline at end of file
+<!-- include end -->
diff --git a/interface-definitions/include/system-ipv6-protocol.xml.i b/interface-definitions/include/system-ipv6-protocol.xml.i
index 485776a71..1a8123cb2 100644
--- a/interface-definitions/include/system-ipv6-protocol.xml.i
+++ b/interface-definitions/include/system-ipv6-protocol.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Filter routing info exchanged between routing protocol and zebra</help>
     <completionHelp>
-      <list>any babel bgp connected isis kernel ospfv3 ripng static table</list>
+      <list>any babel bgp isis ospfv3 ripng static</list>
     </completionHelp>
     <valueHelp>
       <format>any</format>
@@ -18,18 +18,10 @@
       <description>Border Gateway Protocol</description>
     </valueHelp>
     <valueHelp>
-      <format>connected</format>
-      <description>Connected routes (directly attached subnet or host)</description>
-    </valueHelp>
-    <valueHelp>
       <format>isis</format>
       <description>Intermediate System to Intermediate System</description>
     </valueHelp>
     <valueHelp>
-      <format>kernel</format>
-      <description>Kernel routes (not installed via the zebra RIB)</description>
-    </valueHelp>
-    <valueHelp>
       <format>ospfv3</format>
       <description>Open Shortest Path First (OSPFv3)</description>
     </valueHelp>
@@ -42,7 +34,7 @@
       <description>Statically configured routes</description>
     </valueHelp>
     <constraint>
-      <regex>(any|babel|bgp|connected|isis|kernel|ospfv3|ripng|static|table)</regex>
+      <regex>(any|babel|bgp|isis|ospfv3|ripng|static)</regex>
     </constraint>
   </properties>
   <children>
diff --git a/interface-definitions/include/version/system-version.xml.i b/interface-definitions/include/version/system-version.xml.i
index a9987e8e4..55764fc40 100644
--- a/interface-definitions/include/version/system-version.xml.i
+++ b/interface-definitions/include/version/system-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/system-version.xml.i -->
-<syntaxVersion component='system' version='30'></syntaxVersion>
+<syntaxVersion component='system' version='31'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/include/version/vrf-version.xml.i b/interface-definitions/include/version/vrf-version.xml.i
index 9d7ff35fe..1c7c81155 100644
--- a/interface-definitions/include/version/vrf-version.xml.i
+++ b/interface-definitions/include/version/vrf-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/vrf-version.xml.i -->
-<syntaxVersion component='vrf' version='3'></syntaxVersion>
+<syntaxVersion component='vrf' version='4'></syntaxVersion>
 <!-- include end -->