Readds plugins code and respective tests

[osm/MON.git] / osm_mon / core / settings.py

diff --git a/osm_mon/core/settings.py b/osm_mon/core/settings.py
index 9700af5..a5be2d1 100644 (file)
--- a/osm_mon/core/settings.py
+++ b/osm_mon/core/settings.py
@@ -26,7 +26,7 @@ import os
 
 from collections import namedtuple
 
-from osm_mon.plugins.OpenStack.singleton import Singleton
+from osm_mon.core.singleton import Singleton
 
 import six
 
@@ -60,14 +60,20 @@ class Config(object):
 
     _configuration = [
         CfgParam('BROKER_URI', "localhost:9092", six.text_type),
-        CfgParam('MONGO_URI', "mongo:27017", six.text_type),
+        CfgParam('MONGO_URI', "mongodb://mongo:27017", six.text_type),
         CfgParam('DATABASE', "sqlite:///mon_sqlite.db", six.text_type),
         CfgParam('OS_NOTIFIER_URI', "http://localhost:8662", six.text_type),
-        CfgParam('OS_DEFAULT_GRANULARITY', "300", six.text_type),
+        CfgParam('OS_DEFAULT_GRANULARITY', 300, int),
         CfgParam('REQUEST_TIMEOUT', 10, int),
         CfgParam('OSMMON_LOG_LEVEL', "INFO", six.text_type),
         CfgParam('OSMMON_KAFKA_LOG_LEVEL', "WARN", six.text_type),
-        CfgParam('OSMMON_COLLECTOR_INTERVAL', 10, int),
+        CfgParam('OSMMON_COLLECTOR_INTERVAL', 30, int),
+        CfgParam('OSMMON_EVALUATOR_INTERVAL', 30, int),
+        CfgParam('OSMMON_VCA_HOST', "localhost", six.text_type),
+        CfgParam('OSMMON_VCA_SECRET', "secret", six.text_type),
+        CfgParam('OSMMON_VCA_USER', "admin", six.text_type),
+        CfgParam('OSMMON_DATABASE_COMMONKEY', "changeme", six.text_type),
+        CfgParam('OSMMON_PROMETHEUS_URL', "http://prometheus:9090", six.text_type),
     ]
 
     _config_dict = {cfg.key: cfg for cfg in _configuration}