Merge branch 'master' into data_partition_id_TO_authority_in_kind

build/Dockerfile

@@ -14,8 +14,9 @@
 
 FROM python:3.7-slim-buster
 
-COPY requirements.txt requirements_dev.txt ./
+COPY requirements.txt requirements_dev.txt frozenrequirements.txt ./
 
+RUN pip install -r frozenrequirements.txt
 RUN pip install -r requirements.txt
 RUN pip install -r requirements_dev.txt
 

frozenrequirements.txt

+adal==1.2.7
+adlfs==0.7.4
 aiohttp==3.6.2
 aioredis==1.3.1
 async-timeout==3.0.1
 attrs==20.3.0
 azure-common==1.1.27
 azure-core==1.13.0
+azure-datalake-store==0.0.52
 azure-identity==1.5.0
 azure-keyvault==4.1.0
 azure-keyvault-certificates==4.2.1
@@ -18,18 +21,25 @@ certifi==2020.12.5
 cffi==1.14.5
 chardet==3.0.4
 click==7.1.2
+cloudpickle==1.6.0
 coverage==5.5
 cryptography==3.4.7
+dask==2021.4.1
 decorator==5.0.7
+distributed==2021.4.1
 fastapi==0.63.0
+fsspec==2021.4.0
+gcsfs==2021.4.0
 google-api-core==1.26.3
 google-auth==1.28.1
+google-auth-oauthlib==0.4.4
 google-cloud-core==1.6.0
 google-cloud-monitoring==0.36.0
 google-cloud-trace==0.24.0
 googleapis-common-protos==1.53.0
 grpcio==1.37.0
 h11==0.12.0
+HeapDict==1.0.1
 hiredis==2.0.0
 httpcore==0.12.3
 httpx==0.17.1
@@ -41,9 +51,11 @@ jmespath==0.10.0
 JSONBender==0.9.3
 jsonpath-ng==1.5.2
 jsonschema==3.2.0
+locket==0.2.1
 mock==4.0.3
 msal==1.11.0
 msal-extensions==0.3.0
+msgpack==1.0.2
 msrest==0.6.21
 multidict==4.7.6
 munch==2.5.0
@@ -68,6 +80,7 @@ osdu-data-ecosystem-storage==1.1.0
 osdu-log-recognition-lib==0.0.9
 packaging==20.9
 pandas==1.1.2
+partd==1.2.0
 pluggy==0.13.1
 ply==3.11
 portalocker==1.7.1
@@ -92,6 +105,7 @@ python-dateutil==2.8.1
 python-multipart==0.0.5
 python-rapidjson==1.0
 pytz==2021.1
+PyYAML==5.4.1
 requests==2.25.1
 requests-oauthlib==1.3.0
 rfc3986==1.4.0
@@ -99,12 +113,17 @@ rsa==4.7.2
 s3transfer==0.3.7
 six==1.15.0
 sniffio==1.2.0
+sortedcontainers==2.3.0
 starlette==0.13.6
 structlog==21.1.0
+tblib==1.7.0
 toml==0.10.2
+toolz==0.11.1
+tornado==6.1
 typing-extensions==3.7.4.3
 urllib3==1.26.4
 uvicorn==0.13.4
 xmltodict==0.11.0
 yarl==1.6.3
+zict==2.0.0
 zipp==3.4.1

tests/integration/functional/tests/test_dips.py

@@ -17,6 +17,8 @@ from .fixtures import with_wdms_env
 from ..request_builders.wdms.crud.dips import *
 from jsonschema import validate
 
+from ..request_builders.wdms.crud.log import build_request_get_log
+
 new_parameters_env = {'authorityKind': 'slb',
                       'prefix_data_entity_name': 'wdms_e2e_osdu' }
 
@@ -174,6 +176,22 @@ def test_create_dips(get_env):
 
     assert result.response.json() == expected_dips
 
+@pytest.mark.tag('basic', 'crud', 'smoke', 'dip', 'bulk')
+@pytest.mark.dependency(name="test_create_dips", depends=["test_create_dipset"])
+def test_get_dipset_virification_authority_kind(get_env):
+    result_dipset = build_request_get_dipset().call(get_env)
+    result_dipset.assert_ok()
+    resobj_dipset = result_dipset.get_response_obj()
+    log_list = [log_name for log_name in resobj_dipset.data.relationships if "Log" in log_name]
+    authorityKind = get_env.get("authorityKind")
+    for log in log_list:
+        log_id = resobj_dipset.data.relationships[log].id
+        get_env.set('log_record_id', log_id)
+        result_log = build_request_get_log().call(get_env)
+        resobj_log = result_log.get_response_obj()
+
+        assert resobj_log.kind.split(':')[0] == authorityKind
+
 
 @pytest.mark.tag('basic', 'crud', 'smoke', 'dip', 'bulk')
 @pytest.mark.dependency(name="test_get_dips", depends=["test_create_dips"])