X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Ftest%2Ftest_resourcemodel_api.py;h=35b4dd5f45163dfe93b7180252ceb091f22f44b2;hb=0ca5d0e5cb1f5af469aa90edab7fae652c138961;hp=2ec31a03ae957bb9330235cb6dd1b570a4612d45;hpb=5c6475c4aa9c587ccb7ab8de03ce27037c74aaaf;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/test/test_resourcemodel_api.py b/src/emuvim/test/test_resourcemodel_api.py
index 2ec31a0..35b4dd5 100644
--- a/src/emuvim/test/test_resourcemodel_api.py
+++ b/src/emuvim/test/test_resourcemodel_api.py
@@ -1,13 +1,22 @@
+import time
 from emuvim.test.base import SimpleTestTopology
-from emuvim.dcemulator.resourcemodel import BaseResourceModel
+from emuvim.dcemulator.resourcemodel import BaseResourceModel, ResourceFlavor
 
 
 class testResourceModel(SimpleTestTopology):
 
     def testBaseResourceModelApi(self):
-        pass
-        # TODO test add flavor etc.
-        # TODO test aaloc / free
+        r = BaseResourceModel()
+        # check if default flavors are there
+        assert(len(r._flavors) == 5)
+        # check addFlavor functionality
+        f = ResourceFlavor("test", {"testmetric": 42})
+        r.addFlavour(f)
+        assert("test" in r._flavors)
+        assert(r._flavors.get("test").get("testmetric") == 42)
+        # test if allocate and free runs through
+        assert(len(r.allocate("testc", "tiny")) == 3)  # expected: 3tuple
+        assert(r.free("testc"))
 
     def testAddRmToDc(self):
         # create network
@@ -26,9 +35,16 @@ class testResourceModel(SimpleTestTopology):
         assert(len(self.net.switches) == 1)
         # check resource model and resource model registrar
         assert(self.dc[0]._resource_model is not None)
-        assert(self.net.rm_registrar.num_models == 1)
-        # TODO test if alloc was called on start
-        # TODO if free was called on stop
+        assert(len(self.net.rm_registrar.resource_models) == 1)
+
+        # check if alloc was called during startCompute
+        assert(len(r.allocated_compute_instances) == 0)
+        self.dc[0].startCompute("tc1")
+        time.sleep(1)
+        assert(len(r.allocated_compute_instances) == 1)
+        # check if free was called during stopCompute
+        self.dc[0].stopCompute("tc1")
+        assert(len(r.allocated_compute_instances) == 0)
         # check connectivity by using ping
         assert(self.net.ping([self.h[0], self.h[1]]) <= 0.0)
         # stop Mininet network