Removed activate user function and some error fixes.

examples/set_permissions.py

@@ -32,7 +32,6 @@ pycaosdb.ini configuration can create new entities.
 
 import caosdb as db
 from caosdb import administration as admin
-from caosdb.utils.caosdb_admin import do_activate_user, do_retrieve_user, do_retrieve_role, do_create_role, do_add_user_roles, do_retrieve_user_roles
 
 
 def assert_user_and_role():
@@ -48,35 +47,35 @@ out : tuple
 
     """
     try:
-        human_user = do_retrieve_user(user_name="jane")
-        do_activate_user(user_name="jane")
+        human_user = admin._retrieve_user("jane")
+        admin._update_user(name="jane", status="ACTIVE")
     except db.HTTPResourceNotFoundError:
         human_user = admin._insert_user(
             "jane", password="Human_Rememberable_Password_1234", status="ACTIVE")
 
     try:
-        alien_user = do_retrieve_user(user_name="xaxys")
-        do_activate_user(user_name="jane")
+        alien_user = admin._retrieve_user("xaxys")
+        admin._update_user(name="xaxys", status="ACTIVE")
     except db.HTTPResourceNotFoundError:
         alien_user = admin._insert_user("xaxys", password="4321_Syxax",
                                         status="ACTIVE")
 
     # At the moment, the return value is only "ok" for successful insertions.
     try:
-        human_role = do_retrieve_role(role_name="human")
+        human_role = admin._retrieve_role("human")
     except db.HTTPResourceNotFoundError:
-        human_role = do_create_role(role_name="human", role_description="An Earthling.")
+        human_role = admin._insert_role("human", "An Earthling.")
 
     try:
-        alien_role = do_retrieve_role(role_name="alien")
+        alien_role = admin._retrieve_role("alien")
     except db.HTTPResourceNotFoundError:
-        alien_role = do_create_role(role_name="alien", role_description="An Extra-terrestrial.")
+        alien_role = admin._insert_role("alien", "An Extra-terrestrial.")
 
-    do_add_user_roles(user_name="jane", user_roles=["human"])
-    do_add_user_roles(user_name="xaxys", user_roles=["alien"])
+    admin._set_roles("jane", ["human"])
+    admin._set_roles("xaxys", ["alien"])
 
-    return (("jane", list(do_retrieve_user_roles(user_name="jane"))),
-            ("xaxys", list(do_retrieve_user_roles(user_name="xaxys"))))
+    return (("jane", list(admin._get_roles("jane"))),
+            ("xaxys", list(admin._get_roles("xaxys"))))
 
 
 def get_entities(count=1):
@@ -202,10 +201,10 @@ None
         print("Retrieval of all entities was successfully denied.")
 
 
-def create_entities():
+def create_test_entities():
     """Create some test entities.
-    After calling this function, there will be an RecordType "Human Food" with the corresponding Records
-    "Bread", "Tomatoes", and "Twinkies".
+    After calling this function, there will be a RecordType "Human Food" with the corresponding Records
+    "Bread", "Tomatoes", and "Twinkies" inserted in the database.
     """
     rt = db.RecordType(name="Human Food", description="Food that can be eaten only by humans").insert()
     food = ("Bread", "Tomatoes", "Twinkies")
@@ -222,6 +221,8 @@ def create_entities():
 def main():
     """The main function of this script."""
 
+    """Create some test entities"""
+    create_test_entities()
     """Create new users"""
     human, alien = assert_user_and_role()
     """Load the newly created entities."""
@@ -235,4 +236,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-    # create_entities()