Revert "Migrates alarms to MongoDB"

[osm/MON.git] / osm_mon / core / common_db.py

diff --git a/osm_mon/core/common_db.py b/osm_mon/core/common_db.py
index 88a509c..8f2f552 100644 (file)
--- a/osm_mon/core/common_db.py
+++ b/osm_mon/core/common_db.py
@@ -55,9 +55,20 @@ class CommonDbClient:
         return vnfrs
 
     def get_vnfd(self, vnfd_id: str):
-        vnfr = self.common_db.get_one("vnfds",
+        vnfd = self.common_db.get_one("vnfds",
                                       {"_id": vnfd_id})
-        return vnfr
+        return vnfd
+
+    def get_vnfd_by_name(self, vnfd_name: str):
+        # TODO: optimize way of getting single VNFD in shared enviroments (RBAC)
+        if self.common_db.get_list("vnfds", {"name": vnfd_name}):
+            vnfd = self.common_db.get_list("vnfds", {"name": vnfd_name})[0]
+            return vnfd
+        else:
+            return None
+
+    def get_nsrs(self):
+        return self.common_db.get_list('nsrs')
 
     def get_nsr(self, nsr_id: str):
         nsr = self.common_db.get_one("nsrs",
@@ -102,11 +113,12 @@ class CommonDbClient:
         vim_config_encrypted = vim_config_encrypted_dict['default']
         if vim_account['schema_version'] in vim_config_encrypted_dict.keys():
             vim_config_encrypted = vim_config_encrypted_dict[vim_account['schema_version']]
-        for key in vim_account['config']:
-            if key in vim_config_encrypted:
-                vim_account['config'][key] = self.decrypt_vim_password(vim_account['config'][key],
-                                                                       vim_account['schema_version'],
-                                                                       vim_account_id)
+        if 'config' in vim_account:
+            for key in vim_account['config']:
+                if key in vim_config_encrypted:
+                    vim_account['config'][key] = self.decrypt_vim_password(vim_account['config'][key],
+                                                                           vim_account['schema_version'],
+                                                                           vim_account_id)
         return vim_account
 
     def get_sdncs(self):
@@ -114,3 +126,9 @@ class CommonDbClient:
 
     def get_sdnc(self, sdnc_id: str):
         return self.common_db.get_one('sdns', {'_id': sdnc_id})
+
+    def get_projects(self):
+        return self.common_db.get_list('projects')
+
+    def get_project(self, project_id: str):
+        return self.common_db.get_one('projects', {'_id': project_id})