First part of Containernet re-integration

[osm/vim-emu.git] / src / emuvim / test / test_sonata_dummy_gatekeeper.py

diff --git a/src/emuvim/test/test_sonata_dummy_gatekeeper.py b/src/emuvim/test/test_sonata_dummy_gatekeeper.py
index 1eab98b..33a1d57 100644 (file)
--- a/src/emuvim/test/test_sonata_dummy_gatekeeper.py
+++ b/src/emuvim/test/test_sonata_dummy_gatekeeper.py
@@ -2,6 +2,7 @@ import time
 import requests
 import subprocess
 import os
+import unittest
 from emuvim.test.base import SimpleTestTopology
 from emuvim.api.sonata import SonataDummyGatekeeperEndpoint
 
@@ -9,11 +10,8 @@ from emuvim.api.sonata import SonataDummyGatekeeperEndpoint
 
 class testSonataDummyGatekeeper(SimpleTestTopology):
 
+    @unittest.skip("disabled test since ubuntu:trusty not used in current example package")
     def testAPI(self):
-        # ATTENTION: DEACTIVATED this test in CI env. due to Docker build errors that will disappear as soon as the new
-        # demo package with pre-build containers becomes available
-        if os.environ.get("SON_EMU_IN_DOCKER") is not None:
-            return
         # create network
         self.createNet(nswitches=0, ndatacenter=2, nhosts=2, ndockers=0)
         # setup links
@@ -62,7 +60,7 @@ class testSonataDummyGatekeeper(SimpleTestTopology):
         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