projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First part of Containernet re-integration
[osm/vim-emu.git]
/
src
/
emuvim
/
test
/
test_emulator.py
diff --git
a/src/emuvim/test/test_emulator.py
b/src/emuvim/test/test_emulator.py
index
2038116
..
243f050
100755
(executable)
--- a/
src/emuvim/test/test_emulator.py
+++ b/
src/emuvim/test/test_emulator.py
@@
-32,7
+32,7
@@
class testEmulatorTopology( SimpleTestTopology ):
# start Mininet network
self.startNet()
# check number of running nodes
# start Mininet network
self.startNet()
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 0)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check connectivity by using ping
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check connectivity by using ping
@@
-54,7
+54,7
@@
class testEmulatorTopology( SimpleTestTopology ):
# start Mininet network
self.startNet()
# check number of running nodes
# start Mininet network
self.startNet()
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 0)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 2)
# check connectivity by using ping
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 2)
# check connectivity by using ping
@@
-79,7
+79,7
@@
class testEmulatorTopology( SimpleTestTopology ):
# start Mininet network
self.startNet()
# check number of running nodes
# start Mininet network
self.startNet()
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 0)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check connectivity by using ping
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check connectivity by using ping
@@
-110,7
+110,7
@@
class testEmulatorCompute( SimpleTestTopology ):
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 1)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 1)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
@@
-136,7
+136,7
@@
class testEmulatorCompute( SimpleTestTopology ):
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 1)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 1)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
@@
-146,7
+146,7
@@
class testEmulatorCompute( SimpleTestTopology ):
# remove compute resources
self.dc[0].stopCompute("vnf1")
# check number of running nodes
# remove compute resources
self.dc[0].stopCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 0)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 1)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
self.assertTrue(len(self.net.hosts) == 1)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
@@
-168,7
+168,7
@@
class testEmulatorCompute( SimpleTestTopology ):
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 1)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 1)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
@@
-202,7
+202,7
@@
class testEmulatorCompute( SimpleTestTopology ):
vnf1 = self.dc[0].startCompute("vnf1")
vnf2 = self.dc[1].startCompute("vnf2")
# check number of running nodes
vnf1 = self.dc[0].startCompute("vnf1")
vnf2 = self.dc[1].startCompute("vnf2")
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 2)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 2)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result
@@
-231,7
+231,7
@@
class testEmulatorCompute( SimpleTestTopology ):
vnf1 = self.dc[0].startCompute("vnf1")
vnf2 = self.dc[1].startCompute("vnf2")
# check number of running nodes
vnf1 = self.dc[0].startCompute("vnf1")
vnf2 = self.dc[1].startCompute("vnf2")
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 2)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 2)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result
@@
-242,7
+242,7
@@
class testEmulatorCompute( SimpleTestTopology ):
# remove compute resources
self.dc[0].stopCompute("vnf1")
# check number of running nodes
# remove compute resources
self.dc[0].stopCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.get
Dock
ernetContainers()) == 1)
+ self.assertTrue(len(self.get
Contain
ernetContainers()) == 1)
self.assertTrue(len(self.net.hosts) == 1)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result
self.assertTrue(len(self.net.hosts) == 1)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result