Remove scapy functions from mininet driver
Use scapy driver for FUNCflow
Change-Id: I801261d15d49aa159dc5ab0d3993b42493484ce7
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 5a165a2..85b8ecd 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -3050,624 +3050,6 @@
main.cleanup()
main.exit()
- def startScapy( self, mplsPath="" ):
- """
- Start the Scapy cli
- optional:
- mplsPath - The path where the MPLS class is located
- NOTE: This can be a relative path from the user's home dir
- """
- mplsLines = ['import imp',
- 'imp.load_source( "mplsClass", "{}mplsClass.py" )'.format(mplsPath),
- 'from mplsClass import MPLS',
- 'bind_layers(Ether, MPLS, type = 0x8847)',
- 'bind_layers(MPLS, MPLS, bottom_of_label_stack = 0)',
- 'bind_layers(MPLS, IP)']
-
- try:
- self.handle.sendline( "scapy" )
- self.handle.expect( self.scapyPrompt )
- self.handle.sendline( "conf.color_theme = NoTheme()" )
- self.handle.expect( self.scapyPrompt )
- if mplsPath:
- main.log.info( "Adding MPLS class" )
- main.log.info( "MPLS class path: " + mplsPath )
- for line in mplsLines:
- main.log.info( "sending line: " + line )
- self.handle.sendline( line )
- self.handle.expect( self.scapyPrompt )
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def stopScapy( self ):
- """
- Exit the Scapy cli
- """
- try:
- self.handle.sendline( "exit()" )
- self.handle.expect( self.hostPrompt )
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def buildEther( self, **kwargs ):
- """
- Build an Ethernet frame
-
- Will create a frame class with the given options. If a field is
- left blank it will default to the below value unless it is
- overwritten by the next frame.
- Default frame:
- ###[ Ethernet ]###
- dst= ff:ff:ff:ff:ff:ff
- src= 00:00:00:00:00:00
- type= 0x800
-
- Returns main.TRUE or main.FALSE on error
- """
- try:
- # Set the Ethernet frame
- cmd = 'ether = Ether( '
- options = []
- for key, value in kwargs.iteritems():
- if isinstance( value, str ):
- value = '"' + value + '"'
- options.append( str( key ) + "=" + str( value ) )
- cmd += ", ".join( options )
- cmd += ' )'
- self.handle.sendline( cmd )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- self.handle.sendline( "packet = ether" )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def buildIP( self, **kwargs ):
- """
- Build an IP frame
-
- Will create a frame class with the given options. If a field is
- left blank it will default to the below value unless it is
- overwritten by the next frame.
- Default frame:
- ###[ IP ]###
- version= 4
- ihl= None
- tos= 0x0
- len= None
- id= 1
- flags=
- frag= 0
- ttl= 64
- proto= hopopt
- chksum= None
- src= 127.0.0.1
- dst= 127.0.0.1
- \options\
-
- Returns main.TRUE or main.FALSE on error
- """
- try:
- # Set the IP frame
- cmd = 'ip = IP( '
- options = []
- for key, value in kwargs.iteritems():
- if isinstance( value, str ):
- value = '"' + value + '"'
- options.append( str( key ) + "=" + str( value ) )
- cmd += ", ".join( options )
- cmd += ' )'
- self.handle.sendline( cmd )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- self.handle.sendline( "packet = ether/ip" )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def buildIPv6( self, **kwargs ):
- """
- Build an IPv6 frame
-
- Will create a frame class with the given options. If a field is
- left blank it will default to the below value unless it is
- overwritten by the next frame.
- Default frame:
- ###[ IPv6 ]###
- version= 6
- tc= 0
- fl= 0
- plen= None
- nh= No Next Header
- hlim= 64
- src= ::1
- dst= ::1
-
- Returns main.TRUE or main.FALSE on error
- """
- try:
- # Set the IPv6 frame
- cmd = 'ipv6 = IPv6( '
- options = []
- for key, value in kwargs.iteritems():
- if isinstance( value, str ):
- value = '"' + value + '"'
- options.append( str( key ) + "=" + str( value ) )
- cmd += ", ".join( options )
- cmd += ' )'
- self.handle.sendline( cmd )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- self.handle.sendline( "packet = ether/ipv6" )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def buildTCP( self, ipVersion=4, **kwargs ):
- """
- Build an TCP frame
-
- Will create a frame class with the given options. If a field is
- left blank it will default to the below value unless it is
- overwritten by the next frame.
-
- NOTE: Some arguments require quotes around them. It's up to you to
- know which ones and to add them yourself. Arguments with an asterisk
- do not need quotes.
-
- Options:
- ipVersion - Either 4 (default) or 6, indicates what Internet Protocol
- frame to use to encapsulate into
- Default frame:
- ###[ TCP ]###
- sport= ftp_data *
- dport= http *
- seq= 0
- ack= 0
- dataofs= None
- reserved= 0
- flags= S
- window= 8192
- chksum= None
- urgptr= 0
- options= {}
-
- Returns main.TRUE or main.FALSE on error
- """
- try:
- # Set the TCP frame
- cmd = 'tcp = TCP( '
- options = []
- for key, value in kwargs.iteritems():
- options.append( str( key ) + "=" + str( value ) )
- cmd += ", ".join( options )
- cmd += ' )'
- self.handle.sendline( cmd )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- if str( ipVersion ) is '4':
- self.handle.sendline( "packet = ether/ip/tcp" )
- elif str( ipVersion ) is '6':
- self.handle.sendline( "packet = ether/ipv6/tcp" )
- else:
- main.log.error( "Unrecognized option for ipVersion, given " +
- repr( ipVersion ) )
- return main.FALSE
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def buildUDP( self, ipVersion=4, **kwargs ):
- """
- Build an UDP frame
-
- Will create a frame class with the given options. If a field is
- left blank it will default to the below value unless it is
- overwritten by the next frame.
-
- NOTE: Some arguments require quotes around them. It's up to you to
- know which ones and to add them yourself. Arguments with an asterisk
- do not need quotes.
-
- Options:
- ipVersion - Either 4 (default) or 6, indicates what Internet Protocol
- frame to use to encapsulate into
- Default frame:
- ###[ UDP ]###
- sport= domain *
- dport= domain *
- len= None
- chksum= None
-
- Returns main.TRUE or main.FALSE on error
- """
- try:
- # Set the UDP frame
- cmd = 'udp = UDP( '
- options = []
- for key, value in kwargs.iteritems():
- options.append( str( key ) + "=" + str( value ) )
- cmd += ", ".join( options )
- cmd += ' )'
- self.handle.sendline( cmd )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- if str( ipVersion ) is '4':
- self.handle.sendline( "packet = ether/ip/udp" )
- elif str( ipVersion ) is '6':
- self.handle.sendline( "packet = ether/ipv6/udp" )
- else:
- main.log.error( "Unrecognized option for ipVersion, given " +
- repr( ipVersion ) )
- return main.FALSE
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def buildICMP( self, **kwargs ):
- """
- Build an ICMP frame
-
- Will create a frame class with the given options. If a field is
- left blank it will default to the below value unless it is
- overwritten by the next frame.
- Default frame:
- ###[ ICMP ]###
- type= echo-request
- code= 0
- chksum= None
- id= 0x0
- seq= 0x0
-
- Returns main.TRUE or main.FALSE on error
- """
- try:
- # Set the ICMP frame
- cmd = 'icmp = ICMP( '
- options = []
- for key, value in kwargs.iteritems():
- if isinstance( value, str ):
- value = '"' + value + '"'
- options.append( str( key ) + "=" + str( value ) )
- cmd += ", ".join( options )
- cmd += ' )'
- self.handle.sendline( cmd )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- self.handle.sendline( "packet = ether/ip/icmp" )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def sendPacket( self, iface=None, packet=None, timeout=1 ):
- """
- Send a packet with either the given scapy packet command, or use the
- packet saved in the variable 'packet'.
-
- Examples of a valid string for packet:
-
- Simple IP packet
- packet='Ether(dst="a6:d9:26:df:1d:4b")/IP(dst="10.0.0.2")'
-
- A Ping with two vlan tags
- packet='Ether(dst='ff:ff:ff:ff:ff:ff')/Dot1Q(vlan=1)/Dot1Q(vlan=10)/
- IP(dst='255.255.255.255', src='192.168.0.1')/ICMP()'
-
- Returns main.TRUE or main.FALSE on error
- """
- try:
- # TODO: add all params, or use kwargs
- sendCmd = 'srp( '
- if packet:
- sendCmd += packet
- else:
- sendCmd += "packet"
- if iface:
- sendCmd += ", iface='{}'".format( iface )
-
- sendCmd += ', timeout=' + str( timeout ) + ')'
- self.handle.sendline( sendCmd )
- self.handle.expect( self.scapyPrompt )
- if "Traceback" in self.handle.before:
- # KeyError, SyntaxError, ...
- main.log.error( "Error in sending command: " + self.handle.before )
- return main.FALSE
- # TODO: Check # of packets sent?
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def startFilter( self, ifaceName=None, sniffCount=1, pktFilter="ip" ):
- """
- Listen for packets using the given filters
-
- Options:
- ifaceName - the name of the interface to listen on. If none is given,
- defaults to <host name>-eth0
- pktFilter - A string in Berkeley Packet Filter (BPF) format which
- specifies which packets to sniff
- sniffCount - The number of matching packets to capture before returning
-
- Returns main.TRUE or main.FALSE on error
- """
- try:
- # TODO: add all params, or use kwargs
- ifaceName = str( ifaceName ) if ifaceName else self.name + "-eth0"
- # Set interface
- self.handle.sendline( ' conf.iface = "' + ifaceName + '"' )
- self.handle.expect( self.scapyPrompt )
- cmd = 'pkt = sniff(count = ' + str( sniffCount ) +\
- ', filter = "' + str( pktFilter ) + '")'
- self.handle.sendline( cmd )
- self.handle.expect( '"\)\r\n' )
- # TODO: parse this?
- return main.TRUE
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def checkFilter( self ):
- """
- Check that a filter returned and returns the reponse
- """
- try:
- i = self.handle.expect( [ self.scapyPrompt, pexpect.TIMEOUT ] )
- if i == 0:
- return main.TRUE
- else:
- return main.FALSE
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def killFilter( self ):
- """
- Kill a scapy filter
- """
- try:
- self.handle.send( "\x03" ) # Send a ctrl-c to kill the filter
- self.handle.expect( self.scapyPrompt )
- return self.handle.before
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return None
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def readPackets( self ):
- """
- Read all the packets captured by the previous filter
- """
- try:
- self.handle.sendline( "for p in pkt: p \n")
- self.handle.expect( "for p in pkt: p \r\n... \r\n" )
- self.handle.expect( self.scapyPrompt )
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return None
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
- return self.handle.before
-
- def updateSelf( self ):
- """
- Updates local MAC and IP fields
- """
- self.hostMac = self.getMac()
- self.hostIp = self.getIp()
-
- def getMac( self, ifaceName=None ):
- """
- Save host's MAC address
- """
- try:
- ifaceName = str( ifaceName ) if ifaceName else self.name + "-eth0"
- cmd = 'get_if_hwaddr("' + str( ifaceName ) + '")'
- self.handle.sendline( cmd )
- self.handle.expect( self.scapyPrompt )
- pattern = r'(([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))'
- match = re.search( pattern, self.handle.before )
- if match:
- return match.group()
- else:
- # the command will have an exception if iface doesn't exist
- return None
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return None
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
-
- def getIp( self, ifaceName=None ):
- """
- Save host's IP address
- """
- try:
- ifaceName = ifaceName if ifaceName else self.name + "-eth0"
- cmd = 'get_if_addr("' + str( ifaceName ) + '")'
- self.handle.sendline( cmd )
- self.handle.expect( self.scapyPrompt )
-
- pattern = r'(((2[0-5]|1[0-9]|[0-9])?[0-9]\.){3}((2[0-5]|1[0-9]|[0-9])?[0-9]))'
- match = re.search( pattern, self.handle.before )
- if match:
- # NOTE: The command will return 0.0.0.0 if the iface doesn't exist
- return match.group()
- else:
- return None
- except pexpect.TIMEOUT:
- main.log.exception( self.name + ": Command timed out" )
- return None
- except pexpect.EOF:
- main.log.exception( self.name + ": connection closed." )
- main.cleanup()
- main.exit()
- except Exception:
- main.log.exception( self.name + ": Uncaught exception!" )
- main.cleanup()
- main.exit()
if __name__ != "__main__":
sys.modules[ __name__ ] = MininetCliDriver()
diff --git a/TestON/drivers/common/cli/emulator/scapyclidriver.py b/TestON/drivers/common/cli/emulator/scapyclidriver.py
index a083183..39c5c4d 100644
--- a/TestON/drivers/common/cli/emulator/scapyclidriver.py
+++ b/TestON/drivers/common/cli/emulator/scapyclidriver.py
@@ -700,6 +700,7 @@
sendCmd += ', timeout=' + str( timeout ) + ')'
self.handle.sendline( sendCmd )
self.handle.expect( self.scapyPrompt )
+ # main.log.warn( "Send packet response: {}".format( self.handle.before ) )
if "Traceback" in self.handle.before:
# KeyError, SyntaxError, ...
main.log.error( "Error in sending command: " + self.handle.before )
@@ -739,7 +740,7 @@
self.handle.expect( self.scapyPrompt )
cmd = 'pkt = sniff(count = ' + str( sniffCount ) +\
', filter = "' + str( pktFilter ) + '")'
- print self.name + ' > ' + cmd
+ main.log.info( "Filter on " + self.name + ' > ' + cmd )
self.handle.sendline( cmd )
self.handle.expect( '"\)\r\n' )
# TODO: parse this?
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>