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 #131 from stevenvanrossem/master
[osm/vim-emu.git]
/
src
/
emuvim
/
test
/
api_base.py
diff --git
a/src/emuvim/test/api_base.py
b/src/emuvim/test/api_base.py
old mode 100644
(file)
new mode 100755
(executable)
index
54ffde9
..
fe17bc9
--- a/
src/emuvim/test/api_base.py
+++ b/
src/emuvim/test/api_base.py
@@
-7,7
+7,7
@@
import os
import subprocess
import docker
from emuvim.dcemulator.net import DCNetwork
import subprocess
import docker
from emuvim.dcemulator.net import DCNetwork
-from emuvim.api.rest.
compute
import RestApiEndpoint
+from emuvim.api.rest.
rest_api_endpoint
import RestApiEndpoint
from mininet.clean import cleanup
from mininet.node import Controller
from mininet.clean import cleanup
from mininet.node import Controller
@@
-40,7
+40,7
@@
class SimpleTestTopology(unittest.TestCase):
specific controller functionality.
"""
self.net = DCNetwork(controller=controller, **kwargs)
specific controller functionality.
"""
self.net = DCNetwork(controller=controller, **kwargs)
- self.api = RestApiEndpoint("127.0.0.1",
5000
)
+ self.api = RestApiEndpoint("127.0.0.1",
5001
)
# add some switches
# 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
# add some switches
# 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