ITS#10278 Port testsuite to python-ldap

diff --git a/tests/python/backends.py b/tests/python/backends.py
index cc36dbd03d1e2b6f9df0d5a7ce3318cb9e6d168d..748de6feca6c3fed631d5fad174872392068871e 100755 (executable)
--- a/tests/python/backends.py
+++ b/tests/python/backends.py
@@ -20,7 +20,7 @@
 OpenLDAP fixtures for backends
 """
 
-import ldap0
+import ldap
 import logging
 import os
 import pathlib
@@ -28,7 +28,7 @@ import pytest
 import secrets
 import tempfile
 
-from ldap0.controls.readentry import PostReadControl
+from ldap.controls.readentry import PostReadControl
 
 from .slapd import server
 
@@ -62,10 +62,11 @@ class Database:
         # We're just after the generated DN, no other attributes at the moment
         control = PostReadControl(True, [])
 
-        result = conn.add_s(
-            f"olcDatabase={backend},cn=config", self._entry(),
-            req_ctrls=[control])
-        dn = result.ctrls[0].res.dn_s
+        _, _, _, ctrls = conn.add_ext_s(
+            f"olcDatabase={backend},cn=config",
+            list(self._entry().items()),
+            serverctrls=[control])
+        dn = ctrls[0].dn
 
         self.dn = dn
         server.suffixes[suffix] = self

diff --git a/tests/python/overlays.py b/tests/python/overlays.py
index 74e659e071437c9d1e2ae9fb0f2662ee67846272..bd6266418f23711130926472f40f2c3b0e080c06 100755 (executable)
--- a/tests/python/overlays.py
+++ b/tests/python/overlays.py
@@ -24,7 +24,7 @@ import logging
 import os
 import pathlib
 
-from ldap0.controls.readentry import PostReadControl
+from ldap.controls.readentry import PostReadControl
 
 
 SOURCEROOT = pathlib.Path(os.environ.get('TOP_SRCDIR', "..")).absolute()
@@ -53,10 +53,11 @@ class Overlay:
         # We're just after the generated DN, no other attributes at the moment
         control = PostReadControl(True, [])
 
-        result = conn.add_s(
-            f"olcOverlay={overlay_name},{database.dn}", self._entry(),
-            req_ctrls=[control])
-        self.dn = result.ctrls[0].res.dn_s
+        _, _, _, ctrls = conn.add_ext_s(
+            f"olcOverlay={overlay_name},{database.dn}",
+            list(self._entry().items()),
+            serverctrls=[control])
+        self.dn = ctrls[0].dn
 
         if order == -1:
             database.overlays.append(self)

diff --git a/tests/python/slapd.py b/tests/python/slapd.py
index 9ad2ca433f845823981206f72eb221238184dff1..e7cbff229f586e8a68bbd1a502ad2d7250bf0428 100755 (executable)
--- a/tests/python/slapd.py
+++ b/tests/python/slapd.py
@@ -20,7 +20,7 @@
 OpenLDAP server fixtures
 """
 
-import ldap0
+import ldap
 import ldapurl
 import logging
 import os
@@ -34,7 +34,7 @@ import subprocess
 import tempfile
 import textwrap
 
-from ldap0.ldapobject import LDAPObject
+from ldap.ldapobject import LDAPObject
 
 
 SOURCEROOT = pathlib.Path(os.environ.get('TOP_SRCDIR', "..")).absolute()
@@ -208,12 +208,13 @@ class Server:
         conn.simple_bind_s('cn=config', self.secret)
 
         moduleload_object = None
-        for entry in conn.search_s('cn=config', ldap0.SCOPE_SUBTREE,
+        for dn, attrs in conn.search_s('cn=config', ldap.SCOPE_SUBTREE,
                                    'objectclass=olcModuleList',
                                    ['olcModuleLoad']):
             if not moduleload_object:
-                moduleload_object = entry.dn_s
-            for value in entry.entry_s.get('olcModuleLoad', []):
+                moduleload_object = dn
+            for value in attrs.get('olcModuleLoad', []):
+                value = value.decode()
                 if value[0] == '{':
                     value = value[value.find('}')+1:]
                 if pathlib.Path(value).stem == module_name:
@@ -224,11 +225,11 @@ class Server:
         if moduleload_object:
             conn.modify_s(
                 moduleload_object,
-                [(ldap0.MOD_ADD, b'olcModuleLoad', [str(module).encode()])])
+                [(ldap.MOD_ADD, 'olcModuleLoad', [str(module).encode()])])
         else:
-            conn.add_s('cn=module,cn=config',
-                       {'objectClass': [b'olcModuleList'],
-                        'olcModuleLoad': [str(module).encode()]})
+            entry = {'objectClass': [b'olcModuleList'],
+                     'olcModuleLoad': [str(module).encode()]}
+            conn.add_s('cn=module,cn=config', list(entry.items()))
 
     @property
     def uri(self):
@@ -292,4 +293,4 @@ def server(server_factory):
 
 def test_rootdse(server):
     conn = server.connect()
-    conn.search_s("", scope=ldap0.SCOPE_BASE)
+    conn.search_s("", scope=ldap.SCOPE_BASE)

diff --git a/tests/python/syncrepl.py b/tests/python/syncrepl.py
index d3475d60935f9a2821ea26f5f77c4f90fbf99b56..32eb3bfd33e2c5ccb6b5c3068ea89bfcc3d671a1 100755 (executable)
--- a/tests/python/syncrepl.py
+++ b/tests/python/syncrepl.py
@@ -20,7 +20,7 @@
 OpenLDAP fixtures for overlays
 """
 
-import ldap0
+import ldap
 import logging
 import os
 import pathlib
@@ -86,7 +86,7 @@ def mmr(request, server_factory):
         conn.simple_bind_s("cn=config", server.secret)
 
         conn.modify_s("cn=config", [
-                (ldap0.MOD_REPLACE, b"olcServerId", [str(serverid).encode()])])
+                (ldap.MOD_REPLACE, "olcServerId", [str(serverid).encode()])])
 
         server.serverid = serverid
         servers[serverid] = server
@@ -110,8 +110,8 @@ def mmr(request, server_factory):
                 f'binddn="{db.suffix}" credentials="{db.secret}"').encode())
 
         connections[serverid].modify_s(db.dn, [
-            (ldap0.MOD_REPLACE, b"olcSyncrepl", syncrepl),
-            (ldap0.MOD_REPLACE, b"olcMultiprovider", [b"TRUE"])])
+            (ldap.MOD_REPLACE, "olcSyncrepl", syncrepl),
+            (ldap.MOD_REPLACE, "olcMultiprovider", [b"TRUE"])])
 
     yield servers
 
@@ -142,27 +142,29 @@ def test_mmr(mmr):
         conn.simple_bind_s(db.rootdn, db.secret)
 
         if not entries_added:
-            conn.add_s(suffix, {
+            entry = {
                 "objectClass": [b"organization",
                                 b"domainRelatedObject",
                                 b"dcobject"],
                 "o": [b"Example, Inc."],
-                "associatedDomain": [b"example.com"]})
+                "associatedDomain": [b"example.com"]}
+            conn.add_s(suffix, list(entry.items()))
             entries_added.add(suffix)
             # Make sure all hosts have the suffix entry
             wait_for_resync(suffix, mmr.values())
 
         dn = f"cn=entry{serverid},{suffix}"
-        conn.add_s(dn, {"objectClass": [b"device"],
-                        "description": [(f"Entry created on serverid "
-                                         f"{serverid}").encode()]})
+        entry = {"objectClass": [b"device"],
+                 "description": [(f"Entry created on serverid "
+                                  f"{serverid}").encode()]}
+        conn.add_s(dn, list(entry.items()))
         entries_added.add(dn)
         connections.append(conn)
 
     wait_for_resync(suffix, mmr.values())
 
     for conn in connections:
-        result = conn.search_s(suffix, ldap0.SCOPE_SUBTREE, attrlist=['1.1'])
-        dns = {entry.dn_s for entry in result}
+        result = conn.search_s(suffix, ldap.SCOPE_SUBTREE, attrlist=['1.1'])
+        dns = {dn for dn, entry in result}
         assert dns == entries_added, \
                 f"Server {serverid} contents do not match expectations"