Changes to work on intentCase
diff --git a/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.params b/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.params
deleted file mode 100644
index aa45121..0000000
--- a/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.params
+++ /dev/null
@@ -1,49 +0,0 @@
-<PARAMS>
- <testcases>1,2,21,4,5,6,7,3,4,5,6,7</testcases>
- <FLOWDEF>~/flowdef_files/Center_Triangle/flowdef_20.txt</FLOWDEF>
- <CASE1>
- <destination>h6</destination>
- </CASE1>
- <PING>
- <source1>h6</source1>
- <target1>h31</target1>
- <source2>h8</source2>
- <target2>h33</target2>
- </PING>
- <LINK>
- <begin>s1</begin>
- <end>s2</end>
- </LINK>
- <YANK>
- <hostname>h1</hostname>
- <hostip>10.0.0.1</hostip>
- <hostmac>00:00:00:00:00:01</hostmac>
- <sw1>s1</sw1>
- <sw6>s6</sw6>
- <intf>s1-eth1</intf>
- </YANK>
- <PLUG>
- <intf>s1-eth1</intf>
- <sw6>s6</sw6>
- <sw1>s1</sw1>
- </PLUG>
- <CTRL>
- <ip1>10.128.100.1</ip1>
- <port1>6633</port1>
- <ip2>10.128.100.4</ip2>
- <port2>6633</port2>
- <ip3>10.128.100.5</ip3>
- <port3>6633</port3>
- <ip4>10.128.100.6</ip4>
- <port4>6633</port4>
- </CTRL>
- <RestIP>10.128.100.1</RestIP>
- <NR_Switches>25</NR_Switches>
- <NR_Links>50</NR_Links>
- <RESTCALL>
- <restIP1>10.128.100.1</restIP1>
- <restIP2>10.128.100.5</restIP2>
- <restPort>8080</restPort>
- <restURL>/wm/onos/topology/switches/all/json</restURL>
- </RESTCALL>
-</PARAMS>
diff --git a/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.py b/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.py
deleted file mode 100644
index d173bf0..0000000
--- a/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.py
+++ /dev/null
@@ -1,458 +0,0 @@
-
-class OnosSanity4nodes :
-
- def __init__(self) :
- self.default = ''
-
-#**********************************************************************************************************************************************************************************************
-#Test startup
-#Tests the startup of Zookeeper1, Cassandra1, and ONOS1 to be certain that all started up successfully
- def CASE1(self,main) : #Check to be sure ZK, Cass, and ONOS are up, then get ONOS version
- import time
- main.log.report("Pulling latest code from github to all nodes")
- main.ONOS1.git_pull()
- main.ONOS2.git_pull()
- main.ONOS3.git_pull()
- main.ONOS4.git_pull()
- main.Cassandra1.start()
- main.Cassandra2.start()
- main.Cassandra3.start()
- main.Cassandra4.start()
- time.sleep(20)
- main.ONOS1.drop_keyspace()
- main.ONOS1.start()
- time.sleep(10)
- main.ONOS2.start()
- main.ONOS3.start()
- main.ONOS4.start()
- main.ONOS1.start_rest()
- time.sleep(5)
- test= main.ONOS1.rest_status()
- if test == main.FALSE:
- main.ONOS1.start_rest()
- main.ONOS1.get_version()
- main.log.report("Startup check Zookeeper1, Cassandra1, and ONOS1 connections")
- main.case("Checking if the startup was clean...")
- main.step("Testing startup Zookeeper")
- data = main.Zookeeper1.isup()
- utilities.assert_equals(expect=main.TRUE,actual=data,onpass="Zookeeper is up!",onfail="Zookeeper is down...")
- main.step("Testing startup Cassandra")
- data = main.Cassandra1.isup()
- if data == main.FALSE:
- main.Cassandra1.stop()
- main.Cassandra2.stop()
- main.Cassandra3.stop()
- main.Cassandra4.stop()
-
- time.sleep(5)
-
- main.Cassandra1.start()
- main.Cassandra2.start()
- main.Cassandra3.start()
- main.Cassandra4.start()
- utilities.assert_equals(expect=main.TRUE,actual=data,onpass="Cassandra is up!",onfail="Cassandra is down...")
- main.step("Testing startup ONOS")
- data = main.ONOS1.isup()
- if data == main.FALSE:
- main.log.report("Something is funny... restarting ONOS")
- main.ONOS1.stop()
- time.sleep(3)
- main.ONOS1.start()
- time.sleep(5)
- data = main.ONOS1.isup()
- utilities.assert_equals(expect=main.TRUE,actual=data,onpass="ONOS is up and running!",onfail="ONOS didn't start...")
-
-#**********************************************************************************************************************************************************************************************
-#Assign Controllers
-#This test first checks the ip of a mininet host, to be certain that the mininet exists(Host is defined in Params as <CASE1><destination>).
-#Then the program assignes each ONOS instance a single controller to a switch(To be the initial master), then assigns all controllers.
-#NOTE: The reason why all four controllers are assigned although one was already assigned as the master is due to the 'ovs-vsctl set-controller' command erases all present controllers if
-# the controllers already assigned to the switch are not specified.
-
- def CASE2(self,main) : #Make sure mininet exists, then assign controllers to switches
- import time
- main.log.report("Check if mininet started properly, then assign controllers ONOS 1,2,3 and 4")
- main.case("Checking if one MN host exists")
- main.step("Host IP Checking using checkIP")
- result = main.Mininet1.checkIP(main.params['CASE1']['destination'])
- main.step("Verifying the result")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Host IP address configured",onfail="Host IP address not configured")
- main.step("assigning ONOS controllers to switches")
- for i in range(25):
- if i < 3:
- j=i+1
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'])
- time.sleep(1)
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'],ip2=main.params['CTRL']['ip2'],port2=main.params['CTRL']['port2'],ip3=main.params['CTRL']['ip3'],port3=main.params['CTRL']['port3'],ip4=main.params['CTRL']['ip4'],port4=main.params['CTRL']['port4'])
- elif i >= 3 and i < 5:
- j=i+1
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip2'],port1=main.params['CTRL']['port2'])
- time.sleep(1)
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'],ip2=main.params['CTRL']['ip2'],port2=main.params['CTRL']['port2'],ip3=main.params['CTRL']['ip3'],port3=main.params['CTRL']['port3'],ip4=main.params['CTRL']['ip4'],port4=main.params['CTRL']['port4'])
- elif i >= 5 and i < 15:
- j=i+1
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip3'],port1=main.params['CTRL']['port3'])
- time.sleep(1)
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'],ip2=main.params['CTRL']['ip2'],port2=main.params['CTRL']['port2'],ip3=main.params['CTRL']['ip3'],port3=main.params['CTRL']['port3'],ip4=main.params['CTRL']['ip4'],port4=main.params['CTRL']['port4'])
- else:
- j=i+16
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip4'],port1=main.params['CTRL']['port4'])
- time.sleep(1)
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'],ip2=main.params['CTRL']['ip2'],port2=main.params['CTRL']['port2'],ip3=main.params['CTRL']['ip3'],port3=main.params['CTRL']['port3'],ip4=main.params['CTRL']['ip4'],port4=main.params['CTRL']['port4'])
- main.Mininet1.get_sw_controller("s1")
-
-# **********************************************************************************************************************************************************************************************
-#Add Flows
-#Deletes any remnant flows from any previous test, add flows from the file labeled <FLOWDEF>, then runs the check flow test
-#NOTE: THE FLOWDEF FILE MUST BE PRESENT ON TESTON VM!!! TestON will copy the file from its home machine into /tmp/flowtmp on the machine the ONOS instance is present on
-
- def CASE3(self,main) : #Delete any remnant flows, then add flows, and time how long it takes flow tables to update
- main.log.report("Delete any flows from previous tests, then add flows from FLOWDEF file, then wait for switch flow tables to update")
- import time
- main.case("Taking care of these flows!")
- main.step("Cleaning out any leftover flows...")
- main.ONOS1.delete_flow("all")
- strtTime = time.time()
- main.ONOS1.add_flow(main.params['FLOWDEF'])
- main.case("Checking flows")
-
- count = 1
- i = 6
- while i < 16 :
- main.log.info("\n\t\t\t\th"+str(i)+" IS PINGING h"+str(i+25) )
- ping = main.Mininet1.pingHost(src="h"+str(i),target="h"+str(i+25))
- if ping == main.FALSE and count < 9:
- count = count + 1
- i = 6
- main.log.info("Ping failed, making attempt number "+str(count)+" in 2 seconds")
- time.sleep(2)
- elif ping == main.FALSE and count ==9:
- main.log.error("Ping test failed")
- i = 17
- result = main.FALSE
- elif ping == main.TRUE:
- i = i + 1
- result = main.TRUE
- endTime = time.time()
- if result == main.TRUE:
- main.log.report("\tTime to add flows: "+str(round(endTime-strtTime,2))+" seconds")
- else:
- main.log.report("\tFlows failed check")
-
- result2 = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
- main.step("Verifying the result")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Flow check PASS",onfail="Flow check FAIL")
-
-#**********************************************************************************************************************************************************************************************
-#This test case removes Controllers 2,3, and 4 then performs a ping test.
-#The assign controller is used because the ovs-vsctl module deletes all current controllers when a new controller is assigned.
-#The ping test performs single pings on hosts from opposite sides of the topology. If one ping fails, the test waits 5 seconds before trying again.
-#If the ping test fails 6 times, then the test case will return false
-
- def CASE4(self,main) :
- main.log.report("Remove ONOS 2,3,4 then ping until all hosts are reachable or fail after 6 attempts")
- import time
- for i in range(25):
- if i < 15:
- j=i+1
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1']) #Assigning a single controller removes all other controllers
- else:
- j=i+16
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'])
-
- strtTime = time.time()
- result = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
- for i in range(2):
- if result == main.FALSE:
- time.sleep(5)
- result = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
- else:
- break
-
- count = 1
- i = 6
- while i < 16 :
- main.log.info("\n\t\t\t\th"+str(i)+" IS PINGING h"+str(i+25) )
- ping = main.Mininet1.pingHost(src="h"+str(i),target="h"+str(i+25))
- if ping == main.FALSE and count < 6:
- count = count + 1
- i = 6
- main.log.info("Ping failed, making attempt number "+str(count)+" in 2 seconds")
- time.sleep(2)
- elif ping == main.FALSE and count ==6:
- main.log.error("Ping test failed")
- i = 17
- result = main.FALSE
- elif ping == main.TRUE:
- i = i + 1
- result = main.TRUE
- endTime = time.time()
- if result == main.TRUE:
- main.log.report("\tTime to complete ping test: "+str(round(endTime-strtTime,2))+" seconds")
- else:
- main.log.report("\tPING TEST FAIL")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="NO PACKET LOSS, HOST IS REACHABLE",onfail="PACKET LOST, HOST IS NOT REACHABLE")
-
-# **********************************************************************************************************************************************************************************************
-#This test case restores the controllers removed by Case 4 then performs a ping test.
-
- def CASE5(self,main) :
- main.log.report("Restore ONOS 2,3,4 then ping until all hosts are reachable or fail after 6 attempts")
- import time
- for i in range(25):
- if i < 15:
- j=i+1
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'],ip2=main.params['CTRL']['ip2'],port2=main.params['CTRL']['port2'],ip3=main.params['CTRL']['ip3'],port3=main.params['CTRL']['port3'],ip4=main.params['CTRL']['ip4'],port4=main.params['CTRL']['port4'])
- else:
- j=i+16
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'],ip2=main.params['CTRL']['ip2'],port2=main.params['CTRL']['port2'],ip3=main.params['CTRL']['ip3'],port3=main.params['CTRL']['port3'],ip4=main.params['CTRL']['ip4'],port4=main.params['CTRL']['port4'])
-
- strtTime = time.time()
- result = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
- for i in range(2):
- if result == main.FALSE:
- time.sleep(5)
- result = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
- else:
- break
-
- count = 1
- i = 6
- while i < 16 :
- main.log.info("\n\t\t\t\th"+str(i)+" IS PINGING h"+str(i+25) )
- ping = main.Mininet1.pingHost(src="h"+str(i),target="h"+str(i+25))
- if ping == main.FALSE and count < 6:
- count = count + 1
- i = 6
- main.log.info("Ping failed, making attempt number "+str(count)+" in 2 seconds")
- time.sleep(2)
- elif ping == main.FALSE and count ==6:
- main.log.error("Ping test failed")
- i = 17
- result = main.FALSE
- elif ping == main.TRUE:
- i = i + 1
- result = main.TRUE
- endTime = time.time()
- if result == main.TRUE:
- main.log.report("\tTime to complete ping test: "+str(round(endTime-strtTime,2))+" seconds")
- else:
- main.log.report("\tPING TEST FAILED")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="NO PACKET LOSS, HOST IS REACHABLE",onfail="PACKET LOST, HOST IS NOT REACHABLE")
-
-# **********************************************************************************************************************************************************************************************
-#Brings a link that all flows pass through in the mininet down, then runs a ping test to view reroute time
-
- def CASE6(self,main) :
- main.log.report("Bring Link between s1 and s2 down, then ping until all hosts are reachable or fail after 10 attempts")
- import time
- main.case("Bringing Link down... ")
- result = main.Mininet1.link(END1=main.params['LINK']['begin'],END2=main.params['LINK']['end'],OPTION="down")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Link DOWN!",onfail="Link not brought down...")
-
- strtTime = time.time()
- result = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],str(int(main.params['NR_Links'])-2))
- for i in range(2):
- if result == main.FALSE:
- time.sleep(5)
- result = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],str(int(main.params['NR_Links'])-2))
- else:
- break
-
- count = 1
- i = 6
- while i < 16 :
- main.log.info("\n\t\t\t\th"+str(i)+" IS PINGING h"+str(i+25) )
- ping = main.Mininet1.pingHost(src="h"+str(i),target="h"+str(i+25))
- if ping == main.FALSE and count < 10:
- count = count + 1
- main.log.info("Ping failed, making attempt number "+str(count)+" in 2 seconds")
- i = 6
- time.sleep(2)
- elif ping == main.FALSE and count == 10:
- main.log.error("Ping test failed")
- i = 17
- result = main.FALSE
- elif ping == main.TRUE:
- i = i + 1
- result = main.TRUE
- endTime = time.time()
- if result == main.TRUE:
- main.log.report("\tTime to complete ping test: "+str(round(endTime-strtTime,2))+" seconds")
- else:
- main.log.report("\tPING TEST FAILED")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="NO PACKET LOSS, HOST IS REACHABLE",onfail="PACKET LOST, HOST IS NOT REACHABLE")
-
-# **********************************************************************************************************************************************************************************************
-#Brings the link that Case 6 took down back up, then runs a ping test to view reroute time
-
- def CASE7(self,main) :
- main.log.report("Bring Link between s1 and s2 up, then ping until all hosts are reachable or fail after 10 attempts")
- import time
- main.case("Bringing Link up... ")
- result = main.Mininet1.link(END1=main.params['LINK']['begin'],END2=main.params['LINK']['end'],OPTION="up")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Link UP!",onfail="Link not brought up...")
-
- strtTime = time.time()
- result = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
- for i in range(2):
- if result == main.FALSE:
- time.sleep(5)
- result = main.ONOS1.check_status_report(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
- else:
- break
-
- strtTime = time.time()
- count = 1
- i = 6
- while i < 16 :
- main.log.info("\n\t\t\t\th"+str(i)+" IS PINGING h"+str(i+25) )
- ping = main.Mininet1.pingHost(src="h"+str(i),target="h"+str(i+25))
- if ping == main.FALSE and count < 10:
- count = count + 1
- main.log.info("Ping failed, making attempt number "+str(count)+" in 2 seconds")
- i = 6
- time.sleep(2)
- elif ping == main.FALSE and count ==10:
- main.log.error("Ping test failed")
- i = 17
- result = main.FALSE
- elif ping == main.TRUE:
- i = i + 1
- result = main.TRUE
- endTime = time.time()
- if result == main.TRUE:
- main.log.report("\tTime to complete ping test: "+str(round(endTime-strtTime,2))+" seconds")
- else:
- main.log.report("\tPING TESTS FAILED")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="NO PACKET LOSS, HOST IS REACHABLE",onfail="PACKET LOST, HOST IS NOT REACHABLE")
-
-
-# ******************************************************************************************************************************************************************
-# Test Device Discovery function by yanking s6:s6-eth0 interface and re-plug it into a switch
-
- def CASE21(self,main) :
- import json
- from drivers.common.api.onosrestapidriver import *
- main.log.report("Test device discovery function, by attach, detach, move host h1 from s1->s6->s1. Per mininet naming, switch port the host attaches will remain as 's1-eth1' throughout the test.")
- main.log.report("Check initially hostMAC/IP exist on the mininet...")
- host = main.params['YANK']['hostname']
- mac = main.params['YANK']['hostmac']
- hostip = main.params['YANK']['hostip']
- RestIP1 = main.params['RESTCALL']['restIP1']
- RestPort = main.params['RESTCALL']['restPort']
- url = main.params['RESTCALL']['restURL']
-
- t_topowait = 0
- t_restwait = 10
- main.log.report( "Wait time from topo change to ping set to " + str(t_topowait))
- main.log.report( "Wait time from ping to rest call set to " + str(t_restwait))
- #print "host=" + host + "; RestIP=" + RestIP1 + "; RestPort=" + str(RestPort)
- time.sleep(t_topowait)
- main.log.info("\n\t\t\t\t ping issue one ping from" + str(host) + "to generate arp to switch. Ping result is not important" )
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- time.sleep(t_restwait)
- restcall = OnosRestApiDriver()
- Reststatus, Switch, Port, MAC = restcall.find_host(RestIP1,RestPort,url, hostip)
- main.log.report("Number of host with IP=10.0.0.1 found by ONOS is: " + str(Reststatus))
- if Reststatus == 1:
- main.log.report("\t PASSED - Found host IP = " + hostip + "; MAC = " + "".join(MAC) + "; attached to switchDPID = " + "".join(Switch) + "; at port = " + "".join(Port))
- result1 = main.TRUE
- elif Reststatus > 1:
- main.log.report("\t FAILED - Host " + host + " with MAC:" + mac + " has " + str(Reststatus) + " duplicated IP addresses. FAILED")
- main.log.report("switches are: " + "; ".join(Switch))
- main.log.report("Ports are: " + "; ".join(Port))
- main.log.report("MACs are: " + "; ".join(MAC))
- result1 = main.FALSE
- else:
- main.log.report("\t FAILED - Host " + host + " with MAC:" + mac + " does not exist. FAILED")
- result1 = main.FALSE
-
-
- ##### Step to yank out "s1-eth1" from s1, which is on autoONOS1 #####
-
- main.log.report("Yank out s1-eth1")
- main.case("Yankout s6-eth1 (link to h1) from s1")
- result = main.Mininet1.yank(SW=main.params['YANK']['sw1'],INTF=main.params['YANK']['intf'])
- time.sleep(t_topowait)
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Yank command suceeded",onfail="Yank command failed...")
-
- main.log.info("\n\t\t\t\t ping issue one ping from" + str(host) + "to generate arp to switch. Ping result is not important" )
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- time.sleep(t_restwait)
- restcall = OnosRestApiDriver()
- Reststatus, Switch, Port, MAC = restcall.find_host(RestIP1,RestPort,url, hostip)
-
- main.log.report("Number of host with IP=10.0.0.1 found by ONOS is: " + str(Reststatus))
- if Reststatus == 1:
- main.log.report("\tFAILED - Found host IP = " + hostip + "; MAC = " + "".join(MAC) + "; attached to switchDPID = " + "".join(Switch) + "; at port = " + "".join(Port))
- result2 = main.FALSE
- elif Reststatus > 1:
- main.log.report("\t FAILED - Host " + host + " with MAC:" + str(mac) + " has " + str(Reststatus) + " duplicated IP addresses. FAILED")
- main.log.report("switches are: " + "; ".join(Switch))
- main.log.report("Ports are: " + "; ".join(Port))
- main.log.report("MACs are: " + "; ".join(MAC))
- result2 = main.FALSE
- else:
- main.log.report("\t PASSED - Host " + host + " with MAC:" + str(mac) + " does not exist. PASSED - host is not supposed to be attached to the switch.")
- result2 = main.TRUE
-
- ##### Step to plug "s1-eth1" to s6, which is on autoONOS3 ######
- main.log.report("Plug s1-eth1 into s6")
- main.case("Plug s1-eth1 to s6")
- result = main.Mininet1.plug(SW=main.params['PLUG']['sw6'],INTF=main.params['PLUG']['intf'])
- time.sleep(t_topowait)
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Plug command suceeded",onfail="Plug command failed...")
- main.log.info("\n\t\t\t\t ping issue one ping from" + str(host) + "to generate arp to switch. Ping result is not important" )
-
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- time.sleep(t_restwait)
- restcall = OnosRestApiDriver()
- Reststatus, Switch, Port, MAC = restcall.find_host(RestIP1,RestPort,url, hostip)
-
- main.log.report("Number of host with IP=10.0.0.1 found by ONOS is: " + str(Reststatus))
- if Reststatus == 1:
- main.log.report("\tPASSED - Found host IP = " + hostip + "; MAC = " + "".join(MAC) + "; attached to switchDPID = " + "".join(Switch) + "; at port = " + "".join(Port))
- result3 = main.TRUE
- elif Reststatus > 1:
- main.log.report("\t FAILED - Host " + host + " with MAC:" + str(mac) + " has " + str(Reststatus) + " duplicated IP addresses. FAILED")
- main.log.report("switches are: " + "; ".join(Switch))
- main.log.report("Ports are: " + "; ".join(Port))
- main.log.report("MACs are: " + "; ".join(MAC))
- result3 = main.FALSE
- else:
- main.log.report("\t FAILED - Host " + host + " with MAC:" + str(mac) + " does not exist. FAILED")
- result3 = main.FALSE
-
- ###### Step to put interface "s1-eth1" back to s1"#####
- main.log.report("Move s1-eth1 back on to s1")
- main.case("Move s1-eth1 back to s1")
- result = main.Mininet1.yank(SW=main.params['YANK']['sw6'],INTF=main.params['YANK']['intf'])
- time.sleep(t_topowait)
- retult = main.Mininet1.plug(SW=main.params['PLUG']['sw1'],INTF=main.params['PLUG']['intf'])
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Yank/Plug command suceeded",onfail="Yank/Plug command failed...")
- main.log.info("\n\t\t\t\t ping issue one ping from" + str(host) + "to generate arp to switch. Ping result is not important" )
-
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- time.sleep(t_restwait)
- restcall = OnosRestApiDriver()
- Reststatus, Switch, Port, MAC = restcall.find_host(RestIP1,RestPort,url, hostip)
-
- main.log.report("Number of host with IP=10.0.0.1 found by ONOS is: " + str(Reststatus))
- if Reststatus == 1:
- main.log.report("\tPASSED - Found host IP = " + hostip + "; MAC = " + "".join(MAC) + "; attached to switchDPID = " + "".join(Switch) + "; at port = " + "".join(Port))
- result4 = main.TRUE
- elif Reststatus > 1:
- main.log.report("\t FAILED - Host " + host + " with MAC:" + str(mac) + " has " + str(Reststatuas) + " duplicated IP addresses. FAILED")
- main.log.report("switches are: " + "; ".join(Switch))
- main.log.report("Ports are: " + "; ".join(Port))
- main.log.report("MACs are: " + "; ".join(MAC))
- result4 = main.FALSE
- else:
- main.log.report("\t FAILED -Host " + host + " with MAC:" + str(mac) + " does not exist. FAILED")
- result4 = main.FALSE
-
- result = result1 and result2 and result3 and result4
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="DEVICE DISCOVERY TEST PASSED PLUG/UNPLUG/MOVE TEST",onfail="DEVICE DISCOVERY TEST FAILED")
-
-
diff --git a/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.topo b/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.topo
deleted file mode 100644
index 56ba3cf..0000000
--- a/TestON/tests/JamesTest/OnosSanity4nodes/OnosSanity4nodes.topo
+++ /dev/null
@@ -1,139 +0,0 @@
-<TOPOLOGY>
-
- <COMPONENT>
- <Zookeeper1>
- <host>10.128.100.1</host>
- <user>admin</user>
- <password></password>
- <type>ZookeeperCliDriver</type>
- <connect_order>1</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Zookeeper1>
-
- <Zookeeper2>
- <host>10.128.100.4</host>
- <user>admin</user>
- <password></password>
- <type>ZookeeperCliDriver</type>
- <connect_order>2</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Zookeeper2>
-
- <Zookeeper3>
- <host>10.128.100.5</host>
- <user>admin</user>
- <password></password>
- <type>ZookeeperCliDriver</type>
- <connect_order>3</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Zookeeper3>
-
- <Zookeeper4>
- <host>10.128.100.6</host>
- <user>admin</user>
- <password></password>
- <type>ZookeeperCliDriver</type>
- <connect_order>4</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Zookeeper4>
-
- <Cassandra1>
- <host>10.128.100.1</host>
- <user>admin</user>
- <password></password>
- <type>CassandraCliDriver</type>
- <connect_order>5</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Cassandra1>
-
- <Cassandra2>
- <host>10.128.100.4</host>
- <user>admin</user>
- <password></password>
- <type>CassandraCliDriver</type>
- <connect_order>6</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Cassandra2>
-
- <Cassandra3>
- <host>10.128.100.5</host>
- <user>admin</user>
- <password></password>
- <type>CassandraCliDriver</type>
- <connect_order>7</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Cassandra3>
-
- <Cassandra4>
- <host>10.128.100.6</host>
- <user>admin</user>
- <password></password>
- <type>CassandraCliDriver</type>
- <connect_order>8</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Cassandra4>
-
- <ONOS1>
- <host>10.128.100.1</host>
- <user>admin</user>
- <password></password>
- <type>OnosCliDriver</type>
- <connect_order>9</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </ONOS1>
-
- <ONOS2>
- <host>10.128.100.4</host>
- <user>admin</user>
- <password></password>
- <type>OnosCliDriver</type>
- <connect_order>10</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </ONOS2>
-
- <ONOS3>
- <host>10.128.100.5</host>
- <user>admin</user>
- <password></password>
- <type>OnosCliDriver</type>
- <connect_order>11</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </ONOS3>
-
- <ONOS4>
- <host>10.128.100.6</host>
- <user>admin</user>
- <password></password>
- <type>OnosCliDriver</type>
- <connect_order>12</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </ONOS4>
-
- <Mininet1>
- <host>10.128.100.11</host>
- <user>admin</user>
- <password></password>
- <type>MininetCliDriver</type>
- <connect_order>13</connect_order>
- <COMPONENTS>
- # Specify the Option for mininet
- <arg1> --custom ~/mininet/custom/topo-onos4node.py </arg1>
- <arg2> --topo mytopo </arg2>
- <controller> remote </controller>
- </COMPONENTS>
- </Mininet1>
-
- </COMPONENT>
-</TOPOLOGY>
diff --git a/TestON/tests/JamesTest/OnosSanity4nodes/__init__.py b/TestON/tests/JamesTest/OnosSanity4nodes/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/TestON/tests/JamesTest/OnosSanity4nodes/__init__.py
+++ /dev/null
diff --git a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
index a0df7b5..38a754e 100644
--- a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
+++ b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
@@ -28,6 +28,8 @@
main.RamCloud4.del_db()
main.step("Start tcpdump on mn")
main.Mininet1.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
+# main.step("Start tcpdump on mn")
+# main.Mininet1.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
main.step("Starting ONOS")
main.ONOS1.start_all()
main.ONOS2.start_all()
diff --git a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
index 4e3c5e1..243eeac 100644
--- a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
+++ b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
@@ -25,6 +25,8 @@
main.RamCloud4.stop_serv()
main.step("Start tcpdump on mn")
main.Mininet1.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
+# main.step("Start tcpdump on mn")
+# main.Mininet1.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
main.step("Starting ONOS")
main.Zookeeper1.start()
main.Zookeeper2.start()
diff --git a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
index 0d6bd0a..be801e6 100644
--- a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
+++ b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
@@ -21,6 +21,8 @@
main.ONOS4.stop_all()
main.step("Start tcpdump on mn")
main.Mininet1.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
+# main.step("Start tcpdump on mn")
+# main.Mininet1.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
main.step("start ONOS")
main.Zookeeper1.start()
main.Zookeeper2.start()