X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fserver%2Fserver.py;h=94c747935dc4e5709b9bfd13fff2ae9b6ebe5cd3;hb=628df021896fa8775f9743af62a4267b617cc35c;hp=1e3e7f835c77ed23b8572e0ab04a09bf3fce0eb2;hpb=a97bdb3eafa4f3d07d61d32635f7f36f5cc36c58;p=osm%2FMON.git diff --git a/osm_mon/server/server.py b/osm_mon/server/server.py index 1e3e7f8..94c7479 100755 --- a/osm_mon/server/server.py +++ b/osm_mon/server/server.py @@ -50,7 +50,6 @@ class Server: async def start(self): topics = [ - "vim_account", "alarm_request" ] await self.msg_bus.aioread(topics, self._process_msg) @@ -58,24 +57,8 @@ 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": - if 'config' not in values: - values['config'] = {} - self.service.upsert_vim_account(values['_id'], - values['name'], - values['vim_type'], - values['vim_url'], - values['vim_user'], - values['vim_password'], - values['vim_tenant_name'], - values['schema_version'], - values['config']) - - if key == "delete": - self.service.delete_vim_account(values['_id']) - - 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'] @@ -88,9 +71,7 @@ class Server: 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,