X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftests%2Fcollector%2Ftest_collector.py;h=4bbe10e8c0f48cde82cf10d6a82a1153323bc891;hb=0c5ec8cea177aae846451601bd62e0c99676c30a;hp=f558e23a30d1e555f578e8e3e767bd527d255439;hpb=51f4486b06781541ee15ea332261247ed3e930f6;p=osm%2FMON.git

diff --git a/osm_mon/tests/collector/test_collector.py b/osm_mon/tests/collector/test_collector.py
index f558e23..4bbe10e 100644
--- a/osm_mon/tests/collector/test_collector.py
+++ b/osm_mon/tests/collector/test_collector.py
@@ -20,57 +20,53 @@
 # For those usages not covered by the Apache License, Version 2.0 please
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
+import os
 import unittest
 from unittest import mock
 
-from peewee import SqliteDatabase
-
 from osm_mon.collector.collector import Collector
-from osm_mon.collector.collectors.openstack import OpenstackCollector
-from osm_mon.core import database
-from osm_mon.core.database import DatabaseManager, VimCredentials, Alarm
-
-test_db = SqliteDatabase(':memory:')
-
-MODELS = [VimCredentials, Alarm]
+from osm_mon.collector.vnf_collectors.openstack import OpenstackCollector
+from osm_mon.core.config import Config
+from osm_mon.core.database import DatabaseManager, db
 
 
 class CollectorTest(unittest.TestCase):
     def setUp(self):
         super().setUp()
-        database.db = test_db
-        test_db.bind(MODELS)
-        test_db.connect()
-        test_db.drop_tables(MODELS)
-        test_db.create_tables(MODELS)
+        os.environ["OSMMON_SQL_DATABASE_URI"] = "sqlite:///:memory:"
+        self.config = Config()
+        db_manager = DatabaseManager(self.config)
+        db_manager.create_tables()
 
     def tearDown(self):
         super().tearDown()
-        test_db.close()
+        db.close()
 
     @mock.patch("osm_mon.collector.collector.CommonDbClient", mock.Mock())
+    @mock.patch.object(Collector, "_init_backends", mock.Mock())
     @mock.patch.object(OpenstackCollector, "__init__", lambda *args, **kwargs: None)
     @mock.patch.object(OpenstackCollector, "collect")
     @mock.patch.object(DatabaseManager, "get_vim_type")
     def test_init_vim_collector_and_collect_openstack(self, _get_vim_type, collect):
         _get_vim_type.return_value = 'openstack'
-        collector = Collector()
+        collector = Collector(self.config)
         collector._collect_vim_metrics({}, 'test_vim_account_id')
         collect.assert_called_once_with({})
 
     @mock.patch("osm_mon.collector.collector.CommonDbClient", mock.Mock())
+    @mock.patch.object(Collector, "_init_backends", mock.Mock())
     @mock.patch.object(OpenstackCollector, "collect")
     @mock.patch.object(DatabaseManager, "get_vim_type")
     def test_init_vim_collector_and_collect_unknown(self, _get_vim_type, openstack_collect):
         _get_vim_type.return_value = 'unknown'
-        collector = Collector()
+        collector = Collector(self.config)
         collector._collect_vim_metrics({}, 'test_vim_account_id')
         openstack_collect.assert_not_called()
 
     @mock.patch("osm_mon.collector.collector.CommonDbClient", mock.Mock())
     @mock.patch("osm_mon.collector.collector.VCACollector", autospec=True)
     def test_collect_vca_metrics(self, vca_collector):
-        collector = Collector()
+        collector = Collector(self.config)
         collector._collect_vca_metrics({})
-        vca_collector.assert_called_once_with()
+        vca_collector.assert_called_once_with(self.config)
         vca_collector.return_value.collect.assert_called_once_with({})