projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #102 from mpeuster/master
[osm/vim-emu.git]
/
src
/
emuvim
/
test
/
base.py
diff --git
a/src/emuvim/test/base.py
b/src/emuvim/test/base.py
old mode 100644
(file)
new mode 100755
(executable)
index
f652259
..
0adc917
--- a/
src/emuvim/test/base.py
+++ b/
src/emuvim/test/base.py
@@
-8,6
+8,7
@@
import subprocess
import docker
from emuvim.dcemulator.net import DCNetwork
from mininet.clean import cleanup
import docker
from emuvim.dcemulator.net import DCNetwork
from mininet.clean import cleanup
+from mininet.node import Controller
class SimpleTestTopology(unittest.TestCase):
"""
class SimpleTestTopology(unittest.TestCase):
"""
@@
-27,15
+28,21
@@
class SimpleTestTopology(unittest.TestCase):
def createNet(
self,
nswitches=0, ndatacenter=0, nhosts=0, ndockers=0,
def createNet(
self,
nswitches=0, ndatacenter=0, nhosts=0, ndockers=0,
- autolinkswitches=False):
+ autolinkswitches=False
, controller=Controller, **kwargs
):
"""
Creates a Mininet instance and automatically adds some
nodes to it.
"""
Creates a Mininet instance and automatically adds some
nodes to it.
+
+ Attention, we should always use Mininet's default controller
+ for our tests. Only use other controllers if you want to test
+ specific controller functionality.
"""
"""
- self.net =
net = DCNetwork(
)
+ self.net =
DCNetwork(controller=controller, **kwargs
)
# add some switches
# add some switches
- for i in range(0, nswitches):
+ # start from s1 because ovs does not like to have dpid = 0
+ # and switch name-number is being used by mininet to set the dpid
+ for i in range(1, nswitches+1):
self.s.append(self.net.addSwitch('s%d' % i))
# if specified, chain all switches
if autolinkswitches:
self.s.append(self.net.addSwitch('s%d' % i))
# if specified, chain all switches
if autolinkswitches:
@@
-52,7
+59,7
@@
class SimpleTestTopology(unittest.TestCase):
self.h.append(self.net.addHost('h%d' % i))
# add some dockers
for i in range(0, ndockers):
self.h.append(self.net.addHost('h%d' % i))
# add some dockers
for i in range(0, ndockers):
- self.d.append(self.net.addDocker('d%d' % i, dimage="ubuntu"))
+ self.d.append(self.net.addDocker('d%d' % i, dimage="ubuntu
:trusty
"))
def startNet(self):
self.net.start()
def startNet(self):
self.net.start()
@@
-69,11
+76,11
@@
class SimpleTestTopology(unittest.TestCase):
base_url='unix://var/run/docker.sock')
return self.docker_cli
base_url='unix://var/run/docker.sock')
return self.docker_cli
- def get
Dock
ernetContainers(self):
+ def get
Contain
ernetContainers(self):
"""
"""
- List the containers managed by
dock
ernet
+ List the containers managed by
contain
ernet
"""
"""
- return self.getDockerCli().containers(filters={"label": "com.
dock
ernet"})
+ return self.getDockerCli().containers(filters={"label": "com.
contain
ernet"})
@staticmethod
def setUp():
@staticmethod
def setUp():
@@
-85,7
+92,7
@@
class SimpleTestTopology(unittest.TestCase):
# make sure that all pending docker containers are killed
with open(os.devnull, 'w') as devnull:
subprocess.call(
# make sure that all pending docker containers are killed
with open(os.devnull, 'w') as devnull:
subprocess.call(
- "sudo docker rm -f $(sudo docker ps --filter 'label=com.
dock
ernet' -a -q)",
+ "sudo docker rm -f $(sudo docker ps --filter 'label=com.
contain
ernet' -a -q)",
stdout=devnull,
stderr=devnull,
shell=True)
\ No newline at end of file
stdout=devnull,
stderr=devnull,
shell=True)
\ No newline at end of file