First part of Containernet re-integration
diff --git a/src/emuvim/test/base.py b/src/emuvim/test/base.py
index 4bad515..5a83547 100644
--- a/src/emuvim/test/base.py
+++ b/src/emuvim/test/base.py
@@ -74,11 +74,11 @@
base_url='unix://var/run/docker.sock')
return self.docker_cli
- def getDockernetContainers(self):
+ def getContainernetContainers(self):
"""
- List the containers managed by dockernet
+ List the containers managed by containernet
"""
- return self.getDockerCli().containers(filters={"label": "com.dockernet"})
+ return self.getDockerCli().containers(filters={"label": "com.containernet"})
@staticmethod
def setUp():
@@ -90,7 +90,7 @@
# 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.dockernet' -a -q)",
+ "sudo docker rm -f $(sudo docker ps --filter 'label=com.containernet' -a -q)",
stdout=devnull,
stderr=devnull,
shell=True)
\ No newline at end of file
diff --git a/src/emuvim/test/test_emulator.py b/src/emuvim/test/test_emulator.py
index 2038116..243f050 100755
--- a/src/emuvim/test/test_emulator.py
+++ b/src/emuvim/test/test_emulator.py
@@ -32,7 +32,7 @@
# start Mininet network
self.startNet()
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 0)
+ self.assertTrue(len(self.getContainernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check connectivity by using ping
@@ -54,7 +54,7 @@
# start Mininet network
self.startNet()
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 0)
+ self.assertTrue(len(self.getContainernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 2)
# check connectivity by using ping
@@ -79,7 +79,7 @@
# start Mininet network
self.startNet()
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 0)
+ self.assertTrue(len(self.getContainernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check connectivity by using ping
@@ -110,7 +110,7 @@
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 1)
+ self.assertTrue(len(self.getContainernetContainers()) == 1)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
@@ -136,7 +136,7 @@
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 1)
+ self.assertTrue(len(self.getContainernetContainers()) == 1)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
@@ -146,7 +146,7 @@
# remove compute resources
self.dc[0].stopCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 0)
+ self.assertTrue(len(self.getContainernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 1)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
@@ -168,7 +168,7 @@
# add compute resources
vnf1 = self.dc[0].startCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 1)
+ self.assertTrue(len(self.getContainernetContainers()) == 1)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check compute list result
@@ -202,7 +202,7 @@
vnf1 = self.dc[0].startCompute("vnf1")
vnf2 = self.dc[1].startCompute("vnf2")
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 2)
+ self.assertTrue(len(self.getContainernetContainers()) == 2)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result
@@ -231,7 +231,7 @@
vnf1 = self.dc[0].startCompute("vnf1")
vnf2 = self.dc[1].startCompute("vnf2")
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 2)
+ self.assertTrue(len(self.getContainernetContainers()) == 2)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result
@@ -242,7 +242,7 @@
# remove compute resources
self.dc[0].stopCompute("vnf1")
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 1)
+ self.assertTrue(len(self.getContainernetContainers()) == 1)
self.assertTrue(len(self.net.hosts) == 1)
self.assertTrue(len(self.net.switches) == 5)
# check compute list result
diff --git a/src/emuvim/test/test_resourcemodel.py b/src/emuvim/test/test_resourcemodel.py
index 1817a25..a1d273c 100644
--- a/src/emuvim/test/test_resourcemodel.py
+++ b/src/emuvim/test/test_resourcemodel.py
@@ -41,7 +41,7 @@
# start Mininet network
self.startNet()
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 0)
+ self.assertTrue(len(self.getContainernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check resource model and resource model registrar
@@ -213,7 +213,7 @@
def testInRealTopo(self):
"""
- Start a real container and check if limitations are really passed down to Dockernet.
+ Start a real container and check if limitations are really passed down to Conteinernet.
:return:
"""
# ATTENTION: This test should only be executed if emu runs not inside a Docker container,
@@ -231,7 +231,7 @@
# start Mininet network
self.startNet()
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 0)
+ self.assertTrue(len(self.getContainernetContainers()) == 0)
self.assertTrue(len(self.net.hosts) == 2)
self.assertTrue(len(self.net.switches) == 1)
# check resource model and resource model registrar
diff --git a/src/emuvim/test/test_sonata_dummy_gatekeeper.py b/src/emuvim/test/test_sonata_dummy_gatekeeper.py
index db3fd92..33a1d57 100644
--- a/src/emuvim/test/test_sonata_dummy_gatekeeper.py
+++ b/src/emuvim/test/test_sonata_dummy_gatekeeper.py
@@ -60,7 +60,7 @@
self.assertEqual(len(r4.json().get("service_instance_list")), 1)
# check number of running nodes
- self.assertTrue(len(self.getDockernetContainers()) == 3)
+ self.assertTrue(len(self.getContainernetContainers()) == 3)
self.assertTrue(len(self.net.hosts) == 5)
self.assertTrue(len(self.net.switches) == 2)
# check compute list result