Added IPv6 to existing IPv4 VLAN hosts making them dual stack VLAN hosts.
Adding IPv6 only VLAN hosts would have required too many changes to FUNCintent.
Test logs:
onos> hosts
id=00:00:00:00:00:04/100, mac=00:00:00:00:00:04, location=of:0000000000000005/4, vlan=100, ip(s)=[100.1.0.2, 3000::2]
id=00:00:00:00:00:05/200, mac=00:00:00:00:00:05, location=of:0000000000000005/5, vlan=200, ip(s)=[4000::2, 200.1.0.2]
id=00:00:00:00:00:0C/100, mac=00:00:00:00:00:0C, location=of:0000000000000006/4, vlan=100, ip(s)=[100.1.0.3, 3000::3, fe80::200:ff:fe00:c]
id=00:00:00:00:00:0D/200, mac=00:00:00:00:00:0D, location=of:0000000000000006/5, vlan=200, ip(s)=[200.1.0.3, 4000::3, fe80::200:ff:fe00:d]
onos>
Change-Id: I870186a3493874da6b2eb1e8529b6f531dcbed14
diff --git a/TestON/tests/FUNCintent/Dependency/newFuncTopo.py b/TestON/tests/FUNCintent/Dependency/newFuncTopo.py
index 5edf7f7..df808a7 100755
--- a/TestON/tests/FUNCintent/Dependency/newFuncTopo.py
+++ b/TestON/tests/FUNCintent/Dependency/newFuncTopo.py
@@ -15,19 +15,20 @@
from mininet.node import ( UserSwitch, OVSSwitch, IVSSwitch )
class VLANHost( Host ):
- def config( self, vlan=100, **params ):
+ def config( self, vlan=100, v6Addr='3000::1/64', **params ):
r = super( Host, self ).config( **params )
intf = self.defaultIntf()
self.cmd( 'ifconfig %s inet 0' % intf )
self.cmd( 'vconfig add %s %d' % ( intf, vlan ) )
self.cmd( 'ifconfig %s.%d inet %s' % ( intf, vlan, params['ip'] ) )
+ self.cmd( 'ip -6 addr add %s dev %s.%d' % ( v6Addr, intf, vlan ) )
newName = '%s.%d' % ( intf, vlan )
intf.name = newName
self.nameToIntf[ newName ] = intf
return r
class IPv6Host( Host ):
- def config( self, v6Addr='1000:1/64', **params ):
+ def config( self, v6Addr='1000::1/64', **params ):
r = super( Host, self ).config( **params )
intf = self.defaultIntf()
self.cmd( 'ifconfig %s inet 0' % intf )
@@ -47,42 +48,51 @@
# Initialize topology
Topo.__init__( self )
# Switch S5 Hosts
+ # IPv4 only Host
host1=self.addHost( 'h1', ip='10.1.0.2/24' )
+ # IPv6 only Host
host2=self.addHost( 'h2', cls=IPv6Host, v6Addr='1000::2/64' )
+ # Dual Stack Host
host3=self.addHost( 'h3', ip='10.1.0.3/24', cls=dualStackHost, v6Addr='2000::2/64' )
- #VLAN hosts
- host4=self.addHost( 'h4', ip='100.1.0.2/24', cls=VLANHost, vlan=100 )
- host5=self.addHost( 'h5', ip='200.1.0.2/24', cls=VLANHost, vlan=200 )
- #VPN-1 and VPN-2 Hosts
+ # VLAN hosts
+ host4=self.addHost( 'h4', ip='100.1.0.2/24', cls=VLANHost, vlan=100, v6Addr='3000::2/64' )
+ host5=self.addHost( 'h5', ip='200.1.0.2/24', cls=VLANHost, vlan=200, v6Addr='4000::2/64' )
+ # VPN-1 and VPN-2 Hosts
host6=self.addHost( 'h6', ip='11.1.0.2/24' )
host7=self.addHost( 'h7', ip='12.1.0.2/24' )
- #Multicast Sender
+ # Multicast Sender
host8=self.addHost( 'h8', ip='10.1.0.4/24' )
# Switch S6 Hosts
+ # IPv4 only Host
host9=self.addHost( 'h9', ip='10.1.0.5/24' )
+ # IPv6 only Host
host10=self.addHost( 'h10', cls=IPv6Host, v6Addr='1000::3/64' )
+ # Dual Stack Host
host11=self.addHost( 'h11', ip='10.1.0.6/24', cls=dualStackHost, v6Addr='2000::3/64' )
- #VLAN hosts
- host12=self.addHost( 'h12', ip='100.1.0.3/24', cls=VLANHost, vlan=100 )
- host13=self.addHost( 'h13', ip='200.1.0.3/24', cls=VLANHost, vlan=200 )
- #VPN-1 and VPN-2 Hosts
+ # VLAN hosts
+ host12=self.addHost( 'h12', ip='100.1.0.3/24', cls=VLANHost, vlan=100, v6Addr='3000::3/64' )
+ host13=self.addHost( 'h13', ip='200.1.0.3/24', cls=VLANHost, vlan=200, v6Addr='4000::3/64' )
+ # VPN-1 and VPN-2 Hosts
host14=self.addHost( 'h14', ip='11.1.0.3/24' )
host15=self.addHost( 'h15', ip='12.1.0.3/24' )
- #Multicast Receiver
+ # Multicast Receiver
host16=self.addHost( 'h16', ip='10.1.0.7/24' )
# Switch S7 Hosts
+ # IPv4 only Host
host17=self.addHost( 'h17', ip='10.1.0.8/24' )
+ # IPv6 only Host
host18=self.addHost( 'h18', cls=IPv6Host, v6Addr='1000::4/64' )
+ # Dual Stack Host
host19=self.addHost( 'h19', ip='10.1.0.9/24', cls=dualStackHost, v6Addr='2000::4/64' )
- #VLAN hosts
- host20=self.addHost( 'h20', ip='100.1.0.4/24', cls=VLANHost, vlan=100 )
- host21=self.addHost( 'h21', ip='200.1.0.4/24', cls=VLANHost, vlan=200 )
- #VPN-1 and VPN-2 Hosts
+ # VLAN hosts
+ host20=self.addHost( 'h20', ip='100.1.0.4/24', cls=VLANHost, vlan=100, v6Addr='3000::4/64' )
+ host21=self.addHost( 'h21', ip='200.1.0.4/24', cls=VLANHost, vlan=200, v6Addr='4000::4/64' )
+ # VPN-1 and VPN-2 Hosts
host22=self.addHost( 'h22', ip='11.1.0.4/24' )
host23=self.addHost( 'h23', ip='12.1.0.4/24' )
- #Multicast Receiver
+ # Multicast Receiver
host24=self.addHost( 'h24', ip='10.1.0.10/24' )
s1 = self.addSwitch( 's1' )