Changed from NetworkGraph to Topology and added del_db as function in ramcloud driver
diff --git a/TestON/dependancies/onos.properties.proactive b/TestON/dependancies/onos.properties.proactive
index 1b848b9..2b5150a 100644
--- a/TestON/dependancies/onos.properties.proactive
+++ b/TestON/dependancies/onos.properties.proactive
@@ -1,6 +1,6 @@
floodlight.modules = net.floodlightcontroller.core.FloodlightProvider,\
net.floodlightcontroller.threadpool.ThreadPool,\
-net.onrc.onos.core.topology.NetworkGraphPublisher, \
+net.onrc.onos.core.topology.TopologyPublisher, \
net.onrc.onos.core.datagrid.HazelcastDatagrid,\
net.onrc.onos.core.flowprogrammer.FlowProgrammer,\
net.onrc.onos.core.intent.runtime.PathCalcRuntimeModule,\
diff --git a/TestON/dependancies/onos.properties.reactive b/TestON/dependancies/onos.properties.reactive
index 452156f..8d78222 100644
--- a/TestON/dependancies/onos.properties.reactive
+++ b/TestON/dependancies/onos.properties.reactive
@@ -1,6 +1,6 @@
floodlight.modules = net.floodlightcontroller.core.FloodlightProvider,\
net.floodlightcontroller.threadpool.ThreadPool,\
-net.onrc.onos.core.topology.NetworkGraphPublisher, \
+net.onrc.onos.core.topology.TopologyPublisher, \
net.onrc.onos.core.datagrid.HazelcastDatagrid,\
net.onrc.onos.core.flowprogrammer.FlowProgrammer,\
net.onrc.onos.core.intent.runtime.PathCalcRuntimeModule,\
diff --git a/TestON/drivers/common/cli/ramcloudclidriver.py b/TestON/drivers/common/cli/ramcloudclidriver.py
index 6f13cb5..52f8e7d 100644
--- a/TestON/drivers/common/cli/ramcloudclidriver.py
+++ b/TestON/drivers/common/cli/ramcloudclidriver.py
@@ -184,6 +184,27 @@
else:
main.log.warn(self.name+": RAMCloud is not Running")
return main.FALSE
+
+ def del_db(self):
+ '''
+ This function will clean out the database
+ '''
+ main.log.info(self.name + ": Deleting RC Database")
+ self.handle.sendline("")
+ self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT])
+ self.handle.sendline("cd "+self.home)
+ self.handle.sendline("./onos.sh rc deldb")
+ self.handle.expect(["[y/N]",pexpect.EOF,pexpect.TIMEOUT])
+ self.handle.sendline("y")
+ self.handle.expect(["\$",pexpect.EOF,pexpect.TIMEOUT])
+ response = self.handle.before + self.handle.after
+ main.log.info(response)
+ if re.search("DONE",response):
+ main.log.info("RAMCloud Database Cleaned")
+ return main.TRUE
+ else:
+ main.log.warn("Something wrong in Cleaning Database")
+ return main.FALSE
def stop_coor(self):
diff --git a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
index f8fc498..0b73201 100644
--- a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
+++ b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
@@ -22,9 +22,13 @@
main.RamCloud3.stop_serv()
main.RamCloud4.stop_serv()
main.ONOS1.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS1.handle.sendline("y")
main.ONOS2.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS2.handle.sendline("y")
main.ONOS3.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS3.handle.sendline("y")
main.ONOS4.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS4.handle.sendline("y")
time.sleep(10)
main.RamCloud1.start_coor()
main.RamCloud1.start_serv()
diff --git a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.params b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.params
index b448729..bda33b2 100644
--- a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.params
+++ b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.params
@@ -1,5 +1,5 @@
<PARAMS>
- <testcases>1,2,21,3,31,4,41,5,6,7,3,4,5,6,7</testcases>
+ <testcases>1,2,21,3,31,4,41,5,6,7,3,4,5,6,7,66</testcases>
<FLOWDEF>~/flowdef_files/Center_Triangle/flowdef_20.txt</FLOWDEF>
<CASE1>
<destination>h6</destination>
diff --git a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
index 5ce459f..a05c954 100644
--- a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
+++ b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
@@ -24,14 +24,10 @@
main.RamCloud3.stop_serv()
main.RamCloud4.stop_serv()
time.sleep(10)
- main.ONOS1.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS1.handle.sendline("y")
- main.ONOS2.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS2.handle.sendline("y")
- main.ONOS3.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS3.handle.sendline("y")
- main.ONOS4.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS4.handle.sendline("y")
+ main.RamCloud1.del_db()
+ main.RamCloud2.del_db()
+ main.RamCloud3.del_db()
+ main.RamCloud4.del_db()
time.sleep(10)
main.log.report("Pulling latest code from github to all nodes")
for i in range(2):
diff --git a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
index 531a165..07fd8ff 100644
--- a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
+++ b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
@@ -21,10 +21,14 @@
main.RamCloud2.stop_serv()
main.RamCloud3.stop_serv()
main.RamCloud4.stop_serv()
- main.ONOS1.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS2.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS3.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS4.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS1.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS1.handle.sendline("y")
+ main.ONOS2.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS2.handle.sendline("y")
+ main.ONOS3.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS3.handle.sendline("y")
+ main.ONOS4.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS4.handle.sendline("y")
time.sleep(10)
main.RamCloud1.start_coor()
time.sleep(10)
diff --git a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
index 76020ba..8f64372 100644
--- a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
+++ b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
@@ -29,10 +29,13 @@
main.Zookeeper3.start()
main.Zookeeper4.start()
main.ONOS1.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS1.handle.sendline("y")
main.ONOS2.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS2.handle.sendline("y")
main.ONOS3.handle.sendline("~/ONOS/onos.sh rc deldb")
+ main.ONOS3.handle.sendline("y")
main.ONOS4.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.log.report("Pulling latest code from github to all nodes")
+ main.ONOS4.handle.sendline("y")
for i in range(2):
uptodate = main.ONOS1.git_pull()
main.ONOS2.git_pull()