Made changes to test for continuous ping- James
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index 5c762fb..1bd070f 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -66,15 +66,34 @@
main.log.error("Connection failed to the host "+self.user_name+"@"+self.ip_address)
main.log.error("Failed to connect to the Mininet")
return main.FALSE
-
+
+#*********************************************************************************************
+#*********************************************************************************************
+# checkForLoss will determine if any of the pings had any packets lost during the course of
+# the pingLong.
+#*********************************************************************************************
+#*********************************************************************************************
+
+ def checkForLoss(self, fileName):
+ import os
+ if os.stat(fileName)[6]==0:
+ return main.TRUE
+ pingFile= open(fileName,'r')
+ pingList = pingFile.read()
+
+ if re.search("0% packet loss",pingList):
+ return main.FALSE
+ return main.TRUE
+
+
def pingLong(self,**pingParams):
'''
Starts a continuous ping on the mininet host outputing to a file in the /tmp dir.
'''
- args = utilities.parse_args(["SRC","TARGET"],**pingParams)
+ args = utilities.parse_args(["SRC","TARGET","PINGTIME"],**pingParams)
precmd = "rm /tmp/ping." + args["SRC"]
self.execute(cmd=precmd,prompt="(.*)",timeout=10)
- command = "mininet/util/m " + args["SRC"] + " ping "+args ["TARGET"]+" -i 1 -W 1 > /tmp/ping." + args["SRC"] + " &"
+ command = "mininet/util/m " + args["SRC"] + " ping "+args ["TARGET"]+" -i .2 -w " + str(args['PINGTIME']) + " > /tmp/ping." + args["SRC"] + " &"
main.log.info( command )
self.execute(cmd=command,prompt="(.*)",timeout=10)
return main.TRUE
diff --git a/TestON/tests/JamesTest/JamesTest.params b/TestON/tests/JamesTest/JamesTest.params
index 8f76863..be749b4 100644
--- a/TestON/tests/JamesTest/JamesTest.params
+++ b/TestON/tests/JamesTest/JamesTest.params
@@ -42,6 +42,28 @@
<ip4>10.128.4.154</ip4>
<port4>6633</port4>
</CTRL>
+ <PING>
+ <source1>h6</source1>
+ <source2>h7</source2>
+ <source3>h8</source3>
+ <source4>h9</source4>
+ <source5>h10</source5>
+ <source6>h11</source6>
+ <source7>h12</source7>
+ <source8>h13</source8>
+ <source9>h14</source9>
+ <source10>h15</source10>
+ <target1>10.0.0.16</target1>
+ <target2>10.0.0.17</target2>
+ <target3>10.0.0.18</target3>
+ <target4>10.0.0.19</target4>
+ <target5>10.0.0.20</target5>
+ <target6>10.0.0.21</target6>
+ <target7>10.0.0.22</target7>
+ <target8>10.0.0.23</target8>
+ <target9>10.0.0.24</target9>
+ <target10>10.0.0.25</target10>
+ </PING>
<INTENTREST>
<intentIP>10.128.4.151</intentIP>
<intentPort>8080</intentPort>
diff --git a/TestON/tests/JamesTest/JamesTest.py b/TestON/tests/JamesTest/JamesTest.py
index 2f03add..dcb03f3 100644
--- a/TestON/tests/JamesTest/JamesTest.py
+++ b/TestON/tests/JamesTest/JamesTest.py
@@ -159,6 +159,11 @@
main.step("Cleaning out any leftover flows...")
masterSwitches = []
masterSwitches2 = []
+ hello = main.Mininet2.checkForLoss(fileName='/tmp/ping.h10')
+ if hello==main.FALSE:
+ main.log.info("CRAP")
+ else:
+ main.log.info("YAY")
for i in range(25):
if i < 15:
j=i+1
@@ -237,6 +242,38 @@
main.step("Verifying the result")
utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Flow check PASS",onfail="Flow check FAIL")
+
+ main.Mininet2.pingLong(src=main.params['PING']['source1'],target=main.params['PING']['target1'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source2'],target=main.params['PING']['target2'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source3'],target=main.params['PING']['target3'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source4'],target=main.params['PING']['target4'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source5'],target=main.params['PING']['target5'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source6'],target=main.params['PING']['target6'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source7'],target=main.params['PING']['target7'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source8'],target=main.params['PING']['target8'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source9'],target=main.params['PING']['target9'],pingTime=5)
+ main.Mininet2.pingLong(src=main.params['PING']['source10'],target=main.params['PING']['target10'],pingTime=5)
+ main.step("Check that the pings are going")
+ result = main.Mininet2.pingstatus(src=main.params['PING']['source1'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source2'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source3'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source4'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source5'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source6'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source7'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source8'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source9'])
+ result = result & main.Mininet2.pingstatus(src=main.params['PING']['source10'])
+ time.sleep(20)
+ main.Mininet2.pingKill()
+ if main.Mininet2.checkForLoss(fileName="/tmp/ping.h10"):
+ main.log.info("LOSS FOUND!!!")
+ else:
+ main.log.info("No Loss of Packets!!!")
+
+
+
+
#**********************************************************************************************************************************************************************************************
#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.