Remove scapy functions from mininet driver
Use scapy driver for FUNCflow
Change-Id: I801261d15d49aa159dc5ab0d3993b42493484ce7
diff --git a/TestON/tests/FUNC/FUNCflow/FUNCflow.params b/TestON/tests/FUNC/FUNCflow/FUNCflow.params
index 5defc95..aa7c358 100755
--- a/TestON/tests/FUNC/FUNCflow/FUNCflow.params
+++ b/TestON/tests/FUNC/FUNCflow/FUNCflow.params
@@ -4,10 +4,9 @@
# 1,2,10,1000,1100,2000,1200,2000,100
# 1 - Variable initialization and optional pull and build ONOS package
# 2 - install ONOS
- # 8 - Compare topology
- # 9 - Report logs
# 10 - Start mininet and verify topology
# 66 - Testing Scapy
+ # 100 - Check logs for Errors and Warnings
# 1000 - Add flows with MAC selector
# 1100 - Add flows with IPv4 selector
# 1200 - Add flows with VLAN selector
diff --git a/TestON/tests/FUNC/FUNCflow/FUNCflow.py b/TestON/tests/FUNC/FUNCflow/FUNCflow.py
index 7851d51..eeed451 100644
--- a/TestON/tests/FUNC/FUNCflow/FUNCflow.py
+++ b/TestON/tests/FUNC/FUNCflow/FUNCflow.py
@@ -305,8 +305,8 @@
'''
main.case( "Testing scapy" )
main.step( "Creating Host1 component" )
- main.Mininet1.createHostComponent( "h1" )
- main.Mininet1.createHostComponent( "h2" )
+ main.Scapy.createHostComponent( "h1" )
+ main.Scapy.createHostComponent( "h2" )
hosts = [main.h1, main.h2]
for host in hosts:
host.startHostCli()
@@ -317,10 +317,15 @@
main.log.debug( host.hostMac )
main.step( "Sending/Receiving Test packet - Filter doesn't match" )
+ main.log.info( "Starting Filter..." )
main.h2.startFilter()
+ main.log.info( "Building Ether frame..." )
main.h1.buildEther( dst=main.h2.hostMac )
+ main.log.info( "Sending Packet..." )
main.h1.sendPacket( )
+ main.log.info( "Checking Filter..." )
finished = main.h2.checkFilter()
+ main.log.debug( finished )
i = ""
if finished:
a = main.h2.readPackets()
@@ -382,8 +387,8 @@
main.step( "Add flows with MAC addresses as the only selectors" )
main.log.info( "Creating host components" )
- main.Mininet1.createHostComponent( "h1" )
- main.Mininet1.createHostComponent( "h2" )
+ main.Scapy.createHostComponent( "h1" )
+ main.Scapy.createHostComponent( "h2" )
hosts = [main.h1, main.h2]
stepResult = main.TRUE
for host in hosts:
@@ -504,8 +509,8 @@
main.step( "Add flows with IPv4 addresses as the only selectors" )
main.log.info( "Creating host components" )
- main.Mininet1.createHostComponent( "h1" )
- main.Mininet1.createHostComponent( "h2" )
+ main.Scapy.createHostComponent( "h1" )
+ main.Scapy.createHostComponent( "h2" )
hosts = [main.h1, main.h2]
stepResult = main.TRUE
for host in hosts:
@@ -625,8 +630,8 @@
# We do this here to utilize the hosts information
main.log.info( "Creating host components" )
- main.Mininet1.createHostComponent( "h3" )
- main.Mininet1.createHostComponent( "h4" )
+ main.Scapy.createHostComponent( "h3" )
+ main.Scapy.createHostComponent( "h4" )
hosts = [main.h3, main.h4]
stepResult = main.TRUE
for host in hosts:
@@ -751,8 +756,8 @@
main.step( "Add a flow with a MPLS selector" )
main.log.info( "Creating host components" )
- main.Mininet1.createHostComponent( "h1" )
- main.Mininet1.createHostComponent( "h2" )
+ main.Scapy.createHostComponent( "h1" )
+ main.Scapy.createHostComponent( "h2" )
hosts = [main.h1, main.h2]
stepResult = main.TRUE
for host in hosts:
@@ -867,8 +872,8 @@
main.step( "Add a flow with a TCP selector" )
main.log.info( "Creating host components" )
- main.Mininet1.createHostComponent( "h1" )
- main.Mininet1.createHostComponent( "h2" )
+ main.Scapy.createHostComponent( "h1" )
+ main.Scapy.createHostComponent( "h2" )
hosts = [main.h1, main.h2]
stepResult = main.TRUE
for host in hosts:
@@ -991,8 +996,8 @@
main.step( "Add a flow with a UDP selector" )
main.log.info( "Creating host components" )
- main.Mininet1.createHostComponent( "h1" )
- main.Mininet1.createHostComponent( "h2" )
+ main.Scapy.createHostComponent( "h1" )
+ main.Scapy.createHostComponent( "h2" )
hosts = [main.h1, main.h2]
stepResult = main.TRUE
for host in hosts:
diff --git a/TestON/tests/FUNC/FUNCflow/FUNCflow.topo b/TestON/tests/FUNC/FUNCflow/FUNCflow.topo
index d910446..50e5d63 100755
--- a/TestON/tests/FUNC/FUNCflow/FUNCflow.topo
+++ b/TestON/tests/FUNC/FUNCflow/FUNCflow.topo
@@ -23,7 +23,7 @@
</ONOScli1>
<Mininet1>
- <host>localhost</host>
+ <host>OCN</host>
<user>sdn</user>
<password>rocks</password>
<type>MininetCliDriver</type>
@@ -42,5 +42,13 @@
</COMPONENTS>
</ONOSrest>
+ <Scapy>
+ <host>OCN</host>
+ <user>sdn</user>
+ <password>rocks</password>
+ <type>ScapyCliDriver</type>
+ <connect_order>7</connect_order>
+ </Scapy>
+
</COMPONENT>
</TOPOLOGY>