commit 983c7a39eb128b01314bedd61393b396f71e7387
author pingping-lin <pingping@onlab.us> Tue Dec 15 16:20:45 2015 -0800
committer pingping-lin <pingping@onlab.us> Tue Dec 15 16:21:19 2015 -0800
tree 8a1a23c5deee9e0526746b570ba58d0f339eb694
parent 64af85039d343fa959530ba3d2aed9f4a2593e6e

add vlan to speaker1 and 3 peers

Change-Id: Ia3938e954b27f7af1b5966f049c56e7eff93d26c

TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/USECASE_SdnipI2MN.py

diff --git a/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/USECASE_SdnipI2MN.py b/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/USECASE_SdnipI2MN.py
index b034d34..81cfca5 100755
--- a/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/USECASE_SdnipI2MN.py
+++ b/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/USECASE_SdnipI2MN.py
@@ -28,6 +28,7 @@
 QUAGGA_CONFIG_DIR = '~/OnosSystemTest/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/'
 # onos1IP = '10.254.1.201'
 numSw = 39
+vlanId = 8
 
 
 class SDNTopo( Topo ):
@@ -284,9 +285,10 @@
     # Adding addresses to host64513_1 interface connected to sw24
     # for BGP peering
     speaker1.setMAC( '00:00:00:00:00:01', 'speaker1-eth0' )
-    speaker1.cmd( 'ip addr add 10.0.4.101/24 dev speaker1-eth0' )
-    speaker1.cmd( 'ip addr add 10.0.5.101/24 dev speaker1-eth0' )
-    speaker1.cmd( 'ip addr add 10.0.6.101/24 dev speaker1-eth0' )
+    speaker1.cmd( "sudo vconfig add speaker1-eth0 %d" % vlanId )
+    speaker1.cmd( 'ip addr add 10.0.4.101/24 dev speaker1-eth0.%d' % vlanId )
+    speaker1.cmd( 'ip addr add 10.0.5.101/24 dev speaker1-eth0.%d' % vlanId )
+    speaker1.cmd( 'ip addr add 10.0.6.101/24 dev speaker1-eth0.%d' % vlanId )
 
     speaker1.defaultIntf().setIP( '10.1.4.101/24' )
     speaker1.defaultIntf().setMAC( '00:00:00:00:00:01' )
@@ -295,12 +297,18 @@
     net.start()
 
     # setup configuration on the interface connected to switch
-    peer64514.cmd( "ifconfig  peer64514-eth0 10.0.4.1 up" )
+
     peer64514.setMAC( '00:00:00:00:00:04', 'peer64514-eth0' )
-    peer64515.cmd( "ifconfig  peer64515-eth0 10.0.5.1 up" )
+    peer64514.cmd( "sudo vconfig add peer64514-eth0 %d" % vlanId )
+    peer64514.cmd( "ip addr add 10.0.4.1/24 dev peer64514-eth0.%d" % vlanId )
+
     peer64515.setMAC( '00:00:00:00:00:05', 'peer64515-eth0' )
-    peer64516.cmd( "ifconfig  peer64516-eth0 10.0.6.1 up" )
+    peer64515.cmd( "sudo vconfig add peer64515-eth0 %d" % vlanId )
+    peer64515.cmd( "ip addr add 10.0.5.1/24 dev peer64515-eth0.%d" % vlanId )
+
     peer64516.setMAC( '00:00:00:00:00:06', 'peer64516-eth0' )
+    peer64516.cmd( "sudo vconfig add peer64516-eth0 %d" % vlanId )
+    peer64516.cmd( "ip addr add 10.0.6.1/24 dev peer64516-eth0.%d" % vlanId )
 
     # setup configuration on the interface connected to hosts
     peer64514.setIP( "4.0.0.254", 8, "peer64514-eth1" )