projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Tests in SONATA jenkins behave strange
[osm/vim-emu.git]
/
src
/
emuvim
/
test
/
unittests
/
test_sonata_dummy_gatekeeper.py
diff --git
a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
index
cc7eddd
..
ca8c57e
100755
(executable)
--- a/
src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
+++ b/
src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
@@
-56,9
+56,10
@@
class testSonataDummyGatekeeper(SimpleTestTopology):
sdkg1.connectDatacenter(self.dc[1])
# run the dummy gatekeeper (in another thread, don't block)
sdkg1.start()
sdkg1.connectDatacenter(self.dc[1])
# run the dummy gatekeeper (in another thread, don't block)
sdkg1.start()
+ time.sleep(3)
# start Mininet network
self.startNet()
# start Mininet network
self.startNet()
- time.sleep(
1
)
+ time.sleep(
3
)
print "starting tests"
# board package
print "starting tests"
# board package
@@
-138,7
+139,8
@@
class testSonataDummyGatekeeper(SimpleTestTopology):
test_ip_list = list(ELAN_list)
test_ip_list.remove(ip_address)
for ip in test_ip_list:
test_ip_list = list(ELAN_list)
test_ip_list.remove(ip_address)
for ip in test_ip_list:
- p = self.net.ping([vnf],manualdestip=ip)
+ # only take ip address, without netmask
+ p = self.net.ping([vnf],manualdestip=ip.split('/')[0])
print p
self.assertTrue(p <= 0.0)
print p
self.assertTrue(p <= 0.0)
@@
-160,9
+162,10
@@
class testSonataDummyGatekeeper(SimpleTestTopology):
sdkg1.connectDatacenter(self.dc[1])
# run the dummy gatekeeper (in another thread, don't block)
sdkg1.start()
sdkg1.connectDatacenter(self.dc[1])
# run the dummy gatekeeper (in another thread, don't block)
sdkg1.start()
+ time.sleep(3)
# start Mininet network
self.startNet()
# start Mininet network
self.startNet()
- time.sleep(
1
)
+ time.sleep(
3
)
print "starting tests"
# board package
print "starting tests"
# board package
@@
-215,9
+218,10
@@
class testSonataDummyGatekeeper(SimpleTestTopology):
sdkg1.connectDatacenter(self.dc[1])
# run the dummy gatekeeper (in another thread, don't block)
sdkg1.start()
sdkg1.connectDatacenter(self.dc[1])
# run the dummy gatekeeper (in another thread, don't block)
sdkg1.start()
+ time.sleep(3)
# start Mininet network
self.startNet()
# start Mininet network
self.startNet()
- time.sleep(
1
)
+ time.sleep(
3
)
print "starting tests"
# board package
print "starting tests"
# board package