Refactor ONOS Drivers
Changes include:
Include component handle in log messages
Replace carriage returns with new line characters
Remove static IP addresses and passwords
Add exception handling to prevent TestON crashes
Delete old tests and duplicate files
Onoscli driver
Remove assert from isup()
Parameterize REST port and set default to 8080
Add ONOS home directory, default to ~/ONOS
Merge onosrestapidriver.py into onosclidriver.py
Remove ctrl_one and ctrl_none functions
Improve git_pull() error checking
Parameterize the interface for tcpdump
Print more information in get_version
Parameterize the scp source username and password for add_flow
Remove Link_up and Link_down - see link() in mininet driver
Mininet Driver
assign_sw_controller takes COUNT to indicate how many controllers to assign to a switch - requires change to each test that uses this function to assign more than 1 controller to a switch
remove static password
doubled timeout for cleanup(larger networks can take longer to clean)
Zookeeper Driver
Remove start() call from connect()
add Zookeeper home directory, with default as ~/zookeeper-3.4.5
Cassandra Driver
Improve logic of status function
Check if self is up in isup instead of 4 instances running
diff --git a/TestON/tests/OnosCHO4nodes/OnosCHO4nodes.py b/TestON/tests/OnosCHO4nodes/OnosCHO4nodes.py
index 6eada76..8f30b10 100644
--- a/TestON/tests/OnosCHO4nodes/OnosCHO4nodes.py
+++ b/TestON/tests/OnosCHO4nodes/OnosCHO4nodes.py
@@ -9,6 +9,10 @@
#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.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
main.ONOS1.stop()
main.ONOS2.stop()
main.ONOS3.stop()
@@ -95,22 +99,22 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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.assign_sw_controller(sw=str(j),count=4,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")
for i in range(9):
@@ -255,10 +259,10 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
@@ -395,7 +399,6 @@
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.")
main.log.report("Check initially hostMAC exist on the mininet...")
host = main.params['YANK']['hostname']
@@ -408,8 +411,7 @@
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")
- restcall = OnosRestApiDriver()
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
+ Reststatus, Hoststatus =main.ONOS1.find_host(RestIP1,RestPort,url,mac)
try:
attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
ip_found = Hoststatus[0]['ipv4'][0]
@@ -436,7 +438,7 @@
time.sleep(3)
utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Yank command suceeded",onfail="Yank command failed...")
ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
+ Reststatus, Hoststatus = main.ONOS1.find_host(RestIP1,RestPort,url,mac)
try:
attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
except:
@@ -455,7 +457,7 @@
time.sleep(3)
utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Plug command suceeded",onfail="Plug command failed...")
ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP2,RestPort,url,mac)
+ Reststatus, Hoststatus =main.ONOS1.find_host(RestIP2,RestPort,url,mac)
try:
attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
ip_found = Hoststatus[0]['ipv4'][0]
@@ -484,7 +486,7 @@
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...")
ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
+ Reststatus, Hoststatus = main.ONOS1.find_host(RestIP1,RestPort,url,mac)
try:
attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
ip_found = Hoststatus[0]['ipv4'][0]
diff --git a/TestON/tests/OnosCHO8nodes/OnosCHO8nodes.py b/TestON/tests/OnosCHO8nodes/OnosCHO8nodes.py
index a183aa3..52089f7 100644
--- a/TestON/tests/OnosCHO8nodes/OnosCHO8nodes.py
+++ b/TestON/tests/OnosCHO8nodes/OnosCHO8nodes.py
@@ -11,6 +11,14 @@
main.log.report("Startup check Zookeeper1, Cassandra1, and ONOS1 connections")
import time
main.case("Checking if the startup was clean...")
+ main.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
+ main.Zookeeper5.start()
+ main.Zookeeper6.start()
+ main.Zookeeper7.start()
+ main.Zookeeper8.start()
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...")
@@ -52,25 +60,25 @@
j=i+1
main.Mininet1.assign_sw_controller(sw="s"+str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'])
time.sleep(3)
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(3)
elif i >= 3 and i < 5:
j=i+1
main.Mininet1.assign_sw_controller(sw="s"+str(j),ip1=main.params['CTRL']['ip2'],port1=main.params['CTRL']['port2'])
time.sleep(3)
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(3)
elif i >= 5 and i < 15:
j=i+1
main.Mininet1.assign_sw_controller(sw="s"+str(j),ip1=main.params['CTRL']['ip3'],port1=main.params['CTRL']['port3'])
time.sleep(3)
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(3)
else:
j=i+16
main.Mininet1.assign_sw_controller(sw="s"+str(j),ip1=main.params['CTRL']['ip4'],port1=main.params['CTRL']['port4'])
time.sleep(3)
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(3)
main.Mininet1.get_sw_controller("s1")
@@ -165,11 +173,11 @@
for i in range(25):
if i < 15:
j=i+1
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(3)
else:
j=i+16
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(3)
strtTime = time.time()
count = 1
diff --git a/TestON/tests/OnosDD_PARP/.OnosSanity4nodes.py.swn b/TestON/tests/OnosDD_PARP/.OnosSanity4nodes.py.swn
deleted file mode 100644
index cb578ac..0000000
--- a/TestON/tests/OnosDD_PARP/.OnosSanity4nodes.py.swn
+++ /dev/null
Binary files differ
diff --git a/TestON/tests/OnosDD_PARP/.OnosSanity4nodes.py.swo b/TestON/tests/OnosDD_PARP/.OnosSanity4nodes.py.swo
deleted file mode 100644
index 5389b47..0000000
--- a/TestON/tests/OnosDD_PARP/.OnosSanity4nodes.py.swo
+++ /dev/null
Binary files differ
diff --git a/TestON/tests/OnosDD_PARP/OnosDD_PARP.params b/TestON/tests/OnosDD_PARP/OnosDD_PARP.params
deleted file mode 100644
index 03e9886..0000000
--- a/TestON/tests/OnosDD_PARP/OnosDD_PARP.params
+++ /dev/null
@@ -1,45 +0,0 @@
-<PARAMS>
- <testcases>1,2,21,3</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>
- <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>
- <RESTCALL>
- <restIP1>10.128.100.1</restIP1>
- <restIP2>10.128.100.5</restIP2>
- <restPort>8080</restPort>
- <restURL>/wm/device/</restURL>
- </RESTCALL>
-</PARAMS>
diff --git a/TestON/tests/OnosDD_PARP/OnosDD_PARP.py b/TestON/tests/OnosDD_PARP/OnosDD_PARP.py
deleted file mode 100644
index 01c1169..0000000
--- a/TestON/tests/OnosDD_PARP/OnosDD_PARP.py
+++ /dev/null
@@ -1,378 +0,0 @@
-
-class OnosDD_PARP :
-
- 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.ONOS1.drop_keyspace()
- main.ONOS1.start()
- time.sleep(10)
- main.ONOS2.start()
- main.ONOS3.start()
- main.ONOS4.start()
- 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()
- 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'])
- time.sleep(1)
- 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'])
- time.sleep(1)
- 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'])
- time.sleep(1)
- 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'])
- time.sleep(1)
- 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")
- time.sleep(5)
- strtTime = time.time()
- main.ONOS1.add_flow(main.params['FLOWDEF'])
- main.case("Checking flows")
- tmp = main.FALSE
- count = 1
- main.log.info("Wait for flows to settle, then check")
- while tmp == main.FALSE:
- main.step("Waiting")
- time.sleep(10)
- main.step("Checking")
- tmp = main.ONOS1.check_flow()
- if tmp == main.FALSE and count < 6:
- count = count + 1
- main.log.report("Flow failed, waiting 10 seconds then making attempt number "+str(count))
- elif tmp == main.FALSE and count == 6:
- result = main.FALSE
- break
- else:
- result = main.TRUE
- break
- endTime = time.time()
- if result == main.TRUE:
- main.log.report("\n\t\t\t\tTime to add flows: "+str(round(endTime-strtTime,2))+" seconds")
- else:
- main.log.report("\tFlows failed check")
- 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 10 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 3 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
- time.sleep(1)
- else:
- j=i+16
- main.Mininet1.assign_sw_controller(sw=str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'])
- time.sleep(1)
- 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 < 3:
- count = count + 1
- i = 6
- main.log.info("Ping failed, making attempt number "+str(count)+" in 10 seconds")
- time.sleep(10)
- elif ping == main.FALSE and count ==3:
- 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 3 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'])
- time.sleep(1)
- 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'])
- time.sleep(1)
- 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 < 3:
- count = count + 1
- i = 6
- main.log.info("Ping failed, making attempt number "+str(count)+" in 10 seconds")
- time.sleep(10)
- elif ping == main.FALSE and count ==3:
- 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, wait 20 seconds, then ping until all hosts are reachable or fail after 3 attempts")
- import time
- main.case("Bringing Link down... ")
- result = main.Mininet1.link(END1=main.params['LINK']['begin'],END2=main.params['LINK']['end'],OPTION="down")
- time.sleep(20)
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Link DOWN!",onfail="Link not brought down...")
- 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 < 3:
- count = count + 1
- main.log.info("Ping failed, making attempt number "+str(count)+" in 10 seconds")
- i = 6
- time.sleep(10)
- elif ping == main.FALSE and count ==3:
- 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, wait 20 seconds, then ping until all hosts are reachable or fail after 3 attempts")
- import time
- main.case("Bringing Link up... ")
- result = main.Mininet1.link(END1=main.params['LINK']['begin'],END2=main.params['LINK']['end'],OPTION="up")
- time.sleep(20)
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Link UP!",onfail="Link not brought up...")
- 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 < 3:
- count = count + 1
- main.log.info("Ping failed, making attempt number "+str(count)+" in 10 seconds")
- i = 6
- time.sleep(10)
- elif ping == main.FALSE and count ==3:
- 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.")
- main.log.report("Check initially hostMAC exist on the mininet...")
- host = main.params['YANK']['hostname']
- mac = main.params['YANK']['hostmac']
- RestIP1 = main.params['RESTCALL']['restIP1']
- RestIP2 = main.params['RESTCALL']['restIP2']
- RestPort = main.params['RESTCALL']['restPort']
- url = main.params['RESTCALL']['restURL']
- #print "host=" + host + "; RestIP=" + RestIP1 + "; RestPort=" + str(RestPort)
-
- 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")
- restcall = OnosRestApiDriver()
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
- try:
- attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
- except IndexError:
- Reststatus = 0
- if Reststatus == 1:
- main.log.report("\tFound host " + host + " attached to switchDPID = " + attachedSW)
- result = main.TRUE
- else:
- main.log.report("\t Host " + host + " with MAC:" + str(mac) + " does not exist. FAILED")
- result = 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(3)
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Yank command suceeded",onfail="Yank command failed...")
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
- try:
- attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
- except IndexError:
- Reststatus = 0
- if Reststatus == 0:
- main.log.report("Attemp to yank out s1-eth1 from s1 sucessfully")
- result = main.TRUE
- else:
- main.log.report("Attemp to yank out s1-eht1 from s1 failed.")
- result = main.FALSE
-
- ##### 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(3)
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Plug command suceeded",onfail="Plug command failed...")
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP2,RestPort,url,mac)
- try:
- attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
- except IndexError:
- Reststatus = 0
- if Reststatus == 0:
- main.log.report("Attemp to plug s1-eth1 to s6 FAILED")
- result = main.FALSE
- elif attachedSW == "00:00:00:00:00:00:00:06":
- main.log.report("Attemp to plug s1-eht1 to s6 succeded.")
- result = main.TRUE
- else:
- main.log.report( "FAILED to attach s1-eth1 to s6 correctly!")
- result = 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(3)
- 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...")
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
- try:
- attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
- except IndexError:
- Reststatus = 0
- if Reststatus == 0:
- main.log.report("Attemp to plug s1-eth1 back to s1 FAILED")
- result = main.FALSE
- elif attachedSW == "00:00:00:00:00:00:00:01":
- main.log.report("Attemp to plug s1-eht1 back to s1 succeded.")
- result = main.TRUE
- else:
- main.log.report( "FAIL to attach s1-eth1 to s1 correctly!")
- result = main.FALSE
-
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="DEVICE DISCOVERY TEST PASSED PLUG/UNPLUG/MOVE TEST",onfail="DIVICE DISCOVERY TEST FAILED")
-
diff --git a/TestON/tests/OnosDD_PARP/OnosDD_PARP.topo b/TestON/tests/OnosDD_PARP/OnosDD_PARP.topo
deleted file mode 100644
index 0c77a3b..0000000
--- a/TestON/tests/OnosDD_PARP/OnosDD_PARP.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/OnosDD_PARP/__init__.py b/TestON/tests/OnosDD_PARP/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/TestON/tests/OnosDD_PARP/__init__.py
+++ /dev/null
diff --git a/TestON/tests/OnosPerf4nodes/OnosPerf4nodes.py b/TestON/tests/OnosPerf4nodes/OnosPerf4nodes.py
index dcc2162..0557929 100644
--- a/TestON/tests/OnosPerf4nodes/OnosPerf4nodes.py
+++ b/TestON/tests/OnosPerf4nodes/OnosPerf4nodes.py
@@ -98,22 +98,22 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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.assign_sw_controller(sw=str(j),count=4,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")
time.sleep(5)
diff --git a/TestON/tests/OnosPerfTest/OnosPerfTest.py b/TestON/tests/OnosPerfTest/OnosPerfTest.py
index 70a3955..a5e95bd 100644
--- a/TestON/tests/OnosPerfTest/OnosPerfTest.py
+++ b/TestON/tests/OnosPerfTest/OnosPerfTest.py
@@ -78,22 +78,22 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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.assign_sw_controller(sw=str(j),count=4,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")
def CASE3(self,main) :
diff --git a/TestON/tests/OnosPerfTest/OnosPerfTest.topo b/TestON/tests/OnosPerfTest/OnosPerfTest.topo
index eb6130f..d7bf736 100644
--- a/TestON/tests/OnosPerfTest/OnosPerfTest.topo
+++ b/TestON/tests/OnosPerfTest/OnosPerfTest.topo
@@ -3,7 +3,7 @@
<Zookeeper1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
</Zookeeper1>
@@ -11,28 +11,28 @@
<Cassandra1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>2</connect_order>
</Cassandra1>
<Cassandra2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>3</connect_order>
</Cassandra2>
<Cassandra3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>4</connect_order>
</Cassandra3>
<Cassandra4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>5</connect_order>
</Cassandra4>
@@ -40,28 +40,28 @@
<ONOS1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
</ONOS1>
<ONOS2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
</ONOS2>
<ONOS3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
</ONOS3>
<ONOS4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
</ONOS4>
@@ -69,7 +69,7 @@
<Mininet1>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>10</connect_order>
<COMPONENTS>
@@ -83,14 +83,14 @@
<Mininet4>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>11</connect_order>
</Mininet4>
<Mininet8>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>12</connect_order>
</Mininet8>
diff --git a/TestON/tests/OnosSanity/OnosSanity.params b/TestON/tests/OnosSanity/OnosSanity.params
deleted file mode 100644
index 85b626a..0000000
--- a/TestON/tests/OnosSanity/OnosSanity.params
+++ /dev/null
@@ -1,17 +0,0 @@
-<PARAMS>
- <testcases>1</testcases>
- <FLOWDEF>~/tmp</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>
-</PARAMS>
diff --git a/TestON/tests/OnosSanity/OnosSanity.py b/TestON/tests/OnosSanity/OnosSanity.py
deleted file mode 100644
index baaec06..0000000
--- a/TestON/tests/OnosSanity/OnosSanity.py
+++ /dev/null
@@ -1,130 +0,0 @@
-
-class OnosSanity :
-
- def __init__(self) :
- self.default = ''
-
- def CASE1(self,main) :
- import time
- 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()
- 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.info("Something is funny... restarting ONOS")
- main.ONOS1.stop()
- time.sleep(3)
- main.ONOS1.start()
- time.sleep(5)
- data = main.ONOS1.isup()
- main.log.info("\n\n\t\t\t\t ONOS VERSION")
- main.ONOS1.get_version()
- main.log.info("\n\n")
- utilities.assert_equals(expect=main.TRUE,actual=data,onpass="ONOS is up and running!",onfail="ONOS didn't start...")
-
- def CASE2(self,main) :
- 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")
-
- def CASE3(self,main) :
- import time
- main.case("Taking care of these flows!")
- main.step("Cleaning out any leftover flows...")
- main.ONOS1.delete_flow("all")
- time.sleep(5)
- strtTime = time.time()
- main.ONOS1.add_flow(main.params['FLOWDEF'])
- main.case("Checking flows")
- result = main.FALSE
- count = 1
- main.log.info("Wait for flows to settle, then check")
- while result == main.FALSE:
- main.step("Waiting")
- time.sleep(10)
- main.step("Checking")
- result = main.ONOS1.check_flow()
- if result== main.FALSE and count < 6:
- count = count + 1
- main.log.info("Flow failed, waiting 10 seconds then making attempt number "+str(count))
- elif result == main.FALSE and count == 6:
- success = main.FALSE
- break
- else:
- success = main.TRUE
- break
- endTime = time.time()
- main.log.info("\n\t\t\t\tTime to add flows: "+str(endTime-strtTime)+" seconds")
- utilities.assert_equals(expect=main.TRUE,actual=success,onpass="Flow check PASS",onfail="Flow check FAIL")
- #time.sleep(10)
- #data = main.ONOS1.get_flow("all")
-
- def CASE4(self,main) :
- main.case("Testing ping...")
- ping_result = main.Mininet1.pingHost(src=main.params['PING']['source1'],target=main.params['PING']['target1'])
- utilities.assert_equals(expect=main.TRUE,actual=ping_result,onpass="NO PACKET LOSS, HOST IS REACHABLE",onfail="PACKET LOST, HOST IS NOT REACHABLE")
-
- def CASE5(self,main) :
- 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...")
- time.sleep(10)
-
- def CASE6(self,main) :
- import time
- main.case("Checking flows")
- result = main.FALSE
- count = 1
- main.log.info("Wait for flows to settle, then check")
- while result == main.FALSE:
- main.step("Waiting")
- time.sleep(10)
- main.step("Checking")
- result = main.ONOS1.check_flow()
- if result== main.FALSE and count < 6:
- count = count + 1
- main.log.info("Flow failed, waiting 10 seconds then making attempt number "+str(count))
- elif result == main.FALSE and count == 6:
- success = main.FALSE
- break
- else:
- success = main.TRUE
- break
- utilities.assert_equals(expect=main.TRUE,actual=success,onpass="Flow check PASS",onfail="Flow check FAIL")
-
- def CASE7(self,main) :
- main.case("Pinging EVERYTHINGGG!!!")
- import time
- strtTime = time.time()
- result = main.TRUE
- exit = main.FALSE
- count = 1
- while 1:
- for i in range(6, 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
- main.log.info("Ping failed, making attempt number "+str(count)+" in 10 seconds")
- time.sleep(10)
- break
- elif ping == main.FALSE and count ==6:
- main.log.error("Ping test failed")
- exit = main.TRUE
- break
- elif ping == main.TRUE:
- exit = main.TRUE
- if exit == main.TRUE:
- endTime = time.time()
- break
- main.log.info("\n\t\t\t\tTime to complete ping test: "+str(endTime-strtTime)+" seconds")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="NO PACKET LOSS, HOST IS REACHABLE",onfail="PACKET LOST, HOST IS NOT REACHABLE")
-
diff --git a/TestON/tests/OnosSanity/OnosSanity.topo b/TestON/tests/OnosSanity/OnosSanity.topo
deleted file mode 100644
index 1ee0ac3..0000000
--- a/TestON/tests/OnosSanity/OnosSanity.topo
+++ /dev/null
@@ -1,50 +0,0 @@
-<TOPOLOGY>
-
- <COMPONENT>
- <Zookeeper1>
- <host>10.128.4.26</host>
- <user>admin</user>
- <password></password>
- <type>ZookeeperCliDriver</type>
- <connect_order>1</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Zookeeper1>
-
- <Cassandra1>
- <host>10.128.4.26</host>
- <user>admin</user>
- <password></password>
- <type>CassandraCliDriver</type>
- <connect_order>2</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Cassandra1>
-
- <ONOS1>
- <host>10.128.4.26</host>
- <user>admin</user>
- <password></password>
- <type>OnosCliDriver</type>
- <connect_order>3</connect_order>
- <COMPONENTS>
-
- </COMPONENTS>
- </ONOS1>
-
- <Mininet1>
- <host>10.128.4.26</host>
- <user>admin</user>
- <password></password>
- <type>MininetCliDriver</type>
- <connect_order>4</connect_order>
- <COMPONENTS>
- # Specify the Option for mininet
- <arg1> --custom ~/mininet/custom/topo-2sw-2host.py </arg1>
- <arg2> --topo mytopo</arg2>
- <controller> remote </controller>
- </COMPONENTS>
- </Mininet1>
-
- </COMPONENT>
-</TOPOLOGY>
diff --git a/TestON/tests/OnosSanity/OnosSanity.topo.back b/TestON/tests/OnosSanity/OnosSanity.topo.back
deleted file mode 100644
index 9561597..0000000
--- a/TestON/tests/OnosSanity/OnosSanity.topo.back
+++ /dev/null
@@ -1,42 +0,0 @@
-<TOPOLOGY>
-
- <COMPONENT>
- <Zookeeper1>
- <host>10.128.4.26</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>ZookeeperCliDriver</type>
- <COMPONENTS>
- </COMPONENTS>
- </Zookeeper1>
- <Cassandra1>
- <host>10.128.4.26</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>CassandraCliDriver</type>
- <COMPONENTS>
- </COMPONENTS>
- </Cassandra1>
- <ONOS1>
- <host>10.128.4.26</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosCliDriver</type>
- <COMPONENTS>
-
- </COMPONENTS>
- </ONOS1>
-
-
- <ONOSRESTAPI1>
- <host>10.128.4.26</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosRestApiDriver</type>
- <COMPONENTS>
- <topology_url>http://10.128.4.26:9000/topology</topology_url>
- </COMPONENTS>
- </ONOSRESTAPI1>
-
- </COMPONENT>
-</TOPOLOGY>
diff --git a/TestON/tests/OnosSanity/__init__.py b/TestON/tests/OnosSanity/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/TestON/tests/OnosSanity/__init__.py
+++ /dev/null
diff --git a/TestON/tests/OnosSanity4ARP/OnosSanity4ARP.py b/TestON/tests/OnosSanity4ARP/OnosSanity4ARP.py
index 1f50245..e9049c7 100644
--- a/TestON/tests/OnosSanity4ARP/OnosSanity4ARP.py
+++ b/TestON/tests/OnosSanity4ARP/OnosSanity4ARP.py
@@ -9,6 +9,10 @@
#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.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
main.log.report("Pulling latest code from github to all nodes")
main.ONOS1.git_pull()
main.ONOS2.git_pull()
@@ -83,22 +87,22 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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.assign_sw_controller(sw=str(j),count=4,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")
# **********************************************************************************************************************************************************************************************
@@ -202,10 +206,10 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
diff --git a/TestON/tests/OnosSanity4ARP/OnosSanity4node_testDD.py b/TestON/tests/OnosSanity4ARP/OnosSanity4node_testDD.py
index a0c9f98..d6192fb 100644
--- a/TestON/tests/OnosSanity4ARP/OnosSanity4node_testDD.py
+++ b/TestON/tests/OnosSanity4ARP/OnosSanity4node_testDD.py
@@ -9,6 +9,10 @@
#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.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
main.log.report("Pulling latest code from github to all nodes")
main.ONOS1.git_pull()
main.ONOS2.git_pull()
@@ -83,22 +87,22 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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.assign_sw_controller(sw=str(j),count=4,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")
# **********************************************************************************************************************************************************************************************
@@ -226,10 +230,10 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
diff --git a/TestON/tests/OnosSanity4nodes.tar.gz b/TestON/tests/OnosSanity4nodes.tar.gz
deleted file mode 100644
index 197f5a3..0000000
--- a/TestON/tests/OnosSanity4nodes.tar.gz
+++ /dev/null
Binary files differ
diff --git a/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.py b/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.py
index 3b5397b..0a757a6 100644
--- a/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.py
+++ b/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.py
@@ -9,6 +9,10 @@
#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.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
main.log.report("Pulling latest code from github to all nodes")
main.ONOS1.git_pull()
main.ONOS2.git_pull()
@@ -87,22 +91,22 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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.assign_sw_controller(sw=str(j),count=4,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")
# **********************************************************************************************************************************************************************************************
@@ -206,10 +210,10 @@
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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
+ main.Mininet1.assign_sw_controller(sw=str(j),count=4,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'])
@@ -337,7 +341,6 @@
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']
@@ -356,8 +359,7 @@
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)
+ Reststatus, Switch, Port, MAC = main.ONOS1.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))
@@ -376,7 +378,7 @@
##### 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")
+ main.step("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...")
@@ -384,8 +386,7 @@
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)
+ Reststatus, Switch, Port, MAC = main.ONOS1.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:
@@ -403,7 +404,7 @@
##### 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")
+ main.step("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...")
@@ -411,8 +412,7 @@
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)
+ Reststatus, Switch, Port, MAC = main.ONOS1.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:
@@ -430,17 +430,16 @@
###### 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")
+ main.step("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'])
+ result = 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)
+ Reststatus, Switch, Port, MAC = main.ONOS1.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:
diff --git a/TestON/tests/OnosSanity8nodes/OnosSanity8nodes.py b/TestON/tests/OnosSanity8nodes/OnosSanity8nodes.py
index f849aaf..b5afc02 100644
--- a/TestON/tests/OnosSanity8nodes/OnosSanity8nodes.py
+++ b/TestON/tests/OnosSanity8nodes/OnosSanity8nodes.py
@@ -10,6 +10,14 @@
def CASE1(self,main) : #Check to be sure ZK, Cass, and ONOS are up, then get ONOS version
main.log.report("Startup check Zookeeper1, Cassandra1, and ONOS1 connections")
import time
+ main.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
+ main.Zookeeper5.start()
+ main.Zookeeper6.start()
+ main.Zookeeper7.start()
+ main.Zookeeper8.start()
main.case("Checking if the startup was clean...")
main.step("Testing startup Zookeeper")
data = main.Zookeeper1.isup()
@@ -52,25 +60,25 @@
j=i+1
main.Mininet1.assign_sw_controller(sw="s"+str(j),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'])
time.sleep(1)
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(1)
elif i >= 3 and i < 5:
j=i+1
main.Mininet1.assign_sw_controller(sw="s"+str(j),ip1=main.params['CTRL']['ip2'],port1=main.params['CTRL']['port2'])
time.sleep(1)
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(1)
elif i >= 5 and i < 15:
j=i+1
main.Mininet1.assign_sw_controller(sw="s"+str(j),ip1=main.params['CTRL']['ip3'],port1=main.params['CTRL']['port3'])
time.sleep(1)
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(1)
else:
j=i+16
main.Mininet1.assign_sw_controller(sw="s"+str(j),ip1=main.params['CTRL']['ip4'],port1=main.params['CTRL']['port4'])
time.sleep(1)
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(1)
main.Mininet1.get_sw_controller("s1")
@@ -165,11 +173,11 @@
for i in range(25):
if i < 15:
j=i+1
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(1)
else:
j=i+16
- main.Mininet1.assign_sw_controller(sw="s"+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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
+ main.Mininet1.assign_sw_controller(sw="s"+str(j),count=8,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'],ip5=main.params['CTRL']['ip5'],port5=main.params['CTRL']['port5'],ip6=main.params['CTRL']['ip6'],port6=main.params['CTRL']['port6'],ip7=main.params['CTRL']['ip7'],port7=main.params['CTRL']['port7'],ip8=main.params['CTRL']['ip8'],port8=main.params['CTRL']['port8'])
time.sleep(1)
strtTime = time.time()
count = 1
diff --git a/TestON/tests/OnosScale4nodes/OnosScale4nodes.py b/TestON/tests/OnosScale4nodes/OnosScale4nodes.py
index 570ae71..bae4b5c 100644
--- a/TestON/tests/OnosScale4nodes/OnosScale4nodes.py
+++ b/TestON/tests/OnosScale4nodes/OnosScale4nodes.py
@@ -12,6 +12,10 @@
The test will only pass if ONOS is running properly, and has a full view of all topology elements.
'''
import time
+ main.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
main.ONOS1.stop()
main.ONOS2.stop()
main.ONOS3.stop()
diff --git a/TestON/tests/OnosTest/OnosTest.ospk b/TestON/tests/OnosTest/OnosTest.ospk
deleted file mode 100644
index 0e46e5c..0000000
--- a/TestON/tests/OnosTest/OnosTest.ospk
+++ /dev/null
@@ -1,23 +0,0 @@
-CASE 1
- NAME "Testing the ONOS sanity"
- STEP "Testing the ONOS sanity"
-
- STORE ON Zookeeper1 DO status IN Zookeeper1_status
- INFO <Zookeeper1_status>
-
- STORE ON Cassandra1 DO status IN Cassandra1_status
- INFO <Cassandra1_status>
-
- STORE ON ONOS1 DO status IN ONOS1_status
- INFO <ONOS1_status>
-
- STORE ON ONOS1 DO rest_status IN ONOS1_rest_status
- INFO <ONOS1_rest_status>
-
- STORE ON ONOSRESTAPI1 DO execute IN Response
- INFO <Response>
-
- ON ONOS1 DO stop
- ON ONOS1 DO rest_stop
- ON Cassandra1 DO stop
- ON Zookeeper1 DO stop
diff --git a/TestON/tests/OnosTest/OnosTest.params b/TestON/tests/OnosTest/OnosTest.params
deleted file mode 100644
index 74cf664..0000000
--- a/TestON/tests/OnosTest/OnosTest.params
+++ /dev/null
@@ -1,5 +0,0 @@
-<PARAMS>
- <testcases>1</testcases>
- <mail>anil4haart@gmail.com</mail>
-
-</PARAMS>
\ No newline at end of file
diff --git a/TestON/tests/OnosTest/OnosTest.py b/TestON/tests/OnosTest/OnosTest.py
deleted file mode 100644
index 758c2a5..0000000
--- a/TestON/tests/OnosTest/OnosTest.py
+++ /dev/null
@@ -1,33 +0,0 @@
-
-class OnosTest :
-
- def __init__(self) :
- self.default = ''
-
- def CASE1(self,main) :
-
- main.case("Testing the ONOS sanity")
- main.step("Testing the ONOS sanity")
-
- Zookeeper1_status = main.Zookeeper1.status()
- main.log.info(Zookeeper1_status)
-
- Cassandra1_status = main.Cassandra1.status()
- main.log.info(Cassandra1_status)
-
- ONOS1_status = main.ONOS1.status()
- if ONOS1_status:
- main.log.info("ONOS is up")
- else:
- main.log.info("ONOS is down")
-
- ONOS1_rest_status = main.ONOS1.rest_status()
- main.log.info(ONOS1_rest_status)
-
- Response = main.ONOSRESTAPI1.execute()
- main.log.info(Response)
-
- main.ONOS1.stop()
- main.ONOS1.rest_stop()
- main.Cassandra1.stop()
- main.Zookeeper1.stop()
diff --git a/TestON/tests/OnosTest/OnosTest.topo b/TestON/tests/OnosTest/OnosTest.topo
deleted file mode 100644
index 36cd588..0000000
--- a/TestON/tests/OnosTest/OnosTest.topo
+++ /dev/null
@@ -1,41 +0,0 @@
-<TOPOLOGY>
-
- <COMPONENT>
- <Zookeeper1>
- <host>10.128.4.7</host>
- <user>admin</user>
- <password>password</password>
- <type>ZookeeperCliDriver</type>
- <connect_order> 1 </connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Zookeeper1>
- <Cassandra1>
- <host>10.128.4.7</host>
- <user>admin</user>
- <password>password</password>
- <type>CassandraCliDriver</type>
- <connect_order> 2 </connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Cassandra1>
- <ONOS1>
- <host>10.128.4.7</host>
- <user>admin</user>
- <password>password</password>
- <type>OnosCliDriver</type>
- <connect_order> 3 </connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </ONOS1>
-
-
- <ONOSRESTAPI1>
- <type>OnosRestApiDriver</type>
- <COMPONENTS>
- <topology_url>http://10.128.4.7:9000/topology</topology_url>
- </COMPONENTS>
- </ONOSRESTAPI1>
-
- </COMPONENT>
-</TOPOLOGY>
\ No newline at end of file
diff --git a/TestON/tests/OnosTest/__init__.py b/TestON/tests/OnosTest/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/TestON/tests/OnosTest/__init__.py
+++ /dev/null
diff --git a/TestON/tests/testDD/.OnosSanity4nodes.py.swn b/TestON/tests/testDD/.OnosSanity4nodes.py.swn
deleted file mode 100644
index cb578ac..0000000
--- a/TestON/tests/testDD/.OnosSanity4nodes.py.swn
+++ /dev/null
Binary files differ
diff --git a/TestON/tests/testDD/.OnosSanity4nodes.py.swo b/TestON/tests/testDD/.OnosSanity4nodes.py.swo
deleted file mode 100644
index 5389b47..0000000
--- a/TestON/tests/testDD/.OnosSanity4nodes.py.swo
+++ /dev/null
Binary files differ
diff --git a/TestON/tests/testDD/__init__.py b/TestON/tests/testDD/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/TestON/tests/testDD/__init__.py
+++ /dev/null
diff --git a/TestON/tests/testDD/testDD.params b/TestON/tests/testDD/testDD.params
deleted file mode 100644
index 9a1732b..0000000
--- a/TestON/tests/testDD/testDD.params
+++ /dev/null
@@ -1,48 +0,0 @@
-<PARAMS>
- <testcases>1,2,21</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>
- <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/device/</restURL>
- </RESTCALL>
-</PARAMS>
diff --git a/TestON/tests/testDD/testDD.py b/TestON/tests/testDD/testDD.py
deleted file mode 100644
index 2a823f9..0000000
--- a/TestON/tests/testDD/testDD.py
+++ /dev/null
@@ -1,472 +0,0 @@
-
-class testDD :
-
- 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")
- time.sleep(5)
- strtTime = time.time()
- main.ONOS1.add_flow(main.params['FLOWDEF'])
- main.case("Checking flows")
- tmp = main.FALSE
- count = 1
- main.log.info("Wait for flows to be pushed to the switches, then check")
- while tmp == main.FALSE:
- main.step("Waiting")
- time.sleep(10)
- main.step("Checking")
- tmp = main.ONOS1.check_flow()
- if tmp == main.FALSE and count < 6:
- count = count + 1
- main.log.report("Flow failed, waiting 10 seconds then making attempt number "+str(count))
- elif tmp == main.FALSE and count == 6:
- result1 = main.FALSE
- break
- else:
- result1 = main.TRUE
- break
- endTime = time.time()
- if result1 == main.TRUE:
- main.log.report("\n\t\t\t\tTime to add flows: "+str(round(endTime-strtTime,2))+" seconds")
- else:
- main.log.report("\tFlows failed check")
-
- 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 < 3:
- count = count + 1
- i = 6
- main.log.info("Ping failed, making attempt number "+str(count)+" in 10 seconds")
- time.sleep(10)
- elif ping == main.FALSE and count ==3:
- main.log.error("Ping test failed")
- i = 17
- result2 = main.FALSE
- elif ping == main.TRUE:
- i = i + 1
- result2 = main.TRUE
- endTime = time.time()
- if result2 == main.TRUE:
- main.log.report("\tTime to complete ping test: "+str(round(endTime-strtTime,2))+" seconds")
- else:
- main.log.report("\tPING TEST FAIL")
-
- result3 = 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=result1 and result2 and result3,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 5 seconds")
- time.sleep(5)
- 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 5 seconds")
- time.sleep(5)
- 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 5 seconds")
- i = 6
- time.sleep(5)
- 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 5 seconds")
- i = 6
- time.sleep(5)
- 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.")
- main.log.report("Check initially hostMAC exist on the mininet...")
- host = main.params['YANK']['hostname']
- mac = main.params['YANK']['hostmac']
- RestIP1 = main.params['RESTCALL']['restIP1']
- RestIP2 = main.params['RESTCALL']['restIP2']
- RestPort = main.params['RESTCALL']['restPort']
- url = main.params['RESTCALL']['restURL']
- #print "host=" + host + "; RestIP=" + RestIP1 + "; RestPort=" + str(RestPort)
-
- 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")
- restcall = OnosRestApiDriver()
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
- try:
- attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
- ip_found = Hoststatus[0]['ipv4'][0]
- except:
- Reststatus = 0
-
- if Reststatus == 1:
- main.log.report("\tFound host " + host + " attached to switchDPID = " + attachedSW)
- if ip_found != None:
- main.log.report("/t IP discovered is ip_found ( " + ip_found + " ).")
- result = main.TRUE
- else:
- main.log.report("/t Found host attached to switch, but no IP address discovered.")
- result = main.FALSE
- else:
- main.log.report("\t Host " + host + " with MAC:" + str(mac) + " does not exist. FAILED")
- result = 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(3)
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Yank command suceeded",onfail="Yank command failed...")
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
- try:
- attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
- except:
- Reststatus = 0
- if Reststatus == 0:
- main.log.report("Attempt to yank out s1-eth1 from s1 sucessfully")
- result = main.TRUE
- else:
- main.log.report("Attempt to yank out s1-eht1 from s1 failed.")
- result = main.FALSE
-
- ##### 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(3)
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Plug command suceeded",onfail="Plug command failed...")
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP2,RestPort,url,mac)
- try:
- attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
- ip_found = Hoststatus[0]['ipv4'][0]
- except:
- Reststatus = 0
- if Reststatus == 0:
- main.log.report("Attempt to plug s1-eth1 to s6 FAILED")
- result = main.FALSE
- elif attachedSW == "00:00:00:00:00:00:00:06":
- main.log.report("Attempt to plug s1-eht1 to s6 succeded.")
- if ip_found != None:
- main.log.report("/t IP discovered is ip_found ( " + ip_found + " ).")
- result = main.TRUE
- else:
- main.log.report("/t Found host attached to switch, but no IP address discovered.")
- result = main.FALSE
- else:
- main.log.report( "FAILED to attach s1-eth1 to s6 correctly!")
- result = 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(3)
- 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...")
- ping = main.Mininet1.pingHost(src = str(host),target = "10.0.0.254")
- Reststatus, Hoststatus = restcall.find_host(RestIP1,RestPort,url,mac)
- try:
- attachedSW = Hoststatus[0]['attachmentPoint'][0]['switchDPID']
- ip_found = Hoststatus[0]['ipv4'][0]
- except:
- Reststatus = 0
- if Reststatus == 0:
- main.log.report("Attempt to plug s1-eth1 back to s1 FAILED")
- result = main.FALSE
- elif attachedSW == "00:00:00:00:00:00:00:01":
- main.log.report("Attempt to plug s1-eht1 back to s1 succeded.")
- if ip_found != None:
- main.log.report("/t IP discovered is ip_found ( " + ip_found + " ).")
- result = main.TRUE
- else:
- main.log.report("/t Found host attached to switch, but no IP address discovered.")
- result = main.FALSE
- else:
- main.log.report( "FAIL to attach s1-eth1 to s1 correctly!")
- result = main.FALSE
-
- 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/testDD/testDD.topo b/TestON/tests/testDD/testDD.topo
deleted file mode 100644
index 0c77a3b..0000000
--- a/TestON/tests/testDD/testDD.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>