X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_common%2Fdbmongo.py;h=5334ef91ecbcadc00dc3930cdc32c421a21ee905;hb=d63ea273e23c9e1350ed300872f703faf4ddc3c7;hp=6159e6a3a306670258ef24d425562a9700740886;hpb=89e933d55a1bcaabfed140d09aea97d90df9398d;p=osm%2Fcommon.git

diff --git a/osm_common/dbmongo.py b/osm_common/dbmongo.py
index 6159e6a..5334ef9 100644
--- a/osm_common/dbmongo.py
+++ b/osm_common/dbmongo.py
@@ -80,8 +80,8 @@ class DbMongo(DbBase):
             master_key = config.get("commonkey") or config.get("masterpassword")
             if master_key:
                 self.set_secret_key(master_key)
-            if config.get("url"):
-                self.client = MongoClient(config["url"])
+            if config.get("uri"):
+                self.client = MongoClient(config["uri"])
             else:
                 self.client = MongoClient(config["host"], config["port"])
             # TODO add as parameters also username=config.get("user"), password=config.get("password"))
@@ -306,7 +306,7 @@ class DbMongo(DbBase):
         except Exception as e:  # TODO refine
             raise DbException(e)
 
-    def set_one(self, table, q_filter, update_dict, fail_on_empty=True):
+    def set_one(self, table, q_filter, update_dict, fail_on_empty=True, unset=None, pull=None, push=None):
         """
         Modifies an entry at database
         :param table: collection or table
@@ -314,12 +314,28 @@ class DbMongo(DbBase):
         :param update_dict: Plain dictionary with the content to be updated. It is a dot separated keys and a value
         :param fail_on_empty: If nothing matches filter it returns None unless this flag is set tu True, in which case
         it raises a DbException
+        :param unset: Plain dictionary with the content to be removed if exist. It is a dot separated keys, value is
+                      ignored. If not exist, it is ignored
+        :param pull: Plain dictionary with the content to be removed from an array. It is a dot separated keys and value
+                     if exist in the array is removed. If not exist, it is ignored
+        :param push: Plain dictionary with the content to be appended to an array. It is a dot separated keys and value
+                     is appended to the end of the array
         :return: Dict with the number of entries modified. None if no matching is found.
         """
         try:
+            db_oper = {}
+            if update_dict:
+                db_oper["$set"] = update_dict
+            if unset:
+                db_oper["$unset"] = unset
+            if pull:
+                db_oper["$pull"] = pull
+            if push:
+                db_oper["$push"] = push
+
             with self.lock:
                 collection = self.db[table]
-                rows = collection.update_one(self._format_filter(q_filter), {"$set": update_dict})
+                rows = collection.update_one(self._format_filter(q_filter), db_oper)
             if rows.matched_count == 0:
                 if fail_on_empty:
                     raise DbException("Not found any {} with filter='{}'".format(table[:-1], q_filter),