update unit tests

Author: alainabbas

src/bin/activation.py

@@ -1,54 +1,27 @@
 #!/usr/bin/python3
 import sys
 sys.path.append('../lib')
-import backend_ldap_utils as u
-import ldap
+import backend_ldap_utils as ldap
+import backend_utils as u
 import argparse
 
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('--active', help='0 | 1 ', default='1')
     args = parser.parse_args()
     json=u.readjsoninput()
-    u.readconfig('../etc/config.conf')
+    config=u.read_config('../etc/config.conf')
+    ldap.set_config(config)
     if  u.is_backend_concerned(json) == False:
-        print(u.returncode(0, "Not concerned"))
+        print(u.returncode(0, "not concerned"))
         exit(0)
-    l=u.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
-    if u.config('disabledAttribute','') == '':
-        print(u.returncode(1,'attribut non trouvé : disabledAttribute'))
-        exit(1)
-    r=u.search_entity(l,json)
-    if len(r) ==0:
-        print(u.returncode(1,'Entrée LDAP non trouvée'))
-        exit(1)
-    ldif=[]
-    #verification si l object class est present
-    add_obj_class=u.config('additionnalObjectClass').encode()
-    present= False
-    objectclass=r[0][1]['objectClass']
-    for obj in objectclass:
-        if obj == add_obj_class:
-            present=True
-    if not present:
-        objectclass.append(add_obj_class)
-        ldif.append((ldap.MOD_REPLACE,'objectClass',objectclass))
-    message=""
-    if args.active == "1" :
-        attribute=u.config('disabledAttribute')
-        v=u.config('enableValue')
-        ldif.append((ldap.MOD_REPLACE, u.config('disabledAttribute'), u.config('enableValue').encode('utf-8')))
-        message="OK compte actif"
+    l=ldap.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
+    if args.active == "1":
+        ret=ldap.activate_entry(l,json,True)
     else:
-        ldif.append((ldap.MOD_REPLACE, u.config('disabledAttribute'), u.config('disableValue').encode('utf-8')))
-        message = "OK compte inactif"
-    try:
-        l.modify_s(r[0][0], ldif)
-    except ldap.LDAPError as e:
-        e_dict = e.args[0]
-        print(u.returncode(1, str(e_dict.get("result")) + ' ' + e_dict.get("desc")))
-        exit(1)
+        ret = ldap.activate_entry(l, json, False)
+    print(ret)
+    exit(0)
 
-    print(u.returncode(0, message))
 if __name__ == '__main__':
     main()

src/bin/changepwd.py

@@ -1,15 +1,19 @@
 #!/usr/bin/python3
 import sys
 sys.path.append('../lib')
-import backend_ldap_utils as u
-
-
+import backend_ldap_utils as ldap
+import backend_utils as u
+import json
 def main():
-    json=u.readjsoninput()
-    config= u.readconfig('../etc/config.conf')
-    if u.is_backend_concerned(json):
-        l=u.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
-        print(u.change_entity_password(l,json))
+    js=u.readjsoninput()
+    config= u.read_config('../etc/config.conf')
+    ldap.set_config(config)
+    if u.is_backend_concerned(js):
+        l=ldap.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
+        ret=ldap.change_entity_password(l,js)
+        result=json.loads(ret)
+        print(ret)
+        exit(result['status'])
     else:
         print(u.returncode(0,'not concerned'))
 

src/bin/delentity.py

@@ -1,16 +1,17 @@
 #!/usr/bin/python3
 import sys
 sys.path.append('../lib')
-import backend_ldap_utils as u
-
+import backend_ldap_utils as ldap
+import backend_utils as u
 def main():
     json=u.readjsoninput()
-    u.readconfig('../etc/config.conf')
+    config=u.read_config('../etc/config.conf')
+    ldap.set_config(config)
     if u.is_backend_concerned(json):
-        l=u.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
-        print(u.delete_entity(l,json))
+        l=ldap.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
+        print(ldap.delete_entity(l,json))
     else:
-        print(u.returncode(0, "Not concerned"))
+        print(u.returncode(0, "not concerned"))
 
 if __name__ == '__main__':
     main()

src/bin/ping.py

@@ -2,12 +2,13 @@
 import sys
 
 sys.path.append('../lib')
-import backend_ldap_utils as u
-
+import backend_ldap_utils as ldap
+import backend_utils as u
 def main():
-    u.readconfig('../etc/config.conf')
-    l = u.connect_ldap(u.config('host'), u.config('dn'), u.config('password'))
-    print(u.returncode(0,'server alive'))
+    config=u.read_config('../etc/config.conf')
+    ldap.set_config(config)
+    l = ldap.connect_ldap(u.config('host'), u.config('dn'), u.config('password'))
+    print(u.returncode(0,'I m alive'))
     return 0
 
 

src/bin/resetpwd.py

@@ -1,15 +1,16 @@
 #!/usr/bin/python3
 import sys
 sys.path.append('../lib')
-import backend_ldap_utils as u
-
+import backend_ldap_utils as ldap
+import backend_utils as u
 
 def main():
     json=u.readjsoninput()
-    u.readconfig('../etc/config.conf')
+    config=u.read_config('../etc/config.conf')
+    ldap.set_config(config)
     if u.is_backend_concerned(json):
-        l=u.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
-        print(u.reset_entity_password(l,json))
+        l=ldap.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
+        print(ldap.reset_entity_password(l,json))
     else:
         print(u.returncode(0,'not concerned'))
 

src/bin/upsertidentity.py

@@ -1,14 +1,17 @@
 #!/usr/bin/python3
 import sys
 sys.path.append('../lib')
-import backend_ldap_utils as u
+import backend_utils as u
+import backend_ldap_utils as ldap
+
 
 def main():
     json=u.readjsoninput()
-    u.readconfig('../etc/config.conf')
+    config=u.read_config('../etc/config.conf')
+    ldap.set_config(config)
     if u.is_backend_concerned(json):
-        l=u.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
-        print(u.upsert_entry(l,json))
+        l=ldap.connect_ldap(u.config('host'),u.config('dn'),u.config('password'))
+        print(ldap.upsert_entry(l,json))
     else:
         print(u.returncode(0,'not concerned'))