Merge branch 'master' of https://github.com/srikanthvavila/ONLabTest
diff --git a/TestON/tests/PeeringRouterTest/sdnip.json b/TestON/tests/PeeringRouterTest/sdnip.json
index f3117c6..5b61d05 100644
--- a/TestON/tests/PeeringRouterTest/sdnip.json
+++ b/TestON/tests/PeeringRouterTest/sdnip.json
@@ -19,7 +19,7 @@
{
"attachmentDpid" : "00:00:00:00:00:00:00:01",
"attachmentPort" : "4",
- "ipAddress" : "192.168.60.1"
+ "ipAddress" : "192.168.60.2"
}
],
diff --git a/TestON/tests/PeeringRouterTest/vlan/mininet/PeeringRouterMininetVlan.py b/TestON/tests/PeeringRouterTest/vlan/mininet/PeeringRouterMininetVlan.py
index be7418a..1f9ea74 100755
--- a/TestON/tests/PeeringRouterTest/vlan/mininet/PeeringRouterMininetVlan.py
+++ b/TestON/tests/PeeringRouterTest/vlan/mininet/PeeringRouterMininetVlan.py
@@ -87,7 +87,7 @@
host4 = self.addHost( 'host4', cls=VLANHost, vlan=30, inf="host4-eth0", ip="192.168.30.1" )
as3host = self.addHost( 'as3host' )
#AS6 host
- host5 = self.addHost( 'host5', cls=VLANHost, vlan=60, inf="host5-eth0", ip="192.168.60.1" )
+ host5 = self.addHost( 'host5', cls=VLANHost, vlan=60, inf="host5-eth0", ip="192.168.60.2" )
as6host = self.addHost( 'as6host' )
self.addLink( host1, sw2 )
@@ -205,6 +205,10 @@
as6sw = net.get('as6sw')
as6sw.cmd('ovs-vsctl set-controller as6sw none')
as6sw.cmd('ovs-vsctl set-fail-mode as6sw standalone')
+
+ as6sw.cmd( 'sudo ovs-vsctl set port as6sw-eth1 trunk=60')
+ as6sw.cmd( 'sudo ovs-vsctl set port as6sw-eth2 trunk=60')
+
sw1 = net.get('sw1')
sw1.cmd('ovs-vsctl set-controller sw1 tcp:127.0.0.1:6633')