Merge pull request #15 from netgroup/add-hdc-hosts-to-8routers-topo

cscarpitta · web-flow · commit 8741308c4a11 · 2020-05-17T13:56:18.000+02:00
Add hdc hosts to 8routers topology
diff --git a/nets/8routers/nodeconf/hdc1/start.sh b/nets/8routers/nodeconf/hdc1/start.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+NODE_NAME=hdc1
+GW_NAME=r2
+IF_NAME=$NODE_NAME-$GW_NAME
+IP_ADDR=fcff:2:1::2/48
+GW_ADDR=fcff:2:1::1
+
+ip -6 addr add $IP_ADDR dev $IF_NAME 
+ip -6 route add default via $GW_ADDR dev $IF_NAME
diff --git a/nets/8routers/nodeconf/hdc2/start.sh b/nets/8routers/nodeconf/hdc2/start.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+NODE_NAME=hdc2
+GW_NAME=r8
+IF_NAME=$NODE_NAME-$GW_NAME
+IP_ADDR=fcff:8:1::2/48
+GW_ADDR=fcff:8:1::1
+
+ip -6 addr add $IP_ADDR dev $IF_NAME 
+ip -6 route add default via $GW_ADDR dev $IF_NAME
diff --git a/nets/8routers/nodeconf/hdc3/start.sh b/nets/8routers/nodeconf/hdc3/start.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+NODE_NAME=hdc3
+GW_NAME=r5
+IF_NAME=$NODE_NAME-$GW_NAME
+IP_ADDR=fcff:5:1::2/48
+GW_ADDR=fcff:5:1::1
+
+ip -6 addr add $IP_ADDR dev $IF_NAME 
+ip -6 route add default via $GW_ADDR dev $IF_NAME
diff --git a/nets/8routers/nodeconf/r2/ospf6d.conf b/nets/8routers/nodeconf/r2/ospf6d.conf
@@ -19,6 +19,9 @@ interface r2-r3
 interface r2-r7
  ipv6 ospf6 network broadcast
 !
+interface r2-hdc1
+  ipv6 ospf6 network broadcast
+!
 router ospf6
  ospf6 router-id 10.0.0.2
  log-adjacency-changes detail
diff --git a/nets/8routers/nodeconf/r2/zebra.conf b/nets/8routers/nodeconf/r2/zebra.conf
@@ -16,6 +16,9 @@ interface r2-r3
 interface r2-r7
  ipv6 address fcf0:0:2:7::1/64
 !
+interface r2-hdc1
+ ipv6 address fcff:2:1::1/48
+!
 interface lo
  ipv6 address fcff:2::1/128
 !
diff --git a/nets/8routers/nodeconf/r5/ospf6d.conf b/nets/8routers/nodeconf/r5/ospf6d.conf
@@ -25,6 +25,9 @@ interface r5-r4
 interface r5-r6
  ipv6 ospf6 network broadcast
 !
+interface r5-hdc3
+  ipv6 ospf6 network broadcast
+!
 router ospf
  ospf6 router-id 10.0.0.5
  log-adjacency-changes detail
diff --git a/nets/8routers/nodeconf/r5/zebra.conf b/nets/8routers/nodeconf/r5/zebra.conf
@@ -22,6 +22,9 @@ interface r5-r4
 interface r5-r6
  ipv6 address fcf0:0:5:6::1/64
 !
+interface r5-hdc3
+ ipv6 address fcff:5:1::1/48
+!
 interface lo
  ipv6 address fcff:5::1/128
 !
diff --git a/nets/8routers/nodeconf/r8/ospf6d.conf b/nets/8routers/nodeconf/r8/ospf6d.conf
@@ -25,6 +25,9 @@ interface r8-r6
 interface r8-r7
  ipv6 ospf6 network broadcast
 !
+interface r8-hdc2
+  ipv6 ospf6 network broadcast
+!
 router ospf
  ospf6 router-id 10.0.0.8
  log-adjacency-changes detail
diff --git a/nets/8routers/nodeconf/r8/zebra.conf b/nets/8routers/nodeconf/r8/zebra.conf
@@ -22,6 +22,9 @@ interface r8-r6
 interface r8-r7
  ipv6 address fcf0:0:7:8::2/64
 !
+interface r8-hdc2
+ ipv6 address fcff:8:1::1/48
+!
 interface lo
  ipv6 address fcff:8::1/128
 !
diff --git a/nets/8routers/ospf8r.py b/nets/8routers/ospf8r.py
@@ -120,8 +120,8 @@ def __init__(self, name, *args, **kwargs):
 
 # the add_link function creates a link and assigns the interface names
 # as node1-node2 and node2-node1
-def add_link (node1, node2):
-    Link(node1, node2, intfName1=node1.name+'-'+node2.name,
+def add_link (my_net,node1, node2):
+    my_net.addLink(node1, node2, intfName1=node1.name+'-'+node2.name,
                        intfName2=node2.name+'-'+node1.name)
 
 def create_topo(my_net):
@@ -141,6 +141,10 @@ def create_topo(my_net):
     h82 = my_net.addHost(name='h82', cls=BaseNode)
     h83 = my_net.addHost(name='h83', cls=BaseNode)
 
+    hdc1 = my_net.addHost(name='hdc1', cls=BaseNode)
+    hdc2 = my_net.addHost(name='hdc2', cls=BaseNode)
+    hdc3 = my_net.addHost(name='hdc3', cls=BaseNode)
+
     r1 = my_net.addHost(name='r1', cls=Router)
     r2 = my_net.addHost(name='r2', cls=Router)
     r3 = my_net.addHost(name='r3', cls=Router)
@@ -159,41 +163,47 @@ def create_topo(my_net):
     # as node1-node2 and node2-node1
 
     #hosts of r1
-    add_link(h11,r1)
-    add_link(h12,r1)
-    add_link(h13,r1)
+    add_link(my_net, h11,r1)
+    add_link(my_net, h12,r1)
+    add_link(my_net, h13,r1)
     #r1 - r2
-    add_link(r1,r2)
+    add_link(my_net, r1,r2)
+    #datacenters of r2
+    add_link(my_net, hdc1,r2)
     #r2 - r3
-    add_link(r2,r3)
+    add_link(my_net, r2,r3)
     #r2 - r7
-    add_link(r2,r7)
+    add_link(my_net, r2,r7)
     #hosts of r3
-    add_link(h31,r3)
-    add_link(h32,r3)
-    add_link(h33,r3)
+    add_link(my_net, h31,r3)
+    add_link(my_net, h32,r3)
+    add_link(my_net, h33,r3)
     #r3 - r4
-    add_link(r3,r4)
+    add_link(my_net, r3,r4)
     #r4 - r5
-    add_link(r4,r5)
+    add_link(my_net, r4,r5)
     #r4 - r6
-    add_link(r4,r6)
+    add_link(my_net, r4,r6)
     #hosts of r5
-    add_link(h51,r5)
-    add_link(h52,r5)
-    add_link(h53,r5)
+    add_link(my_net, h51,r5)
+    add_link(my_net, h52,r5)
+    add_link(my_net, h53,r5)
+    #datacenters of r5
+    add_link(my_net, hdc3,r5)
     #r5 - r6
-    add_link(r5,r6)
+    add_link(my_net, r5,r6)
     #r6 - r7
-    add_link(r6,r7)
+    add_link(my_net, r6,r7)
     #r6 - r8
-    add_link(r6,r8)
+    add_link(my_net, r6,r8)
     #r7 - r8
-    add_link(r7,r8)
+    add_link(my_net, r7,r8)
     #hosts of r8
-    add_link(h81,r8)
-    add_link(h82,r8)
-    add_link(h83,r8)
+    add_link(my_net, h81,r8)
+    add_link(my_net, h82,r8)
+    add_link(my_net, h83,r8)
+    #datacenters of r8
+    add_link(my_net, hdc2,r8)
 
 
 def add_nodes_to_etc_hosts():

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ interface r2-r3`
`16`	`16`	`interface r2-r7`
`17`	`17`	`ipv6 address fcf0:0:2:7::1/64`
`18`	`18`	`!`
	`19`	`+interface r2-hdc1`
	`20`	`+ ipv6 address fcff:2:1::1/48`
	`21`	`+!`
`19`	`22`	`interface lo`
`20`	`23`	`ipv6 address fcff:2::1/128`
`21`	`24`	`!`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ interface r5-r4`
`22`	`22`	`interface r5-r6`
`23`	`23`	`ipv6 address fcf0:0:5:6::1/64`
`24`	`24`	`!`
	`25`	`+interface r5-hdc3`
	`26`	`+ ipv6 address fcff:5:1::1/48`
	`27`	`+!`
`25`	`28`	`interface lo`
`26`	`29`	`ipv6 address fcff:5::1/128`
`27`	`30`	`!`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,9 @@ interface r8-r6`
`22`	`22`	`interface r8-r7`
`23`	`23`	`ipv6 address fcf0:0:7:8::2/64`
`24`	`24`	`!`
	`25`	`+interface r8-hdc2`
	`26`	`+ ipv6 address fcff:8:1::1/48`
	`27`	`+!`
`25`	`28`	`interface lo`
`26`	`29`	`ipv6 address fcff:8::1/128`
`27`	`30`	`!`