X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fvmware.py;fp=osm_mon%2Fcollector%2Fvnf_collectors%2Fvmware.py;h=0e76bfd7c6e306a310d5bf57e4cd766d0db20cc1;hb=a69f2725ddb055a25570deb1f2a14d28ff38314e;hp=0070b564773ce5895fdf2b872b12eacb44f3f641;hpb=64be55a41f7a4290aefed6b2fbcbe47f5f27624f;p=osm%2FMON.git

diff --git a/osm_mon/collector/vnf_collectors/vmware.py b/osm_mon/collector/vnf_collectors/vmware.py
index 0070b56..0e76bfd 100644
--- a/osm_mon/collector/vnf_collectors/vmware.py
+++ b/osm_mon/collector/vnf_collectors/vmware.py
@@ -184,6 +184,12 @@ class VMwareCollector(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']
+        tags['project_id'] = vnfr['_admin']['projects_read'][0]
+
         # Fetch the list of all known resources from vROPS.
         resource_list = self.vrops.get_vm_resource_list_from_vrops()
 
@@ -218,6 +224,8 @@ class VMwareCollector(BaseVimCollector):
         if len(vdu_mappings) != 0:
             return self.vrops.get_metrics(vdu_mappings=vdu_mappings,
                                           monitoring_params=vdu['monitoring-param'],
-                                          vnfr=vnfr)
+                                          vnfr=vnfr,
+                                          tags=tags
+                                          )
         else:
             return []