Commit 2f13e877 authored by Matous Holinka's avatar Matous Holinka
Browse files

mh-bgp: minor fixes

parent 53df1d22
......@@ -72,57 +72,47 @@ protocol bgp ebgp6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 10.1.10.1 as 1;
}
protocol bgp ibgp1 from ibgpv4 {
local 10.1.1.1 as 1;
neighbor 10.1.2.1 as 1;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 10.1.10.1 as 1;
protocol bgp ibgp2 from ibgpv4 {
local 10.1.1.1 as 1;
neighbor 10.1.3.1 as 1;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 10.1.10.1 as 1;
protocol bgp ibgp3 from ibgpv4 {
local 10.1.1.1 as 1;
neighbor 10.1.4.1 as 1;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv6 {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 2001:db8:1:10::1 as 1;
}
protocol bgp ibgp4 from ibgpv6 {
local 2001:db8:1:1::1 as 1;
neighbor 2001:db8:1:2::1 as 1;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 2001:db8:1:10::1 as 1;
protocol bgp ibgp5 from ibgpv6 {
local 2001:db8:1:1::1 as 1;
neighbor 2001:db8:1:3::1 as 1;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 2001:db8:1:10::1 as 1;
protocol bgp ibgp6 from ibgpv6 {
local 2001:db8:1:1::1 as 1;
neighbor 2001:db8:1:4::1 as 1;
}
......@@ -25,12 +25,12 @@ protocol kernel kernel6 {
protocol static static4 {
ipv4;
route 10.1.0.0/16 via 10.1.1.11;
route 10.1.0.0/16 unreachable;
}
protocol static static6 {
ipv6;
route 2001:db8:1::/48 via 2001:db8:1:1::11;
route 2001:db8:1::/48 unreachable;
}
protocol ospf v2 ospf4 {
......@@ -50,39 +50,36 @@ protocol ospf v3 ospf6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp1 from ibgpv4 {
local 10.1.2.1 as 1;
neighbor 10.1.10.1 as 1;;
neighbor 10.1.1.1 as 1;;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp2 from ibgpv4 {
local 10.1.2.1 as 1;
neighbor 10.1.4.1 as 1;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv6 {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp3 from ibgpv6 {
local 2001:db8:1:2::1 as 1;
neighbor 2001:db8:1:10::1 as 1;
neighbor 2001:db8:1:1::1 as 1;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp4 from ibgpv6 {
local 2001:db8:1:2::1 as 1;
neighbor 2001:db8:1:4::1 as 1;
}
......@@ -25,12 +25,12 @@ protocol kernel kernel6 {
protocol static static4 {
ipv4;
route 10.1.0.0/16 via 10.1.1.12;
route 10.1.0.0/16 unreachable;
}
protocol static static6 {
ipv6;
route 2001:db8:1::/48 via 2001:db8:1:1::12;
route 2001:db8:1::/48 unreachable;
}
protocol ospf v2 ospf4 {
......@@ -50,39 +50,36 @@ protocol ospf v3 ospf6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp1 from ibgpv4 {
local 10.1.3.1 as 1;
neighbor 10.1.10.1 as 1;
neighbor 10.1.1.1 as 1;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp2 from ibgpv4 {
local 10.1.3.1 as 1;
neighbor 10.1.4.1 as 1;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv6 {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp3 from ibgpv6 {
local 2001:db8:1:3::1 as 1;
neighbor 2001:db8:1:10::1 as 1;
neighbor 2001:db8:1:1::1 as 1;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp4 from ibgpv6 {
local 2001:db8:1:3::1 as 1;
neighbor 2001:db8:1:4::1 as 1;
}
......@@ -72,57 +72,47 @@ protocol bgp ebgp6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp1 from ibgpv4 {
local 10.1.4.1 as 1;
neighbor 10.1.10.1 as 1;
neighbor 10.1.1.1 as 1;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp2 from ibgpv4 {
local 10.1.4.1 as 1;
neighbor 10.1.3.1 as 1;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp3 from ibgpv4 {
local 10.1.4.1 as 1;
neighbor 10.1.2.1 as 1;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv6 {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp4 from ibgpv6 {
local 2001:db8:1:4::1 as 1;
neighbor 2001:db8:1:10::1 as 1;
neighbor 2001:db8:1:1::1 as 1;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp5 from ibgpv6 {
local 2001:db8:1:4::1 as 1;
neighbor 2001:db8:1:3::1 as 1;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp6 from ibgpv6 {
local 2001:db8:1:4::1 as 1;
neighbor 2001:db8:1:2::1 as 1;
}
......@@ -72,57 +72,47 @@ protocol bgp ebgp6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
local 10.2.10.1 as 2;
}
protocol bgp ibgp1 from ibgpv4 {
local 10.2.1.1 as 2;
neighbor 10.2.2.1 as 2;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 10.2.10.1 as 2;
protocol bgp ibgp2 from ibgpv4 {
local 10.2.1.1 as 2;
neighbor 10.2.3.1 as 2;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 10.2.10.1 as 2;
protocol bgp ibgp3 from ibgpv4 {
local 10.2.1.1 as 2;
neighbor 10.2.4.1 as 2;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv6 {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
local 2001:db8:2:10::1 as 2;
}
protocol bgp ibgp4 from ibgpv6 {
local 2001:db8:2:1::1 as 2;
neighbor 2001:db8:2:2::1 as 2;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 2001:db8:2:10::1 as 2;
protocol bgp ibgp5 from ibgpv6 {
local 2001:db8:2:1::1 as 2;
neighbor 2001:db8:2:3::1 as 2;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 2001:db8:2:10::1 as 2;
protocol bgp ibgp6 from ibgpv6 {
local 2001:db8:2:1::1 as 2;
neighbor 2001:db8:2:4::1 as 2;
}
......@@ -25,12 +25,12 @@ protocol kernel kernel6 {
protocol static static4 {
ipv4;
route 10.2.0.0/16 via 10.2.1.11;
route 10.2.0.0/16 unreachable;
}
protocol static static6 {
ipv6;
route 2001:db8:2::/48 via 2001:db8:2:1::11;
route 2001:db8:2::/48 unreachable;
}
protocol ospf v2 ospf4 {
......@@ -50,39 +50,37 @@ protocol ospf v3 ospf6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp1 from ibgpv4 {
local 10.2.2.1 as 2;
neighbor 10.2.10.1 as 2;
neighbor 10.2.1.1 as 2;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp2 from ibgpv4 {
local 10.2.2.1 as 2;
neighbor 10.2.4.1 as 2;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv6 {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp3 from ibgpv6 {
local 2001:db8:2:2::1 as 2;
neighbor 2001:db8:2:10::1 as 2;
neighbor 2001:db8:2:1::1 as 2;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp4 from ibgpv6 {
local 2001:db8:2:2::1 as 2;
neighbor 2001:db8:2:4::1 as 2;
}
......@@ -25,12 +25,12 @@ protocol kernel kernel6 {
protocol static static4 {
ipv4;
route 10.2.0.0/16 via 10.2.1.12;
route 10.2.0.0/16 unreachable;
}
protocol static static6 {
ipv6;
route 2001:db8:2::/48 via 2001:db8:2:1::12;
route 2001:db8:2::/48 unreachable;
}
protocol ospf v2 ospf4 {
......@@ -50,39 +50,37 @@ protocol ospf v3 ospf6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp1 from ibgpv4 {
local 10.2.3.1 as 2;
neighbor 10.2.10.1 as 2;
neighbor 10.2.1.1 as 2;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp2 from ibgpv4 {
local 10.2.3.1 as 2;
neighbor 10.2.4.1 as 2;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv6 {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp3 from ibgpv6 {
local 2001:db8:2:3::1 as 2;
neighbor 2001:db8:2:10::1 as 2;
neighbor 2001:db8:2:1::1 as 2;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp4 from ibgpv6 {
local 2001:db8:2:3::1 as 2;
neighbor 2001:db8:2:4::1 as 2;
}
......@@ -72,57 +72,47 @@ protocol bgp ebgp6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp1 from ibgpv4 {
local 10.2.4.1 as 2;
neighbor 10.2.3.1 as 2;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp2 from ibgpv4 {
local 10.2.4.1 as 2;
neighbor 10.2.2.1 as 2;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp3 from ibgpv4 {
local 10.2.4.1 as 2;
neighbor 10.2.10.1 as 2;
neighbor 10.2.1.1 as 2;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv6 {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP, RTS_STATIC ];
};
}
protocol bgp ibgp4 from ibgpv6 {
local 2001:db8:2:4::1 as 2;
neighbor 2001:db8:2:3::1 as 2;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp5 from ibgpv6 {
local 2001:db8:2:4::1 as 2;
neighbor 2001:db8:2:2::1 as 2;
}
protocol bgp {
ipv6 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
protocol bgp ibgp6 from ibgpv6 {
local 2001:db8:2:4::1 as 2;
neighbor 2001:db8:2:10::1 as 2;
neighbor 2001:db8:2:1::1 as 2;
}
......@@ -72,57 +72,47 @@ protocol bgp ebgp6 {
}
#~~~~~~~~~~~~~~~~~ IPV4 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {
template bgp ibgpv4 {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
export where source ~ [ RTS_BGP ,RTS_STATIC ];
};
local 10.3.10.1 as 3;
}
protocol bgp ibgp1 from ibgpv4 {
local 10.3.1.1 as 3;
neighbor 10.3.2.1 as 3;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 10.3.10.1 as 3;
protocol bgp ibgp2 from ibgpv4 {
local 10.3.1.1 as 3;
neighbor 10.3.3.1 as 3;
}
protocol bgp {
ipv4 {
import all;
export where source ~ [ RTS_STATIC, RTS_BGP ];
};
local 10.3.10.1 as 3;
protocol bgp ibgp3 from ibgpv4 {
local 10.3.1.1 as 3;
neighbor 10.3.4.1 as 3;
}
#~~~~~~~~~~~~~~~~~ IPV6 --> iBGP ~~~~~~~~~~~~~~~~~
protocol bgp {