Skip to content

Commit cb7aac6

Browse files
committed
add switch s1 between routers r4, r5, r6
1 parent ad8771d commit cb7aac6

File tree

8 files changed

+31
-39
lines changed

8 files changed

+31
-39
lines changed

nets/exp-8routers-isis-ipv6/isis8d.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ def create_topo(my_net):
118118
r7 = my_net.addHost(name='r7', cls=Router)
119119
r8 = my_net.addHost(name='r8', cls=Router)
120120

121+
s1 = my_net.addHost(name='s1', cls=Router)
122+
121123
#note that if the interface names are not provided,
122124
#the order of adding link will determine the
123125
#naming of the interfaces (e.g. on r1: r1-eth0, r1-eth1, r1-eth2...)
@@ -142,16 +144,16 @@ def create_topo(my_net):
142144
add_link(h33,r3)
143145
#r3 - r4
144146
add_link(r3,r4)
145-
#r4 - r5
146-
add_link(r4,r5)
147-
#r4 - r6
148-
add_link(r4,r6)
147+
#r4 - s1
148+
add_link(r4,s1)
149+
#r6 - s1
150+
add_link(r6,s1)
149151
#hosts of r5
150152
add_link(h51,r5)
151153
add_link(h52,r5)
152154
add_link(h53,r5)
153-
#r5 - r6
154-
add_link(r5,r6)
155+
#r5 - s1
156+
add_link(r5,s1)
155157
#r6 - r7
156158
add_link(r6,r7)
157159
#r6 - r8

nets/exp-8routers-isis-ipv6/nodeconf/r4/isisd.conf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ ipv6 router isis FOO
77
ip router isis FOO
88
isis hello-interval 5
99
!
10-
interface r4-r5
11-
ipv6 router isis FOO
12-
ip router isis FOO
13-
isis hello-interval 5
14-
!
15-
interface r4-r6
10+
interface r4-s1
1611
ipv6 router isis FOO
1712
ip router isis FOO
1813
isis hello-interval 5

nets/exp-8routers-isis-ipv6/nodeconf/r4/zebra.conf

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ debug zebra rib
1010
interface r4-r3
1111
ipv6 address fcf0:0:3:4::2/64
1212
!
13-
interface r4-r5
14-
ipv6 address fcf0:0:4:5::1/64
15-
!
16-
interface r4-r6
17-
ipv6 address fcf0:0:4:6::1/64
13+
interface r4-s1
14+
ipv6 address fcf0:0:d1::4/64
1815
!
1916
interface lo
2017
ipv6 address fcff:4::1/32

nets/exp-8routers-isis-ipv6/nodeconf/r5/isisd.conf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@ log file nodeconf/r5/isisd.log
1717
! ip router isis FOO
1818
! isis hello-interval 5
1919
!
20-
interface r5-r4
21-
ipv6 router isis FOO
22-
ip router isis FOO
23-
isis hello-interval 5
24-
!
25-
interface r5-r6
20+
interface r5-s1
2621
ipv6 router isis FOO
2722
ip router isis FOO
2823
isis hello-interval 5

nets/exp-8routers-isis-ipv6/nodeconf/r5/zebra.conf

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ interface r5-h52
1616
interface r5-h53
1717
ipv6 address fd00:0:53::1/64
1818
!
19-
interface r5-r4
20-
ipv6 address fcf0:0:4:5::2/64
21-
!
22-
interface r5-r6
23-
ipv6 address fcf0:0:5:6::1/64
19+
interface r5-s1
20+
ipv6 address fcf0:0:d1::5/64
2421
!
2522
interface lo
2623
ipv6 address fcff:5::1/32

nets/exp-8routers-isis-ipv6/nodeconf/r6/isisd.conf

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@ hostname r6
22
password zebra
33
log file nodeconf/r6/isisd.log
44
!
5-
interface r6-r4
6-
ipv6 router isis FOO
7-
ip router isis FOO
8-
isis hello-interval 5
9-
!
10-
interface r6-r5
5+
interface r6-s1
116
ipv6 router isis FOO
127
ip router isis FOO
138
isis hello-interval 5

nets/exp-8routers-isis-ipv6/nodeconf/r6/zebra.conf

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ log file nodeconf/r6/zebra.log
77
debug zebra events
88
debug zebra rib
99
!
10-
interface r6-r4
11-
ipv6 address fcf0:0:4:6::2/64
12-
!
13-
interface r6-r5
14-
ipv6 address fcf0:0:5:6::2/64
10+
interface r6-s1
11+
ipv6 address fcf0:0:d1::6/64
1512
!
1613
interface r6-r7
1714
ipv6 address fcf0:0:6:7::1/64
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/sh
2+
3+
BASE_DIR=nodeconf
4+
NODE_NAME=s1
5+
6+
#enable creating bridge
7+
ip link add br0 type bridge
8+
ip link set br0 up
9+
10+
# add all interfaces to bridge br0
11+
for dev in $(ip -o -6 a | awk '{ print $2 }' | grep -v "lo")
12+
do
13+
ip link set $dev master br0
14+
done

0 commit comments

Comments
 (0)