X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Fcommon%2Fcommon_db_client.py;h=9ec183ae0d8a1aca5001dea277f9fe4bb642430c;hb=refs%2Ftags%2Frelease-v9.0-start;hp=2be3693cb53bd7c5ada5b828dfc923d1378c14bf;hpb=28d5e049e96472f4482b4c6ae59b818b889abe47;p=osm%2FPOL.git

diff --git a/osm_policy_module/common/common_db_client.py b/osm_policy_module/common/common_db_client.py
index 2be3693..9ec183a 100644
--- a/osm_policy_module/common/common_db_client.py
+++ b/osm_policy_module/common/common_db_client.py
@@ -21,27 +21,32 @@
 # For those usages not covered by the Apache License, Version 2.0 please
 # contact: bdiaz@whitestack.com or glavado@whitestack.com
 ##
-from osm_common import dbmongo
+from osm_common import dbmongo, dbmemory
 
 from osm_policy_module.core.config import Config
 from osm_policy_module.core.exceptions import VdurNotFound
 
 
 class CommonDbClient:
-    def __init__(self):
-        cfg = Config.instance()
-        self.common_db = dbmongo.DbMongo()
-        self.common_db.db_connect({'uri': cfg.OSMPOL_DATABASE_URI,
-                                   'name': 'osm'})
+    def __init__(self, config: Config):
+        if config.get('database', 'driver') == "mongo":
+            self.common_db = dbmongo.DbMongo()
+        elif config.get('database', 'driver') == "memory":
+            self.common_db = dbmemory.DbMemory()
+        else:
+            raise Exception("Unknown database driver {}".format(config.get('section', 'driver')))
+        self.common_db.db_connect(config.get("database"))
 
-    def get_vnfr(self, nsr_id: str, member_index: int):
+    def get_vnfr(self, nsr_id: str, member_index: str):
         vnfr = self.common_db.get_one("vnfrs",
-                                      {"nsr-id-ref": nsr_id, "member-vnf-index-ref": str(member_index)})
+                                      {"nsr-id-ref": nsr_id, "member-vnf-index-ref": member_index})
         return vnfr
 
     def get_vnfrs(self, nsr_id: str):
-        return [self.get_vnfr(nsr_id, member['member-vnf-index']) for member in
-                self.get_nsr(nsr_id)['nsd']['constituent-vnfd']]
+        # TODO: Change for multiple DF support
+        nsr_nsd_df = self.get_nsr(nsr_id)['nsd'].get('df', [{}])[0]
+        all_nsd_member_vnf_index = [vnf.get('id') for vnf in nsr_nsd_df.get('vnf-profile', [])]
+        return [self.get_vnfr(nsr_id, member_index) for member_index in all_nsd_member_vnf_index]
 
     def get_vnfd(self, vnfd_id: str):
         vnfr = self.common_db.get_one("vnfds",
@@ -65,3 +70,6 @@ class CommonDbClient:
                 return vdur
         raise VdurNotFound('vdur not found for nsr-id %s, member_index %s and vdur_name %s', nsr_id, member_index,
                            vdur_name)
+
+    def create_nslcmop(self, nslcmop):
+        self.common_db.create("nslcmops", nslcmop)