isisd: fix redistribution in vrf

When the redistribution is configured in non-default VRF, isisd should
redistribute routes from this VRF instead of default.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

15 files changed, 39 insertions, 39 deletions

diff --git a/tests/topotests/isis_topo1_vrf/r1/r1_route.json b/tests/topotests/isis_topo1_vrf/r1/r1_route.json
index f0a3593a4..8359baada 100644
--- a/tests/topotests/isis_topo1_vrf/r1/r1_route.json
+++ b/tests/topotests/isis_topo1_vrf/r1/r1_route.json
@@ -2,7 +2,7 @@
   "10.0.10.0/24": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r1/r1_route6.json b/tests/topotests/isis_topo1_vrf/r1/r1_route6.json
index 888b9e2c4..74961262b 100644
--- a/tests/topotests/isis_topo1_vrf/r1/r1_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r1/r1_route6.json
@@ -18,7 +18,7 @@
   "2001:db8:2:1::/64": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r1/r1_topology.json b/tests/topotests/isis_topo1_vrf/r1/r1_topology.json
index 1a6fe6d5c..666fa52b1 100644
--- a/tests/topotests/isis_topo1_vrf/r1/r1_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r1/r1_topology.json
@@ -33,7 +33,7 @@
         },
         {
           "interface": "r1-eth0",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r3",
           "parent": "r3(4)",
           "type": "IP TE",
@@ -41,7 +41,7 @@
         },
         {
           "interface": "r1-eth0",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r3",
           "parent": "r3(4)",
           "type": "IP TE",
@@ -67,8 +67,8 @@
           "vertex": "r3"
         },
         {
+          "metric": "10",
           "interface": "r1-eth0",
-          "metric": "20",
           "next-hop": "r3",
           "parent": "r3(4)",
           "type": "IP6 internal",
diff --git a/tests/topotests/isis_topo1_vrf/r2/r2_route.json b/tests/topotests/isis_topo1_vrf/r2/r2_route.json
index a26cdfad8..e2eee112b 100644
--- a/tests/topotests/isis_topo1_vrf/r2/r2_route.json
+++ b/tests/topotests/isis_topo1_vrf/r2/r2_route.json
@@ -2,7 +2,7 @@
   "10.0.11.0/24": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r2/r2_route6.json b/tests/topotests/isis_topo1_vrf/r2/r2_route6.json
index b01789b8d..21b953d0f 100644
--- a/tests/topotests/isis_topo1_vrf/r2/r2_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r2/r2_route6.json
@@ -18,7 +18,7 @@
   "2001:db8:2:2::/64": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r2/r2_topology.json b/tests/topotests/isis_topo1_vrf/r2/r2_topology.json
index a77f7977f..c26ad1ee3 100644
--- a/tests/topotests/isis_topo1_vrf/r2/r2_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r2/r2_topology.json
@@ -33,7 +33,7 @@
         },
         {
           "interface": "r2-eth0",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r4",
           "parent": "r4(4)",
           "type": "IP TE",
@@ -41,7 +41,7 @@
         },
         {
           "interface": "r2-eth0",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r4",
           "parent": "r4(4)",
           "type": "IP TE",
@@ -67,8 +67,8 @@
           "vertex": "r4"
         },
         {
+          "metric": "10",
           "interface": "r2-eth0",
-          "metric": "20",
           "next-hop": "r4",
           "parent": "r4(4)",
           "type": "IP6 internal",
diff --git a/tests/topotests/isis_topo1_vrf/r3/r3_route.json b/tests/topotests/isis_topo1_vrf/r3/r3_route.json
index 9717df5c1..33ad90cda 100644
--- a/tests/topotests/isis_topo1_vrf/r3/r3_route.json
+++ b/tests/topotests/isis_topo1_vrf/r3/r3_route.json
@@ -2,7 +2,7 @@
   "10.0.10.0/24": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "afi": "ipv4", 
@@ -32,7 +32,7 @@
   "10.0.11.0/24": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
@@ -67,7 +67,7 @@
   "10.0.21.0/24": [
     {
       "distance": 115, 
-      "metric": 30, 
+      "metric": 20, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r3/r3_route6.json b/tests/topotests/isis_topo1_vrf/r3/r3_route6.json
index 31a1e4620..519fe4968 100644
--- a/tests/topotests/isis_topo1_vrf/r3/r3_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r3/r3_route6.json
@@ -18,7 +18,7 @@
   "2001:db8:1:2::/64": [
     {
       "distance": 115, 
-      "metric": 30, 
+      "metric": 20, 
       "nexthops": [
         {
           "active": true, 
@@ -52,7 +52,7 @@
   "2001:db8:2:2::/64": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r3/r3_topology.json b/tests/topotests/isis_topo1_vrf/r3/r3_topology.json
index 1e5d33196..34892d4a3 100644
--- a/tests/topotests/isis_topo1_vrf/r3/r3_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r3/r3_topology.json
@@ -21,7 +21,7 @@
         },
         {
           "interface": "r3-eth1",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r5",
           "parent": "r5(4)",
           "type": "IP TE",
@@ -29,7 +29,7 @@
         },
         {
           "interface": "r3-eth1",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r5",
           "parent": "r5(4)",
           "type": "IP TE",
@@ -37,7 +37,7 @@
         },
         {
           "interface": "r3-eth1",
-          "metric": "30",
+          "metric": "20",
           "next-hop": "r5",
           "parent": "r4(4)",
           "type": "IP TE",
@@ -63,16 +63,16 @@
           "vertex": "r5"
         },
         {
+          "metric": "10",
           "interface": "r3-eth1",
-          "metric": "20",
           "next-hop": "r5",
           "parent": "r5(4)",
           "type": "IP6 internal",
           "vertex": "2001:db8:2:2::/64"
         },
         {
+          "metric": "20",
           "interface": "r3-eth1",
-          "metric": "30",
           "next-hop": "r5",
           "parent": "r4(4)",
           "type": "IP6 internal",
@@ -101,7 +101,7 @@
         },
         {
           "interface": "r3-eth0",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r3",
           "parent": "r3(4)",
           "type": "IP TE",
diff --git a/tests/topotests/isis_topo1_vrf/r4/r4_route.json b/tests/topotests/isis_topo1_vrf/r4/r4_route.json
index 6cb79b030..6fb3bd99d 100644
--- a/tests/topotests/isis_topo1_vrf/r4/r4_route.json
+++ b/tests/topotests/isis_topo1_vrf/r4/r4_route.json
@@ -1,7 +1,7 @@
 {
   "10.0.10.0/24": [
     {
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r4/r4_route6.json b/tests/topotests/isis_topo1_vrf/r4/r4_route6.json
index 88a91749c..702a83fb7 100644
--- a/tests/topotests/isis_topo1_vrf/r4/r4_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r4/r4_route6.json
@@ -2,7 +2,7 @@
   "2001:db8:1:1::/64": [
     {
       "distance": 115, 
-      "metric": 30, 
+      "metric": 20, 
       "nexthops": [
         {
           "active": true, 
@@ -36,7 +36,7 @@
   "2001:db8:2:1::/64": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r4/r4_topology.json b/tests/topotests/isis_topo1_vrf/r4/r4_topology.json
index 34f5ac9ca..d40008aa3 100644
--- a/tests/topotests/isis_topo1_vrf/r4/r4_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r4/r4_topology.json
@@ -21,7 +21,7 @@
         },
         {
           "interface": "r4-eth1",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r5",
           "parent": "r5(4)",
           "type": "IP TE",
@@ -29,7 +29,7 @@
         },
         {
           "interface": "r4-eth1",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r5",
           "parent": "r5(4)",
           "type": "IP TE",
@@ -37,7 +37,7 @@
         },
         {
           "interface": "r4-eth1",
-          "metric": "30",
+          "metric": "20",
           "next-hop": "r5",
           "parent": "r3(4)",
           "type": "IP TE",
@@ -63,16 +63,16 @@
           "vertex": "r5"
         },
         {
+          "metric": "10",
           "interface": "r4-eth1",
-          "metric": "20",
           "next-hop": "r5",
           "parent": "r5(4)",
           "type": "IP6 internal",
           "vertex": "2001:db8:2:1::/64"
         },
         {
+          "metric": "20",
           "interface": "r4-eth1",
-          "metric": "30",
           "next-hop": "r5",
           "parent": "r3(4)",
           "type": "IP6 internal",
@@ -101,7 +101,7 @@
         },
         {
           "interface": "r4-eth0",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r2",
           "parent": "r2(4)",
           "type": "IP TE",
diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_route.json b/tests/topotests/isis_topo1_vrf/r5/r5_route.json
index 5efa36bce..a254b6fdd 100644
--- a/tests/topotests/isis_topo1_vrf/r5/r5_route.json
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route.json
@@ -2,7 +2,7 @@
   "10.0.10.0/24": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "afi": "ipv4", 
diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_route6.json b/tests/topotests/isis_topo1_vrf/r5/r5_route6.json
index 5e8f6364a..06fc78f70 100644
--- a/tests/topotests/isis_topo1_vrf/r5/r5_route6.json
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route6.json
@@ -2,7 +2,7 @@
   "2001:db8:1:1::/64": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
@@ -20,7 +20,7 @@
   "2001:db8:1:2::/64": [
     {
       "distance": 115, 
-      "metric": 20, 
+      "metric": 10, 
       "nexthops": [
         {
           "active": true, 
diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_topology.json b/tests/topotests/isis_topo1_vrf/r5/r5_topology.json
index ace56536e..2a088cae3 100644
--- a/tests/topotests/isis_topo1_vrf/r5/r5_topology.json
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_topology.json
@@ -35,7 +35,7 @@
         },
         {
           "interface": "r5-eth0",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r3",
           "parent": "r3(4)",
           "type": "IP TE",
@@ -43,7 +43,7 @@
         },
         {
           "interface": "r5-eth0",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r3",
           "parent": "r3(4)",
           "type": "IP TE",
@@ -51,7 +51,7 @@
         },
         {
           "interface": "r5-eth1",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r4",
           "parent": "r4(4)",
           "type": "IP TE",
@@ -59,7 +59,7 @@
         },
         {
           "interface": "r5-eth1",
-          "metric": "20",
+          "metric": "10",
           "next-hop": "r4",
           "parent": "r4(4)",
           "type": "IP TE",
@@ -99,16 +99,16 @@
           "vertex": "r4"
         },
         {
+          "metric": "10",
           "interface": "r5-eth0",
-          "metric": "20",
           "next-hop": "r3",
           "parent": "r3(4)",
           "type": "IP6 internal",
           "vertex": "2001:db8:1:1::/64"
         },
         {
+          "metric": "10",
           "interface": "r5-eth1",
-          "metric": "20",
           "next-hop": "r4",
           "parent": "r4(4)",
           "type": "IP6 internal",