some api fixes

Author: bjoern-otto

aas_test_engines/test_cases/v3_0/generate.py

@@ -10,6 +10,7 @@
 )
 from aas_test_engines.result import start, write
 from .interfaces.shared import AssetId
+import base64
 
 
 class DummyEnumValue:
@@ -24,6 +25,14 @@ def __str__(self):
         return self.value
 
 
+_INVALID_BASE64URL = "invalid-base64url====="
+try:
+    base64.urlsafe_b64decode(_INVALID_BASE64URL)
+    assert False, f"{_INVALID_BASE64URL} must not be base64-url decodable"
+except ValueError:
+    pass
+
+
 def generate_invalid_values(arg: FunctionType.Argument) -> List[any]:
     if isinstance(arg.type, NumberType):
         if arg.name == "limit":

aas_test_engines/test_cases/v3_0/interfaces/aas_repo.py

@@ -45,7 +45,7 @@ def get_all_shells(
             "cursor": cursor,
             "limit": limit,
             "idShort": id_short,
-            "assetId": asset_id,
+            "assetIds": asset_id,
         },
     )
     return invoke_and_decode(client, request, r_get_all_shells_response, {200})
@@ -113,7 +113,7 @@ def invoke_error(
                 "cursor": cursor,
                 "limit": limit,
                 "idShort": id_short,
-                "assetId": asset_id,
+                "assetIds": asset_id,
             },
         )
         return invoke_and_decode(self.client, request, r_error_result, range(400, 500))
@@ -140,7 +140,7 @@ def _invoke(self, limit, cursor, id_short, asset_id, reflection, status):
                 "cursor": cursor,
                 "limit": limit,
                 "idShort": id_short,
-                "assetId": asset_id,
+                "assetIds": asset_id,
             },
         )
         return invoke_and_decode(self.client, request, reflection, status)

aas_test_engines/test_cases/v3_0/interfaces/shared.py

@@ -58,7 +58,8 @@ def extract_json(response: Response) -> dict:
 
 
 def invoke(client: HttpClient, request: Request) -> Response:
-    write(f"Invoke {request.make_url()}")
+    url = "".join(client.prefixes) + request.make_url()
+    write(f"Invoke {url}")
     response = client.send(request)
     write(f"Response: ({response.status_code}): {_shorten(response.content)}")
     return response

aas_test_engines/test_cases/v3_0/interfaces/submodel_repo.py

@@ -234,14 +234,14 @@ class SetupForAas(ApiTestSuite):
     def setup(self):
         result = get_all_submodel_references(self.client, limit=1)
         self.valid_id = result.result[0].keys[0].value.raw_value
-        self.valid_arguments["submodel_id"] = self.valid_id
+        self.valid_arguments["submodel_id"] = Base64String(self.valid_id)
 
 
 class SetupForSubmodel(ApiTestSuite):
     def setup(self):
         result = get_all_submodels(self.client, limit=1)
         self.valid_id = result.result[0].id.raw_value
-        self.valid_arguments["submodel_id"] = self.valid_id
+        self.valid_arguments["submodel_id"] = Base64String(self.valid_id)
 
 
 class GetSubmodelByIdTests(ApiTestSuite):

test/acceptance/server.py

@@ -80,13 +80,13 @@ class Params:
         "/api/v3.0",
         "https://admin-shell.io/aas/API/3/0/AssetAdministrationShellRepositoryServiceSpecification/SSP-002",
         3,
-        17,
+        13,
     ),
     Params(
         "/api/v3.0",
         "https://admin-shell.io/aas/API/3/0/SubmodelRepositoryServiceSpecification/SSP-002",
         6,
-        13,
+        9,
     ),
     Params(
         "/api/v3.0/shells/aHR0cDovL2N1c3RvbWVyLmNvbS9hYXMvOTE3NV83MDEzXzcwOTFfOTE2OA==/submodels/aHR0cDovL2k0MC5jdXN0b21lci5jb20vdHlwZS8xLzEvRjEzRTg1NzZGNjQ4ODM0Mg==",
@@ -99,7 +99,7 @@ class Params:
         "/api/v3.0/shells/aHR0cDovL2N1c3RvbWVyLmNvbS9hYXMvOTE3NV83MDEzXzcwOTFfOTE2OA==/",
         "https://admin-shell.io/aas/API/3/0/AssetAdministrationShellServiceSpecification/SSP-002",
         1,
-        10,
+        6,
         "/aas",
     ),
 ]