Collect null project_ids as empty strings

[osm/MON.git] / osm_mon / collector / infra_collectors / vmware.py

diff --git a/osm_mon/collector/infra_collectors/vmware.py b/osm_mon/collector/infra_collectors/vmware.py
index c5db5ec..6accd65 100644 (file)
--- a/osm_mon/collector/infra_collectors/vmware.py
+++ b/osm_mon/collector/infra_collectors/vmware.py
@@ -92,17 +92,15 @@ class VMwareInfraCollector(BaseVimInfraCollector):
         vim_account['vim_type'] = vim_account_info['vim_type']
         vim_account['vim_url'] = vim_account_info['vim_url']
         vim_account['org_user'] = vim_account_info['vim_user']
-        vim_account['org_password'] = self.common_db.decrypt_vim_password(vim_account_info['vim_password'],
-                                                                          vim_account_info['schema_version'],
-                                                                          vim_account_id)
         vim_account['vim_uuid'] = vim_account_info['_id']
-        vim_account['project_id'] = vim_account_info['_admin']['projects_read'][0]
+        if vim_account_info['_admin']['projects_read']:
+            vim_account['project_id'] = vim_account_info['_admin']['projects_read'][0]
+        else:
+            vim_account['project_id'] = ''
 
         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']
 
         if vim_config['orgname'] is not None:
             vim_account['orgname'] = vim_config['orgname']
@@ -186,7 +184,10 @@ class VMwareInfraCollector(BaseVimInfraCollector):
             nsr_id = vnfr['nsr-id-ref']
             ns_name = self.common_db.get_nsr(nsr_id)['name']
             vnf_member_index = vnfr['member-vnf-index-ref']
-            vnfr_project_id = vnfr['_admin']['projects_read'][0]
+            if vnfr['_admin']['projects_read']:
+                vnfr_project_id = vnfr['_admin']['projects_read'][0]
+            else:
+                vnfr_project_id = ''
             for vdur in vnfr['vdur']:
                 resource_uuid = vdur['vim-id']
                 tags = {