X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fvio.py;h=e84f5e77682ddf3d1db36616d00060f89451aaad;hb=09bcf03e83c5863c3c0bcf47a457e70162fca94e;hp=ada6be63e724715eea51253f7d48b2f9ceb9ebcf;hpb=416a753c60f1ba9545f4aa36fb45e1730046e4b2;p=osm%2FMON.git

diff --git a/osm_mon/collector/vnf_collectors/vio.py b/osm_mon/collector/vnf_collectors/vio.py
index ada6be6..e84f5e7 100644
--- a/osm_mon/collector/vnf_collectors/vio.py
+++ b/osm_mon/collector/vnf_collectors/vio.py
@@ -48,6 +48,15 @@ class VIOCollector(BaseVimCollector):
         vnfd = self.common_db.get_vnfd(vnfr['vnfd-id'])
         vdu_mappings = {}
 
+        # Populate extra tags for metrics
+        nsr_id = vnfr['nsr-id-ref']
+        tags = {}
+        tags['ns_name'] = self.common_db.get_nsr(nsr_id)['name']
+        if vnfr['_admin']['projects_read']:
+            tags['project_id'] = vnfr['_admin']['projects_read'][0]
+        else:
+            tags['project_id'] = ''
+
         # Fetch the list of all known resources from vROPS.
         resource_list = self.vrops.get_vm_resource_list_from_vrops()
 
@@ -59,7 +68,7 @@ class VIOCollector(BaseVimCollector):
             vdu = next(
                 filter(lambda vdu: vdu['id'] == vdur['vdu-id-ref'], vnfd['vdu'])
             )
-            if 'monitoring-param' not in vdu:
+            if 'monitoring-parameter' not in vdu:
                 continue
 
             vim_id = vdur['vim-id']
@@ -75,7 +84,9 @@ class VIOCollector(BaseVimCollector):
 
         if len(vdu_mappings) != 0:
             return self.vrops.get_metrics(vdu_mappings=vdu_mappings,
-                                          monitoring_params=vdu['monitoring-param'],
-                                          vnfr=vnfr)
+                                          monitoring_params=vdu['monitoring-parameter'],
+                                          vnfr=vnfr,
+                                          tags=tags
+                                          )
         else:
             return []