projects
/
osm
/
vim-emu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
241e3e9
)
merge master and fix SDN chaining unit test
author
stevenvanrossem
<steven.vanrossem@intec.ugent.be>
Wed, 11 May 2016 21:51:06 +0000
(23:51 +0200)
committer
stevenvanrossem
<steven.vanrossem@intec.ugent.be>
Wed, 11 May 2016 21:51:06 +0000
(23:51 +0200)
26 files changed:
LICENSE
[changed mode: 0644->0755]
patch
|
blob
|
history
misc/sonata-demo-docker.son
[changed mode: 0644->0755]
patch
|
blob
|
history
setup.cfg
[changed mode: 0644->0755]
patch
|
blob
|
history
setup.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/__init__.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/api/openstack/README.md
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/api/sonata/README.md
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/api/sonata/__init__.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/api/zerorpc/__init__.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/api/zerorpc/compute.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/api/zerorpc/network.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/conftest.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/dcemulator/resourcemodel/__init__.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/dcemulator/resourcemodel/upb/__init__.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/dcemulator/resourcemodel/upb/simple.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/examples/resource_model_demo_topology.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/examples/sonata_y1_demo_topology_1.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/test/__init__.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/test/base.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/test/integrationtests/__init__.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/test/unittests/__init__.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/test/unittests/test_emulator.py
patch
|
blob
|
history
src/emuvim/test/unittests/test_resourcemodel.py
[changed mode: 0644->0755]
patch
|
blob
|
history
src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
[changed mode: 0644->0755]
patch
|
blob
|
history
utils/ci/junit-xml/.gitkeep
[changed mode: 0644->0755]
patch
|
blob
|
history
utils/docker/Dockerfile
[changed mode: 0644->0755]
patch
|
blob
|
history
diff --git
a/LICENSE
b/LICENSE
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/misc/sonata-demo-docker.son
b/misc/sonata-demo-docker.son
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/setup.cfg
b/setup.cfg
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/setup.py
b/setup.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/__init__.py
b/src/emuvim/__init__.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/api/openstack/README.md
b/src/emuvim/api/openstack/README.md
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/api/sonata/README.md
b/src/emuvim/api/sonata/README.md
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/api/sonata/__init__.py
b/src/emuvim/api/sonata/__init__.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/api/zerorpc/__init__.py
b/src/emuvim/api/zerorpc/__init__.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/api/zerorpc/compute.py
b/src/emuvim/api/zerorpc/compute.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/api/zerorpc/network.py
b/src/emuvim/api/zerorpc/network.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/conftest.py
b/src/emuvim/conftest.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/dcemulator/resourcemodel/__init__.py
b/src/emuvim/dcemulator/resourcemodel/__init__.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/dcemulator/resourcemodel/upb/__init__.py
b/src/emuvim/dcemulator/resourcemodel/upb/__init__.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/dcemulator/resourcemodel/upb/simple.py
b/src/emuvim/dcemulator/resourcemodel/upb/simple.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/examples/resource_model_demo_topology.py
b/src/emuvim/examples/resource_model_demo_topology.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/examples/sonata_y1_demo_topology_1.py
b/src/emuvim/examples/sonata_y1_demo_topology_1.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/test/__init__.py
b/src/emuvim/test/__init__.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/test/base.py
b/src/emuvim/test/base.py
old mode 100644
(file)
new mode 100755
(executable)
index
2021355
..
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:
diff --git
a/src/emuvim/test/integrationtests/__init__.py
b/src/emuvim/test/integrationtests/__init__.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/test/unittests/__init__.py
b/src/emuvim/test/unittests/__init__.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/test/unittests/test_emulator.py
b/src/emuvim/test/unittests/test_emulator.py
index
e2c3b6b
..
ad9896a
100755
(executable)
--- a/
src/emuvim/test/unittests/test_emulator.py
+++ b/
src/emuvim/test/unittests/test_emulator.py
@@
-90,7
+90,7
@@
class testEmulatorTopology( SimpleTestTopology ):
class testEmulatorNetworking( SimpleTestTopology ):
class testEmulatorNetworking( SimpleTestTopology ):
- def testSDNChaining(self):
+ def testSDNChaining
SingleService
(self):
"""
Create a two data centers and interconnect them with additional
switches between them.
"""
Create a two data centers and interconnect them with additional
switches between them.
@@
-113,7
+113,7
@@
class testEmulatorNetworking( SimpleTestTopology ):
vnf1 = self.dc[0].startCompute("vnf1", network=[{'id':'intf1', 'ip':'10.0.10.1/24'}])
vnf2 = self.dc[1].startCompute("vnf2", network=[{'id':'intf2', 'ip':'10.0.10.2/24'}])
# check number of running nodes
vnf1 = self.dc[0].startCompute("vnf1", network=[{'id':'intf1', 'ip':'10.0.10.1/24'}])
vnf2 = self.dc[1].startCompute("vnf2", network=[{'id':'intf2', 'ip':'10.0.10.2/24'}])
# 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 status
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check status
diff --git
a/src/emuvim/test/unittests/test_resourcemodel.py
b/src/emuvim/test/unittests/test_resourcemodel.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
b/src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/utils/ci/junit-xml/.gitkeep
b/utils/ci/junit-xml/.gitkeep
old mode 100644
(file)
new mode 100755
(executable)
diff --git
a/utils/docker/Dockerfile
b/utils/docker/Dockerfile
old mode 100644
(file)
new mode 100755
(executable)