Commit 24cbf6f8 authored by Ondřej Zajíček's avatar Ondřej Zajíček
Browse files

Tests: Make consistent static routes in remaining OSPF tests

And update test data
parent 505e21f0
...@@ -37,20 +37,23 @@ protocol kernel kernel6 { ...@@ -37,20 +37,23 @@ protocol kernel kernel6 {
protocol static static4 { protocol static static4 {
ipv4 { table master4; }; ipv4 { table master4; };
route 10.10.0.0/24 via 10.0.1.2; route 10.1.10.0/24 via 10.1.1.2;
route 10.10.1.0/24 via 10.0.1.2; route 10.1.11.0/24 via 10.1.1.2;
route 10.50.1.0/24 via 10.1.1.2;
} }
protocol static static5 { protocol static static5 {
ipv4 { table master5; }; ipv4 { table master5; };
route 10.10.0.0/24 via 10.0.1.2; route 10.1.10.0/24 via 10.1.1.2;
route 10.10.1.0/24 via 10.0.1.2; route 10.1.11.0/24 via 10.1.1.2;
route 10.50.1.0/24 via 10.1.1.2;
} }
protocol static static6 { protocol static static6 {
ipv6; ipv6;
route 2001:db8:10:10::/64 via 2001:db8:1:1::10; route 2001:db8:1:10::/64 via 2001:db8:1:1::10;
route 2001:db8:10:11::/64 via 2001:db8:1:1::10; route 2001:db8:1:11::/64 via 2001:db8:1:1::10;
route 2001:db8:50:1::/64 via 2001:db8:1:1::10;
} }
protocol ospf v2 ospf4 { protocol ospf v2 ospf4 {
......
...@@ -37,23 +37,23 @@ protocol kernel kernel6 { ...@@ -37,23 +37,23 @@ protocol kernel kernel6 {
protocol static static4 { protocol static static4 {
ipv4 { table master4; }; ipv4 { table master4; };
route 10.50.0.0/24 via 10.0.2.2; route 10.2.10.0/24 via 10.2.1.2;
route 10.50.1.0/24 via 10.0.2.2; route 10.2.11.0/24 via 10.2.1.2;
route 10.20.0.0/24 via 10.0.2.2; route 10.50.1.0/24 via 10.2.1.2;
} }
protocol static static5 { protocol static static5 {
ipv4 { table master5; }; ipv4 { table master5; };
route 10.50.0.0/24 via 10.0.2.2; route 10.2.10.0/24 via 10.2.1.2;
route 10.50.1.0/24 via 10.0.2.2; route 10.2.11.0/24 via 10.2.1.2;
route 10.20.0.0/24 via 10.0.2.2; route 10.50.1.0/24 via 10.2.1.2;
} }
protocol static static6 { protocol static static6 {
ipv6; ipv6;
route 2001:db8:2:10::/64 via 2001:db8:2:1::10;
route 2001:db8:2:11::/64 via 2001:db8:2:1::10;
route 2001:db8:50:1::/64 via 2001:db8:2:1::10; route 2001:db8:50:1::/64 via 2001:db8:2:1::10;
route 2001:db8:50:2::/64 via 2001:db8:2:1::10;
route 2001:db8:20:10::/64 via 2001:db8:2:1::10;
} }
protocol ospf v2 ospf4 { protocol ospf v2 ospf4 {
......
...@@ -37,23 +37,27 @@ protocol kernel kernel6 { ...@@ -37,23 +37,27 @@ protocol kernel kernel6 {
protocol static static4 { protocol static static4 {
ipv4 { table master4; }; ipv4 { table master4; };
route 10.30.0.0/24 via 10.0.3.2; route 10.3.10.0/24 via 10.3.1.2;
route 10.3.11.0/24 via 10.3.1.2;
} }
protocol static static5 { protocol static static5 {
ipv4 { table master5; }; ipv4 { table master5; };
route 10.30.0.0/24 via 10.0.3.2; route 10.3.10.0/24 via 10.3.1.2;
route 10.3.11.0/24 via 10.3.1.2;
} }
protocol static static6 { protocol static static6 {
ipv6; ipv6;
route 2001:db8:30:10::/64 via 2001:db8:3:1::10; route 2001:db8:3:10::/64 via 2001:db8:3:1::10;
route 2001:db8:3:11::/64 via 2001:db8:3:1::10;
} }
protocol ospf v2 ospf4 { protocol ospf v2 ospf4 {
ipv4 { ipv4 {
table master4; table master4;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
...@@ -81,6 +85,7 @@ protocol ospf v3 ospf5 { ...@@ -81,6 +85,7 @@ protocol ospf v3 ospf5 {
ipv4 { ipv4 {
table master5; table master5;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
...@@ -108,6 +113,7 @@ protocol ospf v3 ospf6 { ...@@ -108,6 +113,7 @@ protocol ospf v3 ospf6 {
ipv6 { ipv6 {
table master6; table master6;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
......
...@@ -37,31 +37,27 @@ protocol kernel kernel6 { ...@@ -37,31 +37,27 @@ protocol kernel kernel6 {
protocol static static4 { protocol static static4 {
ipv4 { table master4; }; ipv4 { table master4; };
route 10.50.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; }; route 10.4.10.0/24 via 10.4.1.2;
route 10.50.1.0/24 via 10.0.4.2 { bgp_local_pref = 500; }; route 10.4.11.0/24 via 10.4.1.2;
route 10.40.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; };
route 10.40.1.0/24 via 10.0.4.2 mpls 400 { bgp_local_pref = 500; };
} }
protocol static static5 { protocol static static5 {
ipv4 { table master5; }; ipv4 { table master5; };
route 10.50.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; }; route 10.4.10.0/24 via 10.4.1.2;
route 10.50.1.0/24 via 10.0.4.2 { bgp_local_pref = 500; }; route 10.4.11.0/24 via 10.4.1.2;
route 10.40.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; };
route 10.40.1.0/24 via 10.0.4.2 mpls 400 { bgp_local_pref = 500; };
} }
protocol static static6 { protocol static static6 {
ipv6; ipv6;
route 2001:db8:50:1::/64 via 2001:db8:4:1::10; route 2001:db8:4:10::/64 via 2001:db8:4:1::10;
route 2001:db8:50:2::/64 via 2001:db8:4:1::10; route 2001:db8:4:11::/64 via 2001:db8:4:1::10;
route 2001:db8:40:10::/64 via 2001:db8:4:1::10;
} }
protocol ospf v2 ospf4 { protocol ospf v2 ospf4 {
ipv4 { ipv4 {
table master4; table master4;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
...@@ -91,6 +87,7 @@ protocol ospf v3 ospf5 { ...@@ -91,6 +87,7 @@ protocol ospf v3 ospf5 {
ipv4 { ipv4 {
table master5; table master5;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
...@@ -120,6 +117,7 @@ protocol ospf v3 ospf6 { ...@@ -120,6 +117,7 @@ protocol ospf v3 ospf6 {
ipv6 { ipv6 {
table master6; table master6;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
......
...@@ -37,26 +37,27 @@ protocol kernel kernel6 { ...@@ -37,26 +37,27 @@ protocol kernel kernel6 {
protocol static static4 { protocol static static4 {
ipv4 { table master4; }; ipv4 { table master4; };
route 10.10.0.0/24 via 10.0.1.2; route 10.5.10.0/24 via 10.5.1.2;
route 10.10.1.0/24 via 10.0.1.2; route 10.5.11.0/24 via 10.5.1.2;
} }
protocol static static5 { protocol static static5 {
ipv4 { table master5; }; ipv4 { table master5; };
route 10.10.0.0/24 via 10.0.1.2; route 10.5.10.0/24 via 10.5.1.2;
route 10.10.1.0/24 via 10.0.1.2; route 10.5.11.0/24 via 10.5.1.2;
} }
protocol static static6 { protocol static static6 {
ipv6; ipv6;
route 2001:db8:10:10::/64 via 2001:db8:1:1::10; route 2001:db8:5:10::/64 via 2001:db8:5:1::10;
route 2001:db8:10:11::/64 via 2001:db8:1:1::10; route 2001:db8:5:11::/64 via 2001:db8:5:1::10;
} }
protocol ospf v2 ospf4 { protocol ospf v2 ospf4 {
ipv4 { ipv4 {
table master4; table master4;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
...@@ -84,6 +85,7 @@ protocol ospf v3 ospf5 { ...@@ -84,6 +85,7 @@ protocol ospf v3 ospf5 {
ipv4 { ipv4 {
table master5; table master5;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
...@@ -111,6 +113,7 @@ protocol ospf v3 ospf6 { ...@@ -111,6 +113,7 @@ protocol ospf v3 ospf6 {
ipv6 { ipv6 {
table master6; table master6;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
......
...@@ -37,31 +37,27 @@ protocol kernel kernel6 { ...@@ -37,31 +37,27 @@ protocol kernel kernel6 {
protocol static static4 { protocol static static4 {
ipv4 { table master4; }; ipv4 { table master4; };
route 10.50.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; }; route 10.6.10.0/24 via 10.6.1.2;
route 10.50.1.0/24 via 10.0.4.2 { bgp_local_pref = 500; }; route 10.6.11.0/24 via 10.6.1.2;
route 10.40.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; };
route 10.40.1.0/24 via 10.0.4.2 mpls 400 { bgp_local_pref = 500; };
} }
protocol static static5 { protocol static static5 {
ipv4 { table master5; }; ipv4 { table master5; };
route 10.50.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; }; route 10.6.10.0/24 via 10.6.1.2;
route 10.50.1.0/24 via 10.0.4.2 { bgp_local_pref = 500; }; route 10.6.11.0/24 via 10.6.1.2;
route 10.40.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; };
route 10.40.1.0/24 via 10.0.4.2 mpls 400 { bgp_local_pref = 500; };
} }
protocol static static6 { protocol static static6 {
ipv6; ipv6;
route 2001:db8:50:1::/64 via 2001:db8:4:1::10; route 2001:db8:6:10::/64 via 2001:db8:6:1::10;
route 2001:db8:50:2::/64 via 2001:db8:4:1::10; route 2001:db8:6:11::/64 via 2001:db8:6:1::10;
route 2001:db8:40:10::/64 via 2001:db8:4:1::10;
} }
protocol ospf v2 ospf4 { protocol ospf v2 ospf4 {
ipv4 { ipv4 {
table master4; table master4;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
...@@ -91,6 +87,7 @@ protocol ospf v3 ospf5 { ...@@ -91,6 +87,7 @@ protocol ospf v3 ospf5 {
ipv4 { ipv4 {
table master5; table master5;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
...@@ -120,6 +117,7 @@ protocol ospf v3 ospf6 { ...@@ -120,6 +117,7 @@ protocol ospf v3 ospf6 {
ipv6 { ipv6 {
table master6; table master6;
import all; import all;
export where source = RTS_STATIC;
}; };
area 0 { area 0 {
......
...@@ -37,23 +37,23 @@ protocol kernel kernel6 { ...@@ -37,23 +37,23 @@ protocol kernel kernel6 {
protocol static static4 { protocol static static4 {
ipv4 { table master4; }; ipv4 { table master4; };
route 10.50.0.0/24 via 10.0.2.2; route 10.7.10.0/24 via 10.7.1.2;
route 10.50.1.0/24 via 10.0.2.2; route 10.7.11.0/24 via 10.7.1.2;
route 10.20.0.0/24 via 10.0.2.2; route 10.60.1.0/24 via 10.7.1.2;
} }
protocol static static5 { protocol static static5 {
ipv4 { table master5; }; ipv4 { table master5; };
route 10.50.0.0/24 via 10.0.2.2; route 10.7.10.0/24 via 10.7.1.2;
route 10.50.1.0/24 via 10.0.2.2; route 10.7.11.0/24 via 10.7.1.2;
route 10.20.0.0/24 via 10.0.2.2; route 10.60.1.0/24 via 10.7.1.2;
} }
protocol static static6 { protocol static static6 {
ipv6; ipv6;
route 2001:db8:50:1::/64 via 2001:db8:2:1::10; route 2001:db8:7:10::/64 via 2001:db8:7:1::10;
route 2001:db8:50:2::/64 via 2001:db8:2:1::10; route 2001:db8:7:11::/64 via 2001:db8:7:1::10;
route 2001:db8:20:10::/64 via 2001:db8:2:1::10; route 2001:db8:60:1::/64 via 2001:db8:7:1::10;
} }
protocol ospf v2 ospf4 { protocol ospf v2 ospf4 {
......
...@@ -37,17 +37,23 @@ protocol kernel kernel6 { ...@@ -37,17 +37,23 @@ protocol kernel kernel6 {
protocol static static4 { protocol static static4 {
ipv4 { table master4; }; ipv4 { table master4; };
route 10.30.0.0/24 via 10.0.3.2; route 10.8.10.0/24 via 10.8.1.2;
route 10.8.11.0/24 via 10.8.1.2;
route 10.60.1.0/24 via 10.8.1.2;
} }
protocol static static5 { protocol static static5 {
ipv4 { table master5; }; ipv4 { table master5; };
route 10.30.0.0/24 via 10.0.3.2; route 10.8.10.0/24 via 10.8.1.2;
route 10.8.11.0/24 via 10.8.1.2;
route 10.60.1.0/24 via 10.8.1.2;
} }
protocol static static6 { protocol static static6 {
ipv6; ipv6;
route 2001:db8:30:10::/64 via 2001:db8:3:1::10; route 2001:db8:8:10::/64 via 2001:db8:8:1::10;
route 2001:db8:8:11::/64 via 2001:db8:8:1::10;
route 2001:db8:60:1::/64 via 2001:db8:8:1::10;
} }
protocol ospf v2 ospf4 { protocol ospf v2 ospf4 {
......
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
10.7.21.0/24 via 10.0.2.2 dev ve1 proto bird metric 32 10.7.21.0/24 via 10.0.2.2 dev ve1 proto bird metric 32
10.8.1.0/24 via 10.0.2.2 dev ve1 proto bird metric 32 10.8.1.0/24 via 10.0.2.2 dev ve1 proto bird metric 32
10.8.20.0/24 via 10.0.2.2 dev ve1 proto bird metric 32 10.8.20.0/24 via 10.0.2.2 dev ve1 proto bird metric 32
10.8.21.0/24 via 10.0.2.2 dev ve1 proto bird metric 32 10.8.21.0/24 via 10.0.2.2 dev ve1 proto bird metric 32
\ No newline at end of file
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
10.7.21.0/24 via 10.0.3.2 dev ve1 proto bird metric 32 10.7.21.0/24 via 10.0.3.2 dev ve1 proto bird metric 32
10.8.1.0/24 via 10.0.3.2 dev ve1 proto bird metric 32 10.8.1.0/24 via 10.0.3.2 dev ve1 proto bird metric 32
10.8.20.0/24 via 10.0.3.2 dev ve1 proto bird metric 32 10.8.20.0/24 via 10.0.3.2 dev ve1 proto bird metric 32
10.8.21.0/24 via 10.0.3.2 dev ve1 proto bird metric 32 10.8.21.0/24 via 10.0.3.2 dev ve1 proto bird metric 32
\ No newline at end of file
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
10.7.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.7.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.1.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.1.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.20.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.20.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
\ No newline at end of file
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
10.7.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.7.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.1.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.1.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.20.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.20.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
\ No newline at end of file
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
10.7.21.0/24 via 10.0.4.2 dev ve1 proto bird metric 32 10.7.21.0/24 via 10.0.4.2 dev ve1 proto bird metric 32
10.8.1.0/24 via 10.0.4.2 dev ve1 proto bird metric 32 10.8.1.0/24 via 10.0.4.2 dev ve1 proto bird metric 32
10.8.20.0/24 via 10.0.4.2 dev ve1 proto bird metric 32 10.8.20.0/24 via 10.0.4.2 dev ve1 proto bird metric 32
10.8.21.0/24 via 10.0.4.2 dev ve1 proto bird metric 32 10.8.21.0/24 via 10.0.4.2 dev ve1 proto bird metric 32
\ No newline at end of file
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
10.7.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.7.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.1.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.1.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.20.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.20.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
10.8.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32 10.8.21.0/24 via 10.0.7.5 dev ve3 proto bird metric 32
\ No newline at end of file
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
10.7.1.0/24 dev ve0 proto bird scope link metric 32 10.7.1.0/24 dev ve0 proto bird scope link metric 32
10.8.1.0/24 via 10.0.5.2 dev ve1 proto bird metric 32 10.8.1.0/24 via 10.0.5.2 dev ve1 proto bird metric 32
10.8.20.0/24 via 10.0.5.2 dev ve1 proto bird metric 32 10.8.20.0/24 via 10.0.5.2 dev ve1 proto bird metric 32
10.8.21.0/24 via 10.0.5.2 dev ve1 proto bird metric 32 10.8.21.0/24 via 10.0.5.2 dev ve1 proto bird metric 32
\ No newline at end of file
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
10.7.20.0/24 via 10.0.5.1 dev ve2 proto bird metric 32 10.7.20.0/24 via 10.0.5.1 dev ve2 proto bird metric 32
10.7.21.0/24 via 10.0.5.1 dev ve2 proto bird metric 32 10.7.21.0/24 via 10.0.5.1 dev ve2 proto bird metric 32
10.8.1.0/24 dev ve0 proto kernel scope link src 10.8.1.1 10.8.1.0/24 dev ve0 proto kernel scope link src 10.8.1.1
10.8.1.0/24 dev ve0 proto bird scope link metric 32 10.8.1.0/24 dev ve0 proto bird scope link metric 32
\ No newline at end of file
2001:db8:1:1::/64 dev ve0 proto bird metric 32 pref medium
2001:db8:1:1::/64 dev ve0 proto kernel metric 256 pref medium
2001:db8:2:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:2:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:2:21::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:3:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:3:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:3:21::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:4:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:4:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:4:21::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:5:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:5:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:5:21::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:6:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:6:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:6:21::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:7:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:7:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:7:21::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:8:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:8:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:8:21::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:1:1::/64 via fe80::<removed> dev ve2 proto bird metric 32 pref medium
2001:db8:1:20::/64 via fe80::<removed> dev ve2 proto bird metric 32 pref medium
2001:db8:2:1::/64 dev ve0 proto bird metric 32 pref medium
2001:db8:2:1::/64 dev ve0 proto kernel metric 256 pref medium
2001:db8:3:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:3:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:3:21::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:4:1::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium
2001:db8:4:20::/64 via fe80::<removed> dev ve1 proto bird metric 32 pref medium