commit c470e10c7451befb1b3a8e8895244884847f5f6d
author Kunihiro Ishiguro <kunihiroishiguro@gmail.com> Tue Jan 20 15:51:29 2015 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Fri Jan 23 00:37:36 2015 +0000
tree 27a5b07a9ff880c01c5d3816c5094b898cf0a257
parent d36a90fa410eb480678a00af57efb6f69f738806

ONOS-639 SDN-IP tutorial script for IPv6

IPv6 netowrk is advertised.
IPv6 address is used for BGP peering.
Still using IPv4 address for ONOS peering.
*.json files are updated correspondingly.

Change-Id: I8fdac12d2d25b840dcadfb261667a9f98eb9f6be

tools/tutorials/sdnip/tutorial_ipv6.py

diff --git a/tools/tutorials/sdnip/tutorial_ipv6.py b/tools/tutorials/sdnip/tutorial_ipv6.py
index cc5f54c..9fc4f3f 100755
--- a/tools/tutorials/sdnip/tutorial_ipv6.py
+++ b/tools/tutorials/sdnip/tutorial_ipv6.py
@@ -9,12 +9,14 @@
 QUAGGA_DIR = '/usr/lib/quagga'
 # Must exist and be owned by quagga user (quagga:quagga by default on Ubuntu)
 QUAGGA_RUN_DIR = '/var/run/quagga'
-CONFIG_DIR = 'configs'
+CONFIG_DIR = 'configs-ipv6'
 
 class SdnIpHost(Host):
     def __init__(self, name, ip, route, *args, **kwargs):
         Host.__init__(self, name, ip=ip, *args, **kwargs)
 
+        self.name = name
+        self.ip = ip
         self.route = route
 
     def config(self, **kwargs):
@@ -22,6 +24,7 @@
 
         debug("configuring route %s" % self.route)
 
+        self.cmd('ip addr add %s dev %s-eth0' % (self.ip, self.name))
         self.cmd('ip route add default via %s' % self.route)
 
 class Router(Host):
@@ -84,8 +87,8 @@
             name = 'r%s' % i
 
             eth0 = { 'mac' : '00:00:00:00:0%s:01' % i,
-                     'ipAddrs' : ['10.0.%s.1/24' % i] }
-            eth1 = { 'ipAddrs' : ['192.168.%s.254/24' % i] }
+                     'ipAddrs' : ['2001:%s::1/48' % i] }
+            eth1 = { 'ipAddrs' : ['2001:10%s::101/48' % i] }
             intfs = { '%s-eth0' % name : eth0,
                       '%s-eth1' % name : eth1 }
 
@@ -94,19 +97,19 @@
             router = self.addHost(name, cls=Router, quaggaConfFile=quaggaConf,
                                   zebraConfFile=zebraConf, intfDict=intfs)
             
-            host = self.addHost('h%s' % i, cls=SdnIpHost, 
-                                ip='192.168.%s.1/24' % i,
-                                route='192.168.%s.254' % i)
+            host = self.addHost('h%s' % i, cls=SdnIpHost,
+                                ip='2001:10%s::1/48' % i,
+                                route='2001:10%s::101' % i)
             
             self.addLink(router, attachmentSwitches[i-1])
             self.addLink(router, host)
 
         # Set up the internal BGP speaker
         bgpEth0 = { 'mac':'00:00:00:00:00:01', 
-                    'ipAddrs' : ['10.0.1.101/24',
-                                 '10.0.2.101/24',
-                                 '10.0.3.101/24',
-                                 '10.0.4.101/24',] }
+                    'ipAddrs' : ['2001:1::101/48',
+                                 '2001:2::101/48',
+                                 '2001:3::101/48',
+                                 '2001:4::101/48',] }
         bgpEth1 = { 'ipAddrs' : ['10.10.10.1/24'] }
         bgpIntfs = { 'bgp-eth0' : bgpEth0,
                      'bgp-eth1' : bgpEth1 }