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
9efb4ab
..
0adc917
--- a/
src/emuvim/test/base.py
+++ b/
src/emuvim/test/base.py
@@
-40,7
+40,9
@@
class SimpleTestTopology(unittest.TestCase):
self.net = DCNetwork(controller=controller, **kwargs)
# add some switches
self.net = DCNetwork(controller=controller, **kwargs)
# 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:
@@
-74,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():
@@
-90,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