X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fcollectors%2Fjuju.py;h=638086ab2672e20be188857c40dc29ae004ba876;hb=2895377353fffbce46b641fcc1ec0759caff66cf;hp=162a5270b0f99855f0a67114d1cce754a67ce5e0;hpb=0e34244e420bd68e6acb0cf6bb4383fedb662070;p=osm%2FMON.git

diff --git a/osm_mon/collector/collectors/juju.py b/osm_mon/collector/collectors/juju.py
index 162a527..638086a 100644
--- a/osm_mon/collector/collectors/juju.py
+++ b/osm_mon/collector/collectors/juju.py
@@ -21,13 +21,14 @@
 ##
 import asyncio
 import logging
-from multiprocessing import Queue
+from typing import List
 
 from n2vc.vnf import N2VC
 
 from osm_mon.collector.collectors.base import BaseCollector
 from osm_mon.collector.metric import Metric
-from osm_mon.common.common_db_client import CommonDbClient
+from osm_mon.core.common_db import CommonDbClient
+from osm_mon.core.exceptions import VcaDeploymentInfoNotFound
 from osm_mon.core.settings import Config
 
 log = logging.getLogger(__name__)
@@ -40,32 +41,51 @@ class VCACollector(BaseCollector):
         self.loop = asyncio.get_event_loop()
         self.n2vc = N2VC(server=cfg.OSMMON_VCA_HOST, user=cfg.OSMMON_VCA_USER, secret=cfg.OSMMON_VCA_SECRET)
 
-    def collect(self, vnfr: dict, queue: Queue):
-        vca_model_name = 'default'
+    def collect(self, vnfr: dict) -> List[Metric]:
         nsr_id = vnfr['nsr-id-ref']
         vnf_member_index = vnfr['member-vnf-index-ref']
         vnfd = self.common_db.get_vnfd(vnfr['vnfd-id'])
+        metrics = []
         for vdur in vnfr['vdur']:
-            nsr = self.common_db.get_nsr(nsr_id)
+            # This avoids errors when vdur records have not been completely filled
+            if 'name' not in vdur:
+                continue
             vdu = next(
                 filter(lambda vdu: vdu['id'] == vdur['vdu-id-ref'], vnfd['vdu'])
             )
             if 'vdu-configuration' in vdu and 'metrics' in vdu['vdu-configuration']:
-                vnf_name_vca = self.n2vc.FormatApplicationName(nsr['name'], vnf_member_index, vdur['vdu-id-ref'])
-                metrics = self.loop.run_until_complete(self.n2vc.GetMetrics(vca_model_name, vnf_name_vca))
-                log.debug('Metrics: %s', metrics)
-                for metric_list in metrics.values():
-                    for metric in metric_list:
-                        log.debug("Metric: %s", metric)
-                        metric = Metric(nsr_id, vnf_member_index, vdur['name'], metric['key'], float(metric['value']))
-                        queue.put(metric)
-            if 'vnf-configuration' in vnfr and 'metrics' in vnfr['vnf-configuration']:
-                vnf_name_vca = self.n2vc.FormatApplicationName(nsr['name'], vnf_member_index, vdur['vdu-id-ref'])
-                metrics = self.loop.run_until_complete(self.n2vc.GetMetrics(vca_model_name, vnf_name_vca))
-                log.debug('Metrics: %s', metrics)
-                for metric_list in metrics.values():
-                    for metric in metric_list:
-                        log.debug("Metric: %s", metric)
-                        metric = Metric(nsr_id, vnf_member_index, vdur['name'], metric['key'], float(metric['value']))
-                        queue.put(metric)
-            # TODO (diazb): Implement vnf-configuration config
+                try:
+                    vca_deployment_info = self.get_vca_deployment_info(nsr_id, vnf_member_index, vdur['name'])
+                except VcaDeploymentInfoNotFound:
+                    continue
+                measures = self.loop.run_until_complete(self.n2vc.GetMetrics(vca_deployment_info['model'],
+                                                                             vca_deployment_info['application']))
+                log.debug('Measures: %s', measures)
+                for measure_list in measures.values():
+                    for measure in measure_list:
+                        log.debug("Measure: %s", measure)
+                        metric = Metric(nsr_id, vnf_member_index, vdur['name'], measure['key'], float(measure['value']))
+                        metrics.append(metric)
+        if 'vnf-configuration' in vnfd and 'metrics' in vnfd['vnf-configuration']:
+            try:
+                vca_deployment_info = self.get_vca_deployment_info(nsr_id, vnf_member_index, None)
+            except VcaDeploymentInfoNotFound:
+                return metrics
+            measures = self.loop.run_until_complete(self.n2vc.GetMetrics(vca_deployment_info['model'],
+                                                                         vca_deployment_info['application']))
+            log.debug('Measures: %s', measures)
+            for measure_list in measures.values():
+                for measure in measure_list:
+                    log.debug("Measure: %s", measure)
+                    metric = Metric(nsr_id, vnf_member_index, '', measure['key'], float(measure['value']))
+                    metrics.append(metric)
+        return metrics
+
+    def get_vca_deployment_info(self, nsr_id, vnf_member_index, vdur_name):
+        nsr = self.common_db.get_nsr(nsr_id)
+        for vca_deployment in nsr["_admin"]["deployed"]["VCA"]:
+            if vca_deployment:
+                if vca_deployment['member-vnf-index'] == vnf_member_index and vca_deployment['vdu_name'] == vdur_name:
+                    return vca_deployment
+        raise VcaDeploymentInfoNotFound("VCA deployment info for nsr_id {}, index {} and vdur_name {} not found."
+                                        .format(nsr_id, vnf_member_index, vdur_name))