X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fvnf_collectors%2Fvmware.py;h=b974d76ee42d83bd3421f3b1c00ef49a1e0a18ed;hb=73dbb4e243f47afef0d1bb61988608e256939e87;hp=0070b564773ce5895fdf2b872b12eacb44f3f641;hpb=416a753c60f1ba9545f4aa36fb45e1730046e4b2;p=osm%2FMON.git

diff --git a/osm_mon/collector/vnf_collectors/vmware.py b/osm_mon/collector/vnf_collectors/vmware.py
index 0070b56..b974d76 100644
--- a/osm_mon/collector/vnf_collectors/vmware.py
+++ b/osm_mon/collector/vnf_collectors/vmware.py
@@ -90,14 +90,10 @@ class VMwareCollector(BaseVimCollector):
 
         vim_config = vim_account_info['config']
         vim_account['admin_username'] = vim_config['admin_username']
-        vim_account['admin_password'] = self.common_db.decrypt_vim_password(vim_config['admin_password'],
-                                                                            vim_account_info['schema_version'],
-                                                                            vim_account_id)
+        vim_account['admin_password'] = vim_config['admin_password']
         vim_account['vrops_site'] = vim_config['vrops_site']
         vim_account['vrops_user'] = vim_config['vrops_user']
-        vim_account['vrops_password'] = self.common_db.decrypt_vim_password(vim_config['vrops_password'],
-                                                                            vim_account_info['schema_version'],
-                                                                            vim_account_id)
+        vim_account['vrops_password'] = vim_config['vrops_password']
 
         return vim_account
 
@@ -184,6 +180,15 @@ 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']
+        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()
 
@@ -218,6 +223,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 []