routing: T3211: Add redistribute protocol IS-IS to bgp ospf rip

6 files changed, 35 insertions, 5 deletions

diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index 4af53acdc..69f4c2d52 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -75,6 +75,14 @@
                           #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
                         </children>
                       </node>
+                      <node name="isis">
+                        <properties>
+                          <help>Redistribute IS-IS routes into BGP</help>
+                        </properties>
+                        <children>
+                          #include <include/bgp-afi-redistribute-metric-route-map.xml.i>
+                        </children>
+                      </node>
                       <node name="kernel">
                         <properties>
                           <help>Redistribute kernel routes into BGP</help>
diff --git a/interface-definitions/protocols-ospf.xml.in b/interface-definitions/protocols-ospf.xml.in
index 4c480c71d..b9c9fcc04 100644
--- a/interface-definitions/protocols-ospf.xml.in
+++ b/interface-definitions/protocols-ospf.xml.in
@@ -39,6 +39,10 @@
                     <description>Filter connected routes</description>
                   </valueHelp>
                   <valueHelp>
+                    <format>isis</format>
+                    <description>Filter IS-IS routes</description>
+                  </valueHelp>
+                  <valueHelp>
                     <format>kernel</format>
                     <description>Filter Kernel routes</description>
                   </valueHelp>
@@ -51,7 +55,7 @@
                     <description>Filter static routes</description>
                   </valueHelp>
                   <constraint>
-                    <regex>^(bgp|connected|kernel|rip|static)$</regex>
+                    <regex>^(bgp|connected|isis|kernel|rip|static)$</regex>
                   </constraint>
                   <constraintErrorMessage>Must be bgp, connected, kernel, rip, or static</constraintErrorMessage>
                   <multi/>
@@ -699,6 +703,16 @@
                   #include <include/ospf-route-map.xml.i>
                 </children>
               </node>
+              <node name="isis">
+                <properties>
+                  <help>Redistribute IS-IS routes</help>
+                </properties>
+                <children>
+                  #include <include/ospf-metric.xml.i>
+                  #include <include/ospf-metric-type.xml.i>
+                  #include <include/ospf-route-map.xml.i>
+                </children>
+              </node>
               <node name="kernel">
                 <properties>
                   <help>Redistribute kernel routes</help>
diff --git a/interface-definitions/protocols-rip.xml.in b/interface-definitions/protocols-rip.xml.in
index 263350dc8..1ae3bd8f7 100644
--- a/interface-definitions/protocols-rip.xml.in
+++ b/interface-definitions/protocols-rip.xml.in
@@ -176,6 +176,14 @@
                   #include <include/rip-redistribute.xml.i>
                 </children>
               </node>
+              <node name="isis">
+                <properties>
+                  <help>Redistribute IS-IS routes</help>
+                </properties>
+                <children>
+                  #include <include/rip-redistribute.xml.i>
+                </children>
+              </node>
               <node name="kernel">
                 <properties>
                   <help>Redistribute kernel routes</help>
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index 1de51a1fc..b6a6a493c 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -388,7 +388,7 @@ class TestProtocolsBGP(unittest.TestCase):
         }
 
         # We want to redistribute ...
-        redistributes = ['connected', 'kernel', 'ospf', 'rip', 'static']
+        redistributes = ['connected', 'isis', 'kernel', 'ospf', 'rip', 'static']
         for redistribute in redistributes:
             self.session.set(base_path + ['address-family', 'ipv4-unicast',
                                           'redistribute', redistribute])
diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
index ce30f6a7d..0ca8bb3bd 100755
--- a/smoketest/scripts/cli/test_protocols_ospf.py
+++ b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -88,7 +88,7 @@ class TestProtocolsOSPF(unittest.TestCase):
     def test_ospf_03_access_list(self):
         acl = '100'
         seq = '10'
-        protocols = ['bgp', 'connected', 'kernel', 'rip', 'static']
+        protocols = ['bgp', 'connected', 'isis', 'kernel', 'rip', 'static']
 
         self.session.set(['policy', 'access-list', acl, 'rule', seq, 'action', 'permit'])
         self.session.set(['policy', 'access-list', acl, 'rule', seq, 'source', 'any'])
@@ -215,7 +215,7 @@ class TestProtocolsOSPF(unittest.TestCase):
     def test_ospf_08_redistribute(self):
         metric = '15'
         metric_type = '1'
-        redistribute = ['bgp', 'connected', 'kernel', 'rip', 'static']
+        redistribute = ['bgp', 'connected', 'isis', 'kernel', 'rip', 'static']
 
         for protocol in redistribute:
             self.session.set(base_path + ['redistribute', protocol, 'metric', metric])
diff --git a/smoketest/scripts/cli/test_protocols_rip.py b/smoketest/scripts/cli/test_protocols_rip.py
index 2c5c9030a..f42ea0c0a 100755
--- a/smoketest/scripts/cli/test_protocols_rip.py
+++ b/smoketest/scripts/cli/test_protocols_rip.py
@@ -71,7 +71,7 @@ class TestProtocolsRIP(unittest.TestCase):
         interfaces = Section.interfaces('ethernet')
         neighbors = ['1.2.3.4', '1.2.3.5', '1.2.3.6']
         networks = ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']
-        redistribute = ['bgp', 'connected', 'kernel', 'ospf', 'static']
+        redistribute = ['bgp', 'connected', 'isis', 'kernel', 'ospf', 'static']
         timer_garbage = '888'
         timer_timeout = '1000'
         timer_update = '90'