commit 628df021896fa8775f9743af62a4267b617cc35c
author lavado <glavado@whitestack.com> Sat Nov 30 03:15:09 2019 +0100
committer lavado <glavado@whitestack.com> Sat Nov 30 03:15:09 2019 +0100
tree 41eb11da309746d57441a1c9f00f1688db4610b1
parent b6233b3d90ca1ba617e476b915fba056cf7891f7

Revert "Migrates alarms to MongoDB"

This reverts commit b6233b3d90ca1ba617e476b915fba056cf7891f7.

Change-Id: I82b7c5916cdf7eb2816348c4ea13609d0fddffe6
Signed-off-by: lavado <glavado@whitestack.com>

osm_mon/cmd/mon_collector.py

diff --git a/osm_mon/cmd/mon_collector.py b/osm_mon/cmd/mon_collector.py
index 94c3883..3e493de 100644
--- a/osm_mon/cmd/mon_collector.py
+++ b/osm_mon/cmd/mon_collector.py
@@ -27,11 +27,12 @@
 
 from osm_mon.collector.collector import Collector
 from osm_mon.core.config import Config
+from osm_mon.core.database import DatabaseManager
 
 
 def main():
-    parser = argparse.ArgumentParser(prog='osm-mon-collector')
-    parser.add_argument('--config-file', nargs='?', help='MON configuration file')
+    parser = argparse.ArgumentParser(prog='osm-policy-agent')
+    parser.add_argument('--config-file', nargs='?', help='POL configuration file')
     args = parser.parse_args()
     cfg = Config(args.config_file)
 
@@ -47,6 +48,9 @@
     log.info("Starting MON Collector...")
     log.debug("Config: %s", cfg.conf)
     log.info("Initializing database...")
+    db_manager = DatabaseManager(cfg)
+    db_manager.create_tables()
+    log.info("Database initialized correctly.")
     collector = Collector(cfg)
     collector.collect_forever()
 

osm_mon/cmd/mon_evaluator.py

diff --git a/osm_mon/cmd/mon_evaluator.py b/osm_mon/cmd/mon_evaluator.py
index ba9a420..3835d7e 100644
--- a/osm_mon/cmd/mon_evaluator.py
+++ b/osm_mon/cmd/mon_evaluator.py
@@ -26,12 +26,13 @@
 import sys
 
 from osm_mon.core.config import Config
+from osm_mon.core.database import DatabaseManager
 from osm_mon.evaluator.evaluator import Evaluator
 
 
 def main():
-    parser = argparse.ArgumentParser(prog='osm-mon-evaluator')
-    parser.add_argument('--config-file', nargs='?', help='MON configuration file')
+    parser = argparse.ArgumentParser(prog='osm-policy-agent')
+    parser.add_argument('--config-file', nargs='?', help='POL configuration file')
     args = parser.parse_args()
     cfg = Config(args.config_file)
 
@@ -47,6 +48,9 @@
     log.info("Starting MON Evaluator...")
     log.debug("Config: %s", cfg.conf)
     log.info("Initializing database...")
+    db_manager = DatabaseManager(cfg)
+    db_manager.create_tables()
+    log.info("Database initialized correctly.")
     evaluator = Evaluator(cfg)
     evaluator.evaluate_forever()
 

osm_mon/cmd/mon_server.py

diff --git a/osm_mon/cmd/mon_server.py b/osm_mon/cmd/mon_server.py
index e05f4b8..6698339 100644
--- a/osm_mon/cmd/mon_server.py
+++ b/osm_mon/cmd/mon_server.py
@@ -27,12 +27,13 @@
 import sys
 
 from osm_mon.core.config import Config
+from osm_mon.core.database import DatabaseManager
 from osm_mon.server.server import Server
 
 
 def main():
-    parser = argparse.ArgumentParser(prog='osm-mon-server')
-    parser.add_argument('--config-file', nargs='?', help='MON configuration file')
+    parser = argparse.ArgumentParser(prog='osm-policy-agent')
+    parser.add_argument('--config-file', nargs='?', help='POL configuration file')
     args = parser.parse_args()
     cfg = Config(args.config_file)
 
@@ -48,6 +49,9 @@
     log.info("Starting MON Server...")
     log.debug("Config: %s", cfg.conf)
     log.info("Initializing database...")
+    db_manager = DatabaseManager(cfg)
+    db_manager.create_tables()
+    log.info("Database initialized correctly.")
     loop = asyncio.get_event_loop()
     server = Server(cfg, loop)
     server.run()