Commit 7b54135d authored by Ondřej Zajíček's avatar Ondřej Zajíček
Browse files

Tests: Update OSPF-VRF test

Some minor fixes and consistency cleanups (assign vfX interfaces on m1 to
proper OSPF instance, use 'vrf default' on m1 for first instance, remove
VRF on m8-m10 as they are not checked by tests, remove unnecessary
interfaces in OSPF configs).
parent 25552b19
......@@ -13,161 +13,123 @@ protocol device {
scan time 10;
}
protocol direct dir1 {
vrf "vrf1";
ipv4 { table t100v4; };
ipv6 { table t100v6; };
}
protocol direct dir2 {
vrf "vrf2";
ipv4 { table t200v4; };
ipv6 { table t200v6; };
}
protocol direct dir3 {
vrf "vrf3";
ipv4 { table t300v4; };
ipv6 { table t300v6; };
}
protocol kernel kern1v4 {
protocol kernel kernel1v4 {
ipv4 { table t100v4; export all; };
scan time 10;
}
protocol kernel kern2v4 {
protocol kernel kernel2v4 {
ipv4 { table t200v4; export all; };
kernel table 200;
scan time 10;
}
protocol kernel kern3v4 {
protocol kernel kernel3v4 {
ipv4 { table t300v4; export all; };
kernel table 300;
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel1v6 {
ipv6 { table t100v6; export all; };
scan time 10;
}
protocol kernel kern2v6 {
protocol kernel kernel2v6 {
ipv6 { table t200v6; export all; };
kernel table 200;
scan time 10;
}
protocol kernel kern3v6 {
protocol kernel kernel3v6 {
ipv6 { table t300v6; export all; };
kernel table 300;
scan time 10;
}
protocol static stat1v4 {
protocol static static1v4 {
ipv4 { table t100v4; };
route 10.10.0.0/24 via 10.0.1.2;
route 10.10.1.0/24 via 10.0.1.2;
}
protocol static stat2v4 {
protocol static static2v4 {
ipv4 { table t200v4; };
route 10.10.0.0/24 via 10.0.1.2;
route 10.10.1.0/24 via 10.0.1.2;
}
protocol static stat3v4 {
protocol static static3v4 {
ipv4 { table t300v4; };
route 10.10.0.0/24 via 10.0.1.2;
route 10.10.1.0/24 via 10.0.1.2;
}
protocol static stat1v6 {
protocol static static1v6 {
ipv6 { table t100v6; };
route 2001:db8:10:10::/64 via 2001:db8:2:1::10;
}
protocol static stat2v6 {
protocol static static2v6 {
ipv6 { table t200v6; };
route 2001:db8:10:10::/64 via 2001:db8:2:2::10;
}
protocol static stat3v6 {
protocol static static3v6 {
ipv6 { table t300v6; };
route 2001:db8:10:10::/64 via 2001:db8:2:3::10;
}
protocol ospf v2 ospf1 {
protocol ospf v2 ospf1v4 {
vrf default;
ipv4 { table t100v4; import all; };
area 0 {
interface "vf0" { stub; };
interface "vf1" { stub; };
interface "vf2" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "vf*" { stub; };
interface "ve*" { type ptp; hello 5; };
};
}
protocol ospf v2 ospf2 {
protocol ospf v2 ospf2v4 {
vrf "vrf2";
ipv4 { table t200v4; import all; };
area 0 {
interface "vf1" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve3" { type ptp; hello 5; };
interface "ve4" { type ptp; hello 5; };
interface "vf*" { stub; };
interface "ve*" { type ptp; hello 5; };
};
}
protocol ospf v2 ospf3 {
protocol ospf v2 ospf3v4 {
vrf "vrf3";
ipv4 { table t300v4; import all; };
area 0 {
interface "vf0" { stub; };
interface "vf1" { stub; };
interface "vf2" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve5" { type ptp; hello 5; };
interface "ve6" { type ptp; hello 5; };
interface "vf*" { stub; };
interface "ve*" { type ptp; hello 5; };
};
}
protocol ospf v3 ospf4 {
protocol ospf v3 ospf1v6 {
vrf default;
ipv6 { table t100v6; import all; };
area 0 {
interface "vf0" { stub; };
interface "vf1" { stub; };
interface "vf2" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "vf*" { stub; };
interface "ve*" { type ptp; hello 5; };
};
}
protocol ospf v3 ospf5 {
protocol ospf v3 ospf2v6 {
vrf "vrf2";
ipv6 { table t200v6; import all; };
area 0 {
interface "vf1" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve3" { type ptp; hello 5; };
interface "ve4" { type ptp; hello 5; };
interface "vf*" { stub; };
interface "ve*" { type ptp; hello 5; };
};
}
protocol ospf v3 ospf6 {
protocol ospf v3 ospf3v6 {
vrf "vrf3";
ipv6 { table t300v6; import all; };
area 0 {
interface "vf0" { stub; };
interface "vf1" { stub; };
interface "vf2" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve5" { type ptp; hello 5; };
interface "ve6" { type ptp; hello 5; };
interface "vf*" { stub; };
interface "ve*" { type ptp; hello 5; };
};
}
......@@ -6,50 +6,40 @@ protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
kernel table 300;
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel6 {
ipv6 { export all; };
kernel table 300;
scan time 10;
}
protocol static stat1v4 {
protocol static static4 {
ipv4;
route 10.30.1.0/24 via 10.0.3.2;
}
protocol static stat1v6 {
protocol static static6 {
ipv6;
route 2001:db8:30:10::/64 via 2001:db8:3:1::10;
}
protocol ospf v2 ospf3 {
vrf "vrf3";
protocol ospf v2 ospf4 {
ipv4 { export where source = RTS_STATIC; import all; };
area 0 {
interface "ve0" { stub; };
interface "vf2" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve5" { type ptp; hello 5; };
interface "ve6" { type ptp; hello 5; };
};
}
protocol ospf v3 ospf6 {
vrf "vrf3";
ipv6 { export where source = RTS_STATIC; import all; };
area 0 {
interface "ve0" { stub; };
interface "vf2" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve5" { type ptp; hello 5; };
interface "ve6" { type ptp; hello 5; };
};
}
......@@ -6,31 +6,31 @@ protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel6 {
ipv6 { export all; };
scan time 10;
}
protocol static stat1v4 {
protocol static static4 {
ipv4;
route 10.50.0.0/24 via 10.0.2.2;
route 10.50.1.0/24 via 10.0.2.2;
route 10.20.2.0/24 via 10.0.2.2;
}
protocol static stat1v6 {
protocol static static6 {
ipv6;
route 2001:db8:50:1::/64 via 2001:db8:1:1::10;
route 2001:db8:50:2::/64 via 2001:db8:1:2::10;
route 2001:db8:20:10::/64 via 2001:db8:1:3::10;
}
protocol ospf v2 ospf1 {
protocol ospf v2 ospf4 {
ipv4 { export where source = RTS_STATIC; import all;};
area 0 {
interface "ve0" { stub; };
......@@ -39,7 +39,7 @@ protocol ospf v2 ospf1 {
};
}
protocol ospf v3 ospf4 {
protocol ospf v3 ospf6 {
ipv6 { export where source = RTS_STATIC; import all;};
area 0 {
interface "ve0" { stub; };
......
......@@ -6,27 +6,27 @@ protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel6 {
ipv6 { export all; };
scan time 10;
}
protocol static stat1v4 {
protocol static static4 {
ipv4;
route 10.30.0.0/24 via 10.0.3.2;
}
protocol static stat1v6 {
protocol static static6 {
ipv6;
route 2001:db8:30:10::/64 via 2001:db8:3:1::10;
}
protocol ospf v2 ospf1 {
protocol ospf v2 ospf4 {
ipv4 { export where source = RTS_STATIC; import all;};
area 0 {
interface "ve0" { stub; };
......@@ -35,7 +35,7 @@ protocol ospf v2 ospf1 {
};
}
protocol ospf v3 ospf4 {
protocol ospf v3 ospf6 {
ipv6 { export where source = RTS_STATIC; import all;};
area 0 {
interface "ve0" { stub; };
......
......@@ -6,17 +6,17 @@ protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel6 {
ipv6 { export all; };
scan time 10;
}
protocol static stat1v4 {
protocol static static4 {
ipv4;
route 10.50.0.0/24 via 10.0.4.2 { bgp_local_pref = 500; };
route 10.50.1.0/24 via 10.0.4.2 { bgp_local_pref = 500; };
......@@ -24,14 +24,14 @@ protocol static stat1v4 {
route 10.40.1.0/24 via 10.0.4.2 mpls 400 { bgp_local_pref = 500; };
}
protocol static stat1v6 {
protocol static static6 {
ipv6;
route 2001:db8:50:1::/64 via 2001:db8:4:1::10;
route 2001:db8:50:2::/64 via 2001:db8:4:1::10;
route 2001:db8:40:10::/64 via 2001:db8:4:1::10;
}
protocol ospf v2 ospf1 {
protocol ospf v2 ospf4 {
ipv4 { export where source = RTS_STATIC; import all;};
area 0 {
interface "ve0" { stub; };
......@@ -40,7 +40,7 @@ protocol ospf v2 ospf1 {
};
}
protocol ospf v3 ospf4 {
protocol ospf v3 ospf6 {
ipv6 { export where source = RTS_STATIC; import all;};
area 0 {
interface "ve0" { stub; };
......
router id 10.0.2.2;
log "bird.log" all;
router id 10.0.2.2;
protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel6 {
ipv6 { export all; };
scan time 10;
}
protocol static stat1v4 {
protocol static static4 {
ipv4;
route 10.10.0.0/24 via 10.0.1.2;
route 10.10.1.0/24 via 10.0.1.2;
}
protocol static stat1v6 {
protocol static static6 {
ipv6;
route 2001:db8:10:10::/64 via 2001:db8:1:1::10;
route 2001:db8:10:11::/64 via 2001:db8:1:1::10;
}
protocol ospf v2 ospf2 {
protocol ospf v2 ospf4 {
ipv4 { export where source = RTS_STATIC; import all;};
area 0 {
interface "vf1" { stub; };
interface "ve0" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve3" { type ptp; hello 5; };
interface "ve4" { type ptp; hello 5; };
};
}
protocol ospf v3 ospf5 {
protocol ospf v3 ospf6 {
ipv6 { export where source = RTS_STATIC; import all;};
area 0 {
interface "vf1" { stub; };
interface "ve0" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve3" { type ptp; hello 5; };
interface "ve4" { type ptp; hello 5; };
};
}
......@@ -6,48 +6,42 @@ protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel6 {
ipv6 { export all; };
scan time 10;
}
protocol static stat1v4 {
protocol static static4 {
ipv4;
route 10.30.1.0/24 via 10.0.3.2;
}
protocol static stat1v6 {
protocol static static6 {
ipv6;
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 ospf2 {
protocol ospf v2 ospf4 {
ipv4 { export where source = RTS_STATIC; import all;};
area 0 {
interface "vf1" { stub; };
interface "ve0" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve3" { type ptp; hello 5; };
interface "ve4" { type ptp; hello 5; };
};
}
protocol ospf v3 ospf5 {
protocol ospf v3 ospf6 {
ipv6 { export where source = RTS_STATIC; import all;};
area 0 {
interface "vf1" { stub; };
interface "ve0" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve3" { type ptp; hello 5; };
interface "ve4" { type ptp; hello 5; };
};
}
......@@ -6,48 +6,42 @@ protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel6 {
ipv6 { export all; };
scan time 10;
}
protocol static stat1v4 {
protocol static static4 {
ipv4;
route 10.30.1.0/24 via 10.0.3.2;
}
protocol static stat1v6 {
protocol static static6 {
ipv6;
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 ospf2 {
protocol ospf v2 ospf4 {
ipv4 { export where source = RTS_STATIC; import all;};
area 0 {
interface "vf1" { stub; };
interface "ve0" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve3" { type ptp; hello 5; };
interface "ve4" { type ptp; hello 5; };
};
}
protocol ospf v3 ospf5 {
protocol ospf v3 ospf6 {
ipv6 { export where source = RTS_STATIC; import all;};
area 0 {
interface "vf1" { stub; };
interface "ve0" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve3" { type ptp; hello 5; };
interface "ve4" { type ptp; hello 5; };
};
}
......@@ -6,50 +6,40 @@ protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
kernel table 300;
scan time 10;
}
protocol kernel kern1v6 {
protocol kernel kernel6 {
ipv6 { export all; };
kernel table 300;
scan time 10;
}
protocol static stat1v4 {
protocol static static4 {
ipv4;
route 10.30.0.0/24 via 10.0.3.2;
}
protocol static stat1v6 {
protocol static static6 {
ipv6;
route 2001:db8:30:10::/64 via 2001:db8:3:1::10;
}
protocol ospf v2 ospf3 {
vrf "vrf3";
protocol ospf v2 ospf4 {
ipv4 { export where source = RTS_STATIC; import all; };
area 0 {
interface "ve0" { stub; };
interface "vf2" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve5" { type ptp; hello 5; };
interface "ve6" { type ptp; hello 5; };
};
}
protocol ospf v3 ospf6 {
vrf "vrf3";
ipv6 { export where source = RTS_STATIC; import all; };
area 0 {
interface "ve0" { stub; };
interface "vf2" { stub; };
interface "ve1" { type ptp; hello 5; };
interface "ve2" { type ptp; hello 5; };
interface "ve5" { type ptp; hello 5; };
interface "ve6" { type ptp; hello 5; };
};
}
......@@ -6,50 +6,40 @@ protocol device {
scan time 10;
}
protocol kernel kern1v4 {
protocol kernel kernel4 {
ipv4 { export all; };
kernel table 300;
scan time 10;
}