updating the Death Test
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c9b568f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+*.swp
diff --git a/TestON/tests/TimsDeathTest/TimsDeathTest.py b/TestON/tests/TimsDeathTest/TimsDeathTest.py
index 3f7af66..4aa278b 100644
--- a/TestON/tests/TimsDeathTest/TimsDeathTest.py
+++ b/TestON/tests/TimsDeathTest/TimsDeathTest.py
@@ -133,7 +133,7 @@
t1 = time.time()
main.ONOS1.add_flow(main.params['FLOWDEF'])
main.log.info("Checking...")
- for i in range(15):
+ for i in range(8):
result = main.ONOS1.check_flow()
if result == main.TRUE:
t2 = time.time()
@@ -157,22 +157,22 @@
main.step("Testing ping")
success = 0
main.log.info("starting loops")
- result = main.Mininet1.pingHost(src="h9",target="h33")
+ result = main.Mininet1.fpingHost(src="h9",target="h33")
for j in range(23) :
- result = result & main.Mininet1.pingHost(src="h"+str((10+j)),target="h"+str((34+j)))
+ result = result & main.Mininet1.fpingHost(src="h"+str((10+j)),target="h"+str((34+j)))
main.log.info("result updated")
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h"+str((33+j)),target="h"+str((57+j)))
+ result = result & main.Mininet1.fpingHost(src="h"+str((33+j)),target="h"+str((57+j)))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h"+str((57+j)),target="h"+str((81+j)))
+ result = result & main.Mininet1.fpingHost(src="h"+str((57+j)),target="h"+str((81+j)))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h"+str((81+j)),target="h"+str((9+j)))
+ result = result & main.Mininet1.fpingHost(src="h"+str((81+j)),target="h"+str((9+j)))
if result == main.TRUE:
success = success + 1
main.log.info("%d/98 Pings Good" % success)
@@ -187,19 +187,19 @@
result = main.TRUE
success = 0
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(9+j),target="h%d"%(33+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(9+j),target="h%d"%(33+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(33+j),target="h%d"%(57+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(33+j),target="h%d"%(57+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(57+j),target="h%d"%(81+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(57+j),target="h%d"%(81+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(81+j),target="h%d"%(9+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(81+j),target="h%d"%(9+j))
if result == main.TRUE:
success = success + 1
main.log.info("%d/98 Pings Good" % success)
@@ -214,19 +214,19 @@
result = main.TRUE
success = 0
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(9+j),target="h%d"%(33+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(9+j),target="h%d"%(33+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(33+j),target="h%d"%(57+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(33+j),target="h%d"%(57+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(57+j),target="h%d"%(81+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(57+j),target="h%d"%(81+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(81+j),target="h%d"%(9+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(81+j),target="h%d"%(9+j))
if result == main.TRUE:
success = success + 1
main.log.info("%d/98 Pings Good" % success)
@@ -247,19 +247,19 @@
result = main.TRUE
success = 0
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(9+j),target="h%d"%(33+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(9+j),target="h%d"%(33+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(33+j),target="h%d"%(57+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(33+j),target="h%d"%(57+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(57+j),target="h%d"%(81+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(57+j),target="h%d"%(81+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(81+j),target="h%d"%(9+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(81+j),target="h%d"%(9+j))
if result == main.TRUE:
success = success + 1
main.log.info("%d/98 Pings Good" % success)
@@ -343,19 +343,19 @@
result = main.TRUE
success = 0
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(9+j),target="h%d"%(33+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(9+j),target="h%d"%(33+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(33+j),target="h%d"%(57+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(33+j),target="h%d"%(57+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(57+j),target="h%d"%(81+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(57+j),target="h%d"%(81+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(81+j),target="h%d"%(9+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(81+j),target="h%d"%(9+j))
if result == main.TRUE:
success = success + 1
main.log.info("%d/98 Pings Good" % success)
@@ -371,19 +371,19 @@
result = main.TRUE
success = 0
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(9+j),target="h%d"%(33+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(9+j),target="h%d"%(33+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(33+j),target="h%d"%(57+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(33+j),target="h%d"%(57+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(57+j),target="h%d"%(81+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(57+j),target="h%d"%(81+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(81+j),target="h%d"%(9+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(81+j),target="h%d"%(9+j))
if result == main.TRUE:
success = success + 1
main.log.info("%d/98 Pings Good" % success)
@@ -399,19 +399,19 @@
result = main.TRUE
success = 0
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(9+j),target="h%d"%(33+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(9+j),target="h%d"%(33+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(33+j),target="h%d"%(57+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(33+j),target="h%d"%(57+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(57+j),target="h%d"%(81+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(57+j),target="h%d"%(81+j))
if result == main.TRUE:
success = success + 1
for j in range(24) :
- result = result & main.Mininet1.pingHost(src="h%d"%(81+j),target="h%d"%(9+j))
+ result = result & main.Mininet1.fpingHost(src="h%d"%(81+j),target="h%d"%(9+j))
if result == main.TRUE:
success = success + 1
main.log.info("%d/98 Pings Good" % success)
diff --git a/TestON/tests/TimsDeathTest/TimsDeathTest.topo b/TestON/tests/TimsDeathTest/TimsDeathTest.topo
index b5ac02e..95b6220 100644
--- a/TestON/tests/TimsDeathTest/TimsDeathTest.topo
+++ b/TestON/tests/TimsDeathTest/TimsDeathTest.topo
@@ -70,7 +70,7 @@
</Cassandra4>
<Mininet1>
- <host>10.128.100.4</host>
+ <host>10.128.100.11</host>
<user>admin</user>
<password>onos_test</password>
<type>MininetCliDriver</type>