X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fserver%2Fserver.py;h=94c747935dc4e5709b9bfd13fff2ae9b6ebe5cd3;hb=7a856f56614be323b0feceac51555f3e94d8691a;hp=0011618265aaabe78cb747b28ea6998830ca339b;hpb=5ac7c081ca13495185ecf6bdf302c16c25a4b759;p=osm%2FMON.git

diff --git a/osm_mon/server/server.py b/osm_mon/server/server.py
index 0011618..94c7479 100755
--- a/osm_mon/server/server.py
+++ b/osm_mon/server/server.py
@@ -20,17 +20,17 @@
 # For those usages not covered by the Apache License, Version 2.0 please
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
-"""A common KafkaConsumer for all MON plugins."""
+"""
+MON component in charge of CRUD operations for vim_accounts and alarms. It uses the message bus to communicate.
+"""
 import asyncio
 import json
 import logging
 
-from osm_mon.core.auth import AuthManager
-from osm_mon.core.common_db import CommonDbClient
 from osm_mon.core.config import Config
-from osm_mon.core.database import DatabaseManager
 from osm_mon.core.message_bus_client import MessageBusClient
 from osm_mon.core.response import ResponseBuilder
+from osm_mon.server.service import ServerService
 
 log = logging.getLogger(__name__)
 
@@ -42,18 +42,14 @@ class Server:
         if not loop:
             loop = asyncio.get_event_loop()
         self.loop = loop
-        self.auth_manager = AuthManager(config)
-        self.database_manager = DatabaseManager(config)
-        self.database_manager.create_tables()
-        self.common_db = CommonDbClient(config)
         self.msg_bus = MessageBusClient(config)
+        self.service = ServerService(config)
 
     def run(self):
         self.loop.run_until_complete(self.start())
 
     async def start(self):
         topics = [
-            "vim_account",
             "alarm_request"
         ]
         await self.msg_bus.aioread(topics, self._process_msg)
@@ -61,40 +57,21 @@ class Server:
     async def _process_msg(self, topic, key, values):
         log.info("Message arrived: %s", values)
         try:
-            if topic == "vim_account":
-                if key == "create" or key == "edit":
-                    values['vim_password'] = self.common_db.decrypt_vim_password(values['vim_password'],
-                                                                                 values['schema_version'],
-                                                                                 values['_id'])
-
-                    vim_config_encrypted = ("admin_password", "nsx_password", "vcenter_password")
-                    if 'config' in values:
-                        for key in values['config']:
-                            if key in vim_config_encrypted:
-                                values['config'][key] = self.common_db.decrypt_vim_password(values['config'][key],
-                                                                                            values['schema_version'],
-                                                                                            values['_id'])
-                    self.auth_manager.store_auth_credentials(values)
-
-                if key == "delete":
-                    self.auth_manager.delete_auth_credentials(values)
-
-            elif topic == "alarm_request":
+
+            if topic == "alarm_request":
                 if key == "create_alarm_request":
                     alarm_details = values['alarm_create_request']
                     cor_id = alarm_details['correlation_id']
                     response_builder = ResponseBuilder()
                     try:
-                        alarm = self.database_manager.save_alarm(
+                        alarm = self.service.create_alarm(
                             alarm_details['alarm_name'],
                             alarm_details['threshold_value'],
                             alarm_details['operation'].lower(),
                             alarm_details['severity'].lower(),
                             alarm_details['statistic'].lower(),
                             alarm_details['metric_name'],
-                            alarm_details['vdu_name'],
-                            alarm_details['vnf_member_index'],
-                            alarm_details['ns_id']
+                            alarm_details['tags']
                         )
                         response = response_builder.generate_response('create_alarm_response',
                                                                       cor_id=cor_id,
@@ -114,7 +91,7 @@ class Server:
                     response_builder = ResponseBuilder()
                     cor_id = alarm_details['correlation_id']
                     try:
-                        self.database_manager.delete_alarm(alarm_uuid)
+                        self.service.delete_alarm(alarm_uuid)
                         response = response_builder.generate_response('delete_alarm_response',
                                                                       cor_id=cor_id,
                                                                       status=True,