From 79bd71548bfbb4b6a17e8a4ad62857ed9071e87c Mon Sep 17 00:00:00 2001 From: Hans van Kranenburg Date: Sat, 19 Sep 2015 23:03:34 +0200 Subject: [PATCH] bgp-contd: rename interface ibgp to lan, confusing --- bgp-contd/lxc/R0/rootfs/etc/bird/bird6.conf | 2 +- bgp-contd/lxc/R0/rootfs/etc/network/interfaces | 12 ++++++------ bgp-contd/lxc/R1/rootfs/etc/bird/bird6.conf | 2 +- bgp-contd/lxc/R1/rootfs/etc/network/interfaces | 12 ++++++------ bgp-contd/lxc/R10/rootfs/etc/bird/bird6.conf | 2 +- bgp-contd/lxc/R10/rootfs/etc/network/interfaces | 12 ++++++------ bgp-contd/lxc/R11/rootfs/etc/bird/bird6.conf | 2 +- bgp-contd/lxc/R11/rootfs/etc/network/interfaces | 12 ++++++------ bgp-contd/lxc/R12/rootfs/etc/bird/bird6.conf | 2 +- bgp-contd/lxc/R12/rootfs/etc/network/interfaces | 12 ++++++------ bgp-contd/lxc/R2/rootfs/etc/bird/bird6.conf | 2 +- bgp-contd/lxc/R2/rootfs/etc/network/interfaces | 12 ++++++------ bgp-contd/lxc/fixnetwork.sh | 12 ++++++------ 13 files changed, 48 insertions(+), 48 deletions(-) diff --git a/bgp-contd/lxc/R0/rootfs/etc/bird/bird6.conf b/bgp-contd/lxc/R0/rootfs/etc/bird/bird6.conf index 32864ac..58c5736 100644 --- a/bgp-contd/lxc/R0/rootfs/etc/bird/bird6.conf +++ b/bgp-contd/lxc/R0/rootfs/etc/bird/bird6.conf @@ -16,7 +16,7 @@ protocol ospf { area 0 { # BIRD ignores the IPv6 lo because it has no link local address stubnet 2001:db8::ff/128; - interface "ibgp" { + interface "lan" { }; interface "ebgp_r10" { stub; diff --git a/bgp-contd/lxc/R0/rootfs/etc/network/interfaces b/bgp-contd/lxc/R0/rootfs/etc/network/interfaces index d1183c3..a4b643f 100644 --- a/bgp-contd/lxc/R0/rootfs/etc/network/interfaces +++ b/bgp-contd/lxc/R0/rootfs/etc/network/interfaces @@ -3,12 +3,12 @@ iface lo inet loopback up ip addr add 2001:db8::ff/128 dev lo down ip addr del 2001:db8::ff/128 dev lo -auto ibgp -iface ibgp inet manual - up ip link set up dev ibgp - up ip addr add 2001:db8:0:1::ff/120 dev ibgp - down ip addr del 2001:db8:0:1::ff/120 dev ibgp - down ip link set down dev ibgp +auto lan +iface lan inet manual + up ip link set up dev lan + up ip addr add 2001:db8:0:1::ff/120 dev lan + down ip addr del 2001:db8:0:1::ff/120 dev lan + down ip link set down dev lan auto ebgp_r10 iface ebgp_r10 inet manual diff --git a/bgp-contd/lxc/R1/rootfs/etc/bird/bird6.conf b/bgp-contd/lxc/R1/rootfs/etc/bird/bird6.conf index 4652e3f..12e79ea 100644 --- a/bgp-contd/lxc/R1/rootfs/etc/bird/bird6.conf +++ b/bgp-contd/lxc/R1/rootfs/etc/bird/bird6.conf @@ -16,7 +16,7 @@ protocol ospf { area 0 { # BIRD ignores the IPv6 lo because it has no link local address stubnet 2001:db8::1/128; - interface "ibgp" { + interface "lan" { }; interface "ebgp_r11" { stub; diff --git a/bgp-contd/lxc/R1/rootfs/etc/network/interfaces b/bgp-contd/lxc/R1/rootfs/etc/network/interfaces index 23bcae9..0631d2f 100644 --- a/bgp-contd/lxc/R1/rootfs/etc/network/interfaces +++ b/bgp-contd/lxc/R1/rootfs/etc/network/interfaces @@ -3,12 +3,12 @@ iface lo inet loopback up ip addr add 2001:db8::1/128 dev lo down ip addr del 2001:db8::1/128 dev lo -auto ibgp -iface ibgp inet manual - up ip link set up dev ibgp - up ip addr add 2001:db8:0:1::1/120 dev ibgp - down ip addr del 2001:db8:0:1::1/120 dev ibgp - down ip link set down dev ibgp +auto lan +iface lan inet manual + up ip link set up dev lan + up ip addr add 2001:db8:0:1::1/120 dev lan + down ip addr del 2001:db8:0:1::1/120 dev lan + down ip link set down dev lan auto ebgp_r11 iface ebgp_r11 inet manual diff --git a/bgp-contd/lxc/R10/rootfs/etc/bird/bird6.conf b/bgp-contd/lxc/R10/rootfs/etc/bird/bird6.conf index abda240..0d2f97a 100644 --- a/bgp-contd/lxc/R10/rootfs/etc/bird/bird6.conf +++ b/bgp-contd/lxc/R10/rootfs/etc/bird/bird6.conf @@ -16,7 +16,7 @@ protocol ospf { area 0 { # BIRD ignores the IPv6 lo because it has no link local address stubnet 2001:db8:10::10/128; - interface "ibgp" { + interface "lan" { }; interface "ebgp_r0" { stub; diff --git a/bgp-contd/lxc/R10/rootfs/etc/network/interfaces b/bgp-contd/lxc/R10/rootfs/etc/network/interfaces index fd6fe77..78671e0 100644 --- a/bgp-contd/lxc/R10/rootfs/etc/network/interfaces +++ b/bgp-contd/lxc/R10/rootfs/etc/network/interfaces @@ -3,12 +3,12 @@ iface lo inet loopback up ip addr add 2001:db8:10::10/128 dev lo down ip addr del 2001:db8:10::10/128 dev lo -auto ibgp -iface ibgp inet manual - up ip link set up dev ibgp - up ip addr add 2001:db8:10:2::10/120 dev ibgp - down ip addr del 2001:db8:10:2::10/120 dev ibgp - down ip link set down dev ibgp +auto lan +iface lan inet manual + up ip link set up dev lan + up ip addr add 2001:db8:10:2::10/120 dev lan + down ip addr del 2001:db8:10:2::10/120 dev lan + down ip link set down dev lan auto ebgp_r0 iface ebgp_r0 inet manual diff --git a/bgp-contd/lxc/R11/rootfs/etc/bird/bird6.conf b/bgp-contd/lxc/R11/rootfs/etc/bird/bird6.conf index 076ff3a..973534f 100644 --- a/bgp-contd/lxc/R11/rootfs/etc/bird/bird6.conf +++ b/bgp-contd/lxc/R11/rootfs/etc/bird/bird6.conf @@ -16,7 +16,7 @@ protocol ospf { area 0 { # BIRD ignores the IPv6 lo because it has no link local address stubnet 2001:db8:10::11/128; - interface "ibgp" { + interface "lan" { }; interface "ebgp_r1" { stub; diff --git a/bgp-contd/lxc/R11/rootfs/etc/network/interfaces b/bgp-contd/lxc/R11/rootfs/etc/network/interfaces index fb1f234..59ea0d9 100644 --- a/bgp-contd/lxc/R11/rootfs/etc/network/interfaces +++ b/bgp-contd/lxc/R11/rootfs/etc/network/interfaces @@ -3,12 +3,12 @@ iface lo inet loopback up ip addr add 2001:db8:10::11/128 dev lo down ip addr del 2001:db8:10::11/128 dev lo -auto ibgp -iface ibgp inet manual - up ip link set up dev ibgp - up ip addr add 2001:db8:10:2::11/120 dev ibgp - down ip addr del 2001:db8:10:2::11/120 dev ibgp - down ip link set down dev ibgp +auto lan +iface lan inet manual + up ip link set up dev lan + up ip addr add 2001:db8:10:2::11/120 dev lan + down ip addr del 2001:db8:10:2::11/120 dev lan + down ip link set down dev lan auto ebgp_r1 iface ebgp_r1 inet manual diff --git a/bgp-contd/lxc/R12/rootfs/etc/bird/bird6.conf b/bgp-contd/lxc/R12/rootfs/etc/bird/bird6.conf index b151027..010922b 100644 --- a/bgp-contd/lxc/R12/rootfs/etc/bird/bird6.conf +++ b/bgp-contd/lxc/R12/rootfs/etc/bird/bird6.conf @@ -16,7 +16,7 @@ protocol ospf { area 0 { # BIRD ignores the IPv6 lo because it has no link local address stubnet 2001:db8:10::12/128; - interface "ibgp" { + interface "lan" { }; }; } diff --git a/bgp-contd/lxc/R12/rootfs/etc/network/interfaces b/bgp-contd/lxc/R12/rootfs/etc/network/interfaces index 4f2b4c2..5f089da 100644 --- a/bgp-contd/lxc/R12/rootfs/etc/network/interfaces +++ b/bgp-contd/lxc/R12/rootfs/etc/network/interfaces @@ -3,9 +3,9 @@ iface lo inet loopback up ip addr add 2001:db8:10::12/128 dev lo down ip addr del 2001:db8:10::12/128 dev lo -auto ibgp -iface ibgp inet manual - up ip link set up dev ibgp - up ip addr add 2001:db8:10:2::12/120 dev ibgp - down ip addr del 2001:db8:10:2::12/120 dev ibgp - down ip link set down dev ibgp +auto lan +iface lan inet manual + up ip link set up dev lan + up ip addr add 2001:db8:10:2::12/120 dev lan + down ip addr del 2001:db8:10:2::12/120 dev lan + down ip link set down dev lan diff --git a/bgp-contd/lxc/R2/rootfs/etc/bird/bird6.conf b/bgp-contd/lxc/R2/rootfs/etc/bird/bird6.conf index 65b66e9..d9064a0 100644 --- a/bgp-contd/lxc/R2/rootfs/etc/bird/bird6.conf +++ b/bgp-contd/lxc/R2/rootfs/etc/bird/bird6.conf @@ -16,7 +16,7 @@ protocol ospf { area 0 { # BIRD ignores the IPv6 lo because it has no link local address stubnet 2001:db8::2/128; - interface "ibgp" { + interface "lan" { }; }; } diff --git a/bgp-contd/lxc/R2/rootfs/etc/network/interfaces b/bgp-contd/lxc/R2/rootfs/etc/network/interfaces index 1a75462..e2f7fee 100644 --- a/bgp-contd/lxc/R2/rootfs/etc/network/interfaces +++ b/bgp-contd/lxc/R2/rootfs/etc/network/interfaces @@ -3,9 +3,9 @@ iface lo inet loopback up ip addr add 2001:db8::2/128 dev lo down ip addr del 2001:db8::2/128 dev lo -auto ibgp -iface ibgp inet manual - up ip link set up dev ibgp - up ip addr add 2001:db8:0:1::2/120 dev ibgp - down ip addr del 2001:db8:0:1::2/120 dev ibgp - down ip link set down dev ibgp +auto lan +iface lan inet manual + up ip link set up dev lan + up ip addr add 2001:db8:0:1::2/120 dev lan + down ip addr del 2001:db8:0:1::2/120 dev lan + down ip link set down dev lan diff --git a/bgp-contd/lxc/fixnetwork.sh b/bgp-contd/lxc/fixnetwork.sh index e4fe365..f88e2c6 100644 --- a/bgp-contd/lxc/fixnetwork.sh +++ b/bgp-contd/lxc/fixnetwork.sh @@ -6,7 +6,7 @@ cat <> R0/config lxc.network.type = veth lxc.network.flags = up -lxc.network.name = ibgp +lxc.network.name = lan lxc.network.veth.pair = r0.1 lxc.network.script.up = /etc/lxc/lxc-openvswitch lxc.network.script.down = /etc/lxc/lxc-openvswitch @@ -23,7 +23,7 @@ cat <> R1/config lxc.network.type = veth lxc.network.flags = up -lxc.network.name = ibgp +lxc.network.name = lan lxc.network.veth.pair = r1.1 lxc.network.script.up = /etc/lxc/lxc-openvswitch lxc.network.script.down = /etc/lxc/lxc-openvswitch @@ -47,7 +47,7 @@ cat <> R2/config lxc.network.type = veth lxc.network.flags = up -lxc.network.name = ibgp +lxc.network.name = lan lxc.network.veth.pair = r2.1 lxc.network.script.up = /etc/lxc/lxc-openvswitch lxc.network.script.down = /etc/lxc/lxc-openvswitch @@ -57,7 +57,7 @@ cat <> R10/config lxc.network.type = veth lxc.network.flags = up -lxc.network.name = ibgp +lxc.network.name = lan lxc.network.veth.pair = r10.2 lxc.network.script.up = /etc/lxc/lxc-openvswitch lxc.network.script.down = /etc/lxc/lxc-openvswitch @@ -81,7 +81,7 @@ cat <> R11/config lxc.network.type = veth lxc.network.flags = up -lxc.network.name = ibgp +lxc.network.name = lan lxc.network.veth.pair = r11.2 lxc.network.script.up = /etc/lxc/lxc-openvswitch lxc.network.script.down = /etc/lxc/lxc-openvswitch @@ -98,7 +98,7 @@ cat <> R12/config lxc.network.type = veth lxc.network.flags = up -lxc.network.name = ibgp +lxc.network.name = lan lxc.network.veth.pair = r12.2 lxc.network.script.up = /etc/lxc/lxc-openvswitch lxc.network.script.down = /etc/lxc/lxc-openvswitch