Merge pull request #7985 from DIRACGridBot/cherry-pick-2-07c6ead9f-in…

…tegration

[sweep:integration] fix: removed elastic in favor of opensearch client

environment.yml

@@ -17,8 +17,6 @@ dependencies:
   - cmreshandler >1.0.0b4
   - cwltool
   - db12
-  - elasticsearch <7.14
-  - elasticsearch-dsl
   - opensearch-py
   - fts3
   - gitpython >=2.1.0

setup.cfg

@@ -71,8 +71,7 @@ server =
     # (it just installs into site-packages)
     # arc
     CMRESHandler
-    elasticsearch <7.14
-    elasticsearch_dsl
+    opensearch-py
     GitPython
     ldap3
     apache-libcloud

src/DIRAC/Core/Utilities/ElasticSearchDB.py

@@ -11,39 +11,22 @@
 from urllib import parse as urlparse
 
 import certifi
+from opensearchpy import OpenSearch as Elasticsearch
+from opensearchpy.exceptions import (
+    ConflictError,
+    NotFoundError,
+    RequestError,
+    TransportError,
+)
+from opensearchpy.exceptions import (
+    ConnectionError as ElasticConnectionError,
+)
+from opensearchpy.helpers import BulkIndexError, bulk
 
 try:
-    from opensearchpy import OpenSearch as Elasticsearch
-    from opensearchpy.exceptions import (
-        ConflictError,
-        NotFoundError,
-        RequestError,
-        TransportError,
-    )
-    from opensearchpy.exceptions import (
-        ConnectionError as ElasticConnectionError,
-    )
-    from opensearchpy.helpers import BulkIndexError, bulk
+    from opensearchpy import A, Q, Search
 except ImportError:
-    from elasticsearch import Elasticsearch
-    from elasticsearch.exceptions import (
-        ConflictError,
-        NotFoundError,
-        RequestError,
-        TransportError,
-    )
-    from elasticsearch.exceptions import (
-        ConnectionError as ElasticConnectionError,
-    )
-    from elasticsearch.helpers import BulkIndexError, bulk
-
-try:
-    try:
-        from opensearchpy import A, Q, Search
-    except ImportError:
-        from opensearch_dsl import A, Q, Search
-except ImportError:
-    from elasticsearch_dsl import A, Q, Search
+    from opensearch_dsl import A, Q, Search
 
 
 from DIRAC import S_ERROR, S_OK, gLogger