add vlan to speaker1 and 3 peers
Change-Id: Ia3938e954b27f7af1b5966f049c56e7eff93d26c
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" )
diff --git a/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/fsfw.xml b/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/fsfw.xml
index 8e57ad5..e792f37 100644
--- a/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/fsfw.xml
+++ b/TestON/tests/USECASE_SdnipFunction_fsfw/Dependency/fsfw.xml
@@ -42,395 +42,395 @@
<slice name="P10-ONOS-demo1">
<switch name="sw1" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw1-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw1-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw1-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw2" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw2-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw2-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw3" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw3-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw3-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw3-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw4" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw4-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw4-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw5" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw5-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw5-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw5-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw6" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw6-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw6-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw7" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw7-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw7-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw8" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw8-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw8-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw8-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw8-eth4">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw8-eth5">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw9" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw9-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw9-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw10" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw10-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw10-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw11" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw11-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw11-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw11-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw12" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw12-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw12-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw12-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw13" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw13-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw13-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw13-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw14" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw14-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw14-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw14-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw14-eth4">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw14-eth5">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw15" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw15-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw15-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw16" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw16-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw16-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw17" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw17-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw17-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw17-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw17-eth4">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw18" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw18-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw18-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw19" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw19-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw19-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw20" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw20-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw20-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw21" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw21-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw21-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw21-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw22" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw22-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw22-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw23" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw23-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw23-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw23-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw23-eth4">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw23-eth5">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw24" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw24-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw24-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw24-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw24-eth4">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw25" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw25-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw25-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw26" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw26-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw26-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw27" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw27-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw27-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw27-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw27-eth4">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw28" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw28-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw28-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw28-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw29" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw29-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw29-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw29-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw30" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw30-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw30-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw31" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw31-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw31-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw31-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw32" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw32-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw32-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw32-eth3">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw32-eth4">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw33" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw33-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw33-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw34" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw34-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw34-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw35" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw35-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw35-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw36" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw36-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw36-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw37" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw37-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw37-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw38" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw38-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw38-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>
<switch name="sw39" max_flows="200" flow_rate="400" packet_in_rate="100" flush_rules_on_connect="false" tag_management="true">
<port name="sw39-eth1">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
<port name="sw39-eth2">
- <range start="2511" end="2511"/>
+ <range start="8" end="8"/>
</port>
</switch>