From 3e5908e2f58aebb198e87d633919a0228d334e02 Mon Sep 17 00:00:00 2001 From: mokhairymahmoud Date: Wed, 1 Apr 2026 00:35:40 +0200 Subject: [PATCH] Update sample DSP requests to 2025-1 --- advanced/advanced-01-open-telemetry/README.md | 10 ++-- .../resources/get-dataset.json | 7 +-- .../resources/negotiate-contract.json | 5 +- .../resources/start-transfer.json | 4 +- federated-catalog/fc-01-embedded/README.md | 4 +- federated-catalog/fc-02-standalone/README.md | 4 +- .../fc-03-static-node-directory/README.md | 6 +-- policy/policy-01-policy-enforcement/README.md | 4 +- .../resources/catalog-request.json | 5 +- .../resources/contract-request.json | 5 +- .../common/FileTransferCloudCommon.java | 8 +-- .../edc/samples/common/NegotiationCommon.java | 8 +-- .../transfer/StreamingParticipant.java | 6 +-- .../transfer/Transfer06KafkaBrokerTest.java | 4 +- .../edc/samples/util/TransferUtil.java | 53 +++++++++++++++++++ transfer/transfer-01-negotiation/README.md | 10 ++-- .../resources/fetch-catalog.json | 5 +- .../resources/get-dataset.json | 7 +-- .../resources/negotiate-contract.json | 5 +- .../resources/start-transfer.json | 4 +- .../resources/start-transfer.json | 4 +- .../resources/fetch-catalog.json | 7 +-- .../resources/get-dataset.json | 7 +-- .../resources/negotiate-contract.json | 7 +-- .../resources/start-transfer.json | 4 +- .../4-get-dataset.json | 5 +- .../5-negotiate-contract.json | 5 +- .../transfer-06-kafka-broker/6-transfer.json | 4 +- transfer/transfer-06-kafka-broker/README.md | 2 +- 29 files changed, 137 insertions(+), 72 deletions(-) diff --git a/advanced/advanced-01-open-telemetry/README.md b/advanced/advanced-01-open-telemetry/README.md index bdd374c4..79af79c7 100644 --- a/advanced/advanced-01-open-telemetry/README.md +++ b/advanced/advanced-01-open-telemetry/README.md @@ -99,9 +99,9 @@ The output will be something like: "@id": "cb701b36-48ee-4132-8436-dba7b83c606c", "@type": "dcat:DataService", "dcat:endpointDescription": "dspace:connector", - "dcat:endpointUrl": "http://provider:19194/protocol", + "dcat:endpointUrl": "http://provider:19194/protocol/2025-1", "dct:terms": "dspace:connector", - "dct:endpointUrl": "http://provider:19194/protocol" + "dct:endpointUrl": "http://provider:19194/protocol/2025-1" } }, { @@ -113,9 +113,9 @@ The output will be something like: "@id": "cb701b36-48ee-4132-8436-dba7b83c606c", "@type": "dcat:DataService", "dcat:endpointDescription": "dspace:connector", - "dcat:endpointUrl": "http://provider:19194/protocol", + "dcat:endpointUrl": "http://provider:19194/protocol/2025-1", "dct:terms": "dspace:connector", - "dct:endpointUrl": "http://provider:19194/protocol" + "dct:endpointUrl": "http://provider:19194/protocol/2025-1" } } ], @@ -128,7 +128,7 @@ The output will be something like: "dcat": "http://www.w3.org/ns/dcat#", "dct": "http://purl.org/dc/terms/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } diff --git a/advanced/advanced-01-open-telemetry/resources/get-dataset.json b/advanced/advanced-01-open-telemetry/resources/get-dataset.json index 217aa29a..59258a54 100644 --- a/advanced/advanced-01-open-telemetry/resources/get-dataset.json +++ b/advanced/advanced-01-open-telemetry/resources/get-dataset.json @@ -2,6 +2,7 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "DatasetRequest", "@id": "assetId", - "counterPartyAddress": "http://provider:19194/protocol", - "protocol": "dataspace-protocol-http" -} \ No newline at end of file + "counterPartyId": "provider", + "counterPartyAddress": "http://provider:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" +} diff --git a/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json b/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json index 44b73204..f47f3755 100644 --- a/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json +++ b/advanced/advanced-01-open-telemetry/resources/negotiate-contract.json @@ -3,8 +3,9 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://provider:19194/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyId": "provider", + "counterPartyAddress": "http://provider:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "{{contract-offer-id}}", diff --git a/advanced/advanced-01-open-telemetry/resources/start-transfer.json b/advanced/advanced-01-open-telemetry/resources/start-transfer.json index 354566ce..017852e7 100644 --- a/advanced/advanced-01-open-telemetry/resources/start-transfer.json +++ b/advanced/advanced-01-open-telemetry/resources/start-transfer.json @@ -4,8 +4,8 @@ }, "@type": "TransferRequestDto", "connectorId": "provider", - "counterPartyAddress": "http://provider:19194/protocol", + "counterPartyAddress": "http://provider:19194/protocol/2025-1", "contractId": "{{contract-agreement-id}}", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "HttpData-PULL" } diff --git a/federated-catalog/fc-01-embedded/README.md b/federated-catalog/fc-01-embedded/README.md index 7e6d3e1e..190d2b98 100644 --- a/federated-catalog/fc-01-embedded/README.md +++ b/federated-catalog/fc-01-embedded/README.md @@ -115,9 +115,9 @@ Sample output: }, "dspace:participantId": "provider", - "originator": "http://localhost:19194/protocol", + "originator": "http://localhost:19194/protocol/2025-1", "@context": { } } ] -``` \ No newline at end of file +``` diff --git a/federated-catalog/fc-02-standalone/README.md b/federated-catalog/fc-02-standalone/README.md index 0e141bfc..5eeb33fe 100644 --- a/federated-catalog/fc-02-standalone/README.md +++ b/federated-catalog/fc-02-standalone/README.md @@ -98,10 +98,10 @@ Sample output: }, "dspace:participantId": "provider", - "originator": "http://localhost:19194/protocol", + "originator": "http://localhost:19194/protocol/2025-1", "@context": { } } ] -``` \ No newline at end of file +``` diff --git a/federated-catalog/fc-03-static-node-directory/README.md b/federated-catalog/fc-03-static-node-directory/README.md index ad02ad19..da8f2aa6 100644 --- a/federated-catalog/fc-03-static-node-directory/README.md +++ b/federated-catalog/fc-03-static-node-directory/README.md @@ -36,8 +36,8 @@ In this case, the file contains the properties of the `participant-connector` fr { "name": "https://w3id.org/edc/v0.0.1/ns/", "id": "provider", - "url": "http://localhost:19194/protocol", - "supportedProtocols": ["dataspace-protocol-http"] + "url": "http://localhost:19194/protocol/2025-1", + "supportedProtocols": ["dataspace-protocol-http:2025-1"] } ``` However, this solution is intended for use only within the sample scope; in production, it must be managed in different way. @@ -136,4 +136,4 @@ To get the combined set of catalogs, use the following request: curl -d @federated-catalog/fc-01-embedded/resources/empty-query.json \ -H 'content-type: application/json' http://localhost:29195/api/catalog/v1alpha/catalog/query \ -s | jq -``` \ No newline at end of file +``` diff --git a/policy/policy-01-policy-enforcement/README.md b/policy/policy-01-policy-enforcement/README.md index 598db16e..1d0abcf2 100644 --- a/policy/policy-01-policy-enforcement/README.md +++ b/policy/policy-01-policy-enforcement/README.md @@ -272,7 +272,7 @@ We'll receive the following catalog in the response, where we can see the offer "@id": "fe9581ee-b4ec-473c-b0b7-96f30d957e87", "@type": "dcat:DataService", "dct:terms": "connector", - "dct:endpointUrl": "http://localhost:8282/protocol" + "dct:endpointUrl": "http://localhost:8282/protocol/2025-1" }, "participantId": "provider", "@context": { @@ -281,7 +281,7 @@ We'll receive the following catalog in the response, where we can see the offer "dcat": "https://www.w3.org/ns/dcat/", "dct": "https://purl.org/dc/terms/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } diff --git a/policy/policy-01-policy-enforcement/resources/catalog-request.json b/policy/policy-01-policy-enforcement/resources/catalog-request.json index 370b4f2f..28a0a7e7 100644 --- a/policy/policy-01-policy-enforcement/resources/catalog-request.json +++ b/policy/policy-01-policy-enforcement/resources/catalog-request.json @@ -2,6 +2,7 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } diff --git a/policy/policy-01-policy-enforcement/resources/contract-request.json b/policy/policy-01-policy-enforcement/resources/contract-request.json index e254def0..1680f439 100644 --- a/policy/policy-01-policy-enforcement/resources/contract-request.json +++ b/policy/policy-01-policy-enforcement/resources/contract-request.json @@ -3,8 +3,9 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "1:test-document:13dce0f1-52ed-4554-a194-e83e92733ee5", diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCloudCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCloudCommon.java index c924696c..a4bb7fe4 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCloudCommon.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/common/FileTransferCloudCommon.java @@ -21,6 +21,7 @@ import static org.eclipse.edc.samples.common.FileTransferCommon.getFileContentFromRelativePath; import static org.eclipse.edc.samples.util.TransferUtil.POLL_INTERVAL; import static org.eclipse.edc.samples.util.TransferUtil.TIMEOUT; +import static org.eclipse.edc.samples.util.TransferUtil.extractContractOfferId; import static org.eclipse.edc.samples.util.TransferUtil.get; import static org.eclipse.edc.samples.util.TransferUtil.post; @@ -29,7 +30,6 @@ public class FileTransferCloudCommon { private static final String CONSUMER_MANAGEMENT_URL = "http://localhost:29193/management"; private static final String V3_CATALOG_DATASET_REQUEST_PATH = "/v3/catalog/dataset/request"; private static final String FETCH_DATASET_FROM_CATALOG_FILE_PATH = "transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json"; - private static final String CATALOG_DATASET_ID = "\"odrl:hasPolicy\".'@id'"; private static final String NEGOTIATE_CONTRACT_FILE_PATH = "transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json"; private static final String V3_CONTRACT_NEGOTIATIONS_PATH = "/v3/contractnegotiations/"; private static final String CONTRACT_NEGOTIATION_ID = "@id"; @@ -37,11 +37,11 @@ public class FileTransferCloudCommon { private static final String CONTRACT_OFFER_ID_KEY = "{{contract-offer-id}}"; public static String fetchDatasetFromCatalog(String fetchDatasetFromCatalogFilePath) { - var catalogDatasetId = post( + var response = post( CONSUMER_MANAGEMENT_URL + V3_CATALOG_DATASET_REQUEST_PATH, - getFileContentFromRelativePath(fetchDatasetFromCatalogFilePath), - CATALOG_DATASET_ID + getFileContentFromRelativePath(fetchDatasetFromCatalogFilePath) ); + var catalogDatasetId = extractContractOfferId(response); assertThat(catalogDatasetId).isNotEmpty(); return catalogDatasetId; } diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java b/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java index 4fb3b8f7..c20c0658 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/common/NegotiationCommon.java @@ -23,6 +23,7 @@ import static org.eclipse.edc.samples.common.FileTransferCommon.getFileContentFromRelativePath; import static org.eclipse.edc.samples.util.TransferUtil.POLL_INTERVAL; import static org.eclipse.edc.samples.util.TransferUtil.TIMEOUT; +import static org.eclipse.edc.samples.util.TransferUtil.extractContractOfferId; import static org.eclipse.edc.samples.util.TransferUtil.get; import static org.eclipse.edc.samples.util.TransferUtil.post; @@ -36,7 +37,6 @@ public class NegotiationCommon { private static final String V2_CONTRACT_DEFINITIONS_PATH = "/v3/contractdefinitions"; private static final String V2_CATALOG_DATASET_REQUEST_PATH = "/v3/catalog/dataset/request"; private static final String FETCH_DATASET_FROM_CATALOG_FILE_PATH = "transfer/transfer-01-negotiation/resources/get-dataset.json"; - private static final String CATALOG_DATASET_ID = "\"odrl:hasPolicy\".'@id'"; private static final String NEGOTIATE_CONTRACT_FILE_PATH = "transfer/transfer-01-negotiation/resources/negotiate-contract.json"; private static final String V2_CONTRACT_NEGOTIATIONS_PATH = "/v3/contractnegotiations/"; private static final String CONTRACT_NEGOTIATION_ID = "@id"; @@ -56,11 +56,11 @@ public static void createContractDefinition() { } public static String fetchDatasetFromCatalog(String fetchDatasetFromCatalogFilePath) { - var catalogDatasetId = post( + var response = post( PrerequisitesCommon.CONSUMER_MANAGEMENT_URL + V2_CATALOG_DATASET_REQUEST_PATH, - getFileContentFromRelativePath(fetchDatasetFromCatalogFilePath), - CATALOG_DATASET_ID + getFileContentFromRelativePath(fetchDatasetFromCatalogFilePath) ); + var catalogDatasetId = extractContractOfferId(response); assertThat(catalogDatasetId).isNotEmpty(); return catalogDatasetId; } diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java index d364abe2..d7ce2c11 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/StreamingParticipant.java @@ -16,6 +16,7 @@ import org.eclipse.edc.connector.controlplane.test.system.utils.Participant; import org.eclipse.edc.junit.utils.LazySupplier; +import org.eclipse.edc.samples.util.TransferUtil; import java.net.URI; @@ -72,15 +73,14 @@ public String createContractDefinition(String requestBody) { } public String fetchDatasetFromCatalog(String requestBody) { - return baseManagementRequest() + return TransferUtil.extractContractOfferId(baseManagementRequest() .contentType(JSON) .body(requestBody) .when() .post("/v3/catalog/dataset/request") .then() .statusCode(200) - .contentType(JSON) - .extract().jsonPath().getString("'odrl:hasPolicy'.@id"); + .contentType(JSON)); } public String negotiateContract(String requestBody) { diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java index 5521cb35..4b37dcf4 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer06KafkaBrokerTest.java @@ -90,13 +90,13 @@ public class Transfer06KafkaBrokerTest { .name("provider") .id("provider") .controlPlaneManagement(new LazySupplier<>(() -> URI.create("http://localhost:18181/management"))) - .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:18182/protocol"))) + .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:18182/protocol/2025-1"))) .build(); private static final StreamingParticipant CONSUMER = StreamingParticipant.Builder.newStreamingInstance() .name("consumer") .id("consumer") .controlPlaneManagement(new LazySupplier<>(() -> URI.create("http://localhost:28181/management"))) - .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:28182/protocol"))) + .controlPlaneProtocol(new LazySupplier<>(() -> URI.create("http://localhost:28182/protocol/2025-1"))) .build(); private static final String GROUP_ID = "group_id"; diff --git a/system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java b/system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java index 85291100..55cf4c1f 100644 --- a/system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java +++ b/system-tests/src/test/java/org/eclipse/edc/samples/util/TransferUtil.java @@ -15,6 +15,9 @@ package org.eclipse.edc.samples.util; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import io.restassured.http.ContentType; import io.restassured.response.ValidatableResponse; import org.apache.http.HttpStatus; @@ -37,6 +40,7 @@ public class TransferUtil { public static final Duration TIMEOUT = Duration.ofSeconds(30); public static final Duration POLL_DELAY = Duration.ofMillis(1000); public static final Duration POLL_INTERVAL = Duration.ofMillis(500); + private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); private static final String CONTRACT_AGREEMENT_ID_KEY = "{{contract-agreement-id}}"; private static final String V2_TRANSFER_PROCESSES_PATH = "/v3/transferprocesses/"; @@ -88,6 +92,36 @@ public static String post(String url, String requestBody, String jsonPath) { .get(jsonPath); } + public static String extractContractOfferId(ValidatableResponse response) { + try { + var body = response.extract().asString(); + var root = OBJECT_MAPPER.readTree(body); + var offerId = readPolicyId(root, "odrl:hasPolicy"); + if (offerId != null) { + return offerId; + } + + offerId = readPolicyId(root, "hasPolicy"); + if (offerId != null) { + return offerId; + } + + offerId = readPolicyId(root, "dcat:dataset", "odrl:hasPolicy"); + if (offerId != null) { + return offerId; + } + + offerId = readPolicyId(root, "dcat:dataset", "hasPolicy"); + if (offerId != null) { + return offerId; + } + + throw new IllegalStateException("Cannot extract contract offer id from response: " + body); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + public static String startTransfer(String requestBody, String contractAgreementId) { requestBody = requestBody.replace(CONTRACT_AGREEMENT_ID_KEY, contractAgreementId); return post(CONSUMER_MANAGEMENT_URL + V2_TRANSFER_PROCESSES_PATH, requestBody, ID); @@ -103,4 +137,23 @@ public static void checkTransferStatus(String transferProcessId, TransferProcess assertThat(state).isEqualTo(status.name()); }); } + + private static String readText(JsonNode root, String... path) { + var node = root; + for (var key : path) { + node = node.path(key); + } + return node.isMissingNode() || node.isNull() ? null : node.asText(); + } + + private static String readPolicyId(JsonNode root, String... path) { + var node = root; + for (var key : path) { + node = node.path(key); + } + if (node.isArray()) { + node = node.isEmpty() ? null : node.get(0); + } + return node == null ? null : readText(node, ID); + } } diff --git a/transfer/transfer-01-negotiation/README.md b/transfer/transfer-01-negotiation/README.md index ac079505..72181e71 100644 --- a/transfer/transfer-01-negotiation/README.md +++ b/transfer/transfer-01-negotiation/README.md @@ -143,7 +143,7 @@ Sample output: "@id": "2a5178c3-c937-4ac2-85be-c46dbc6c5642", "@type": "dcat:DataService", "dct:terms": "connector", - "dct:endpointUrl": "http://localhost:19194/protocol" + "dct:endpointUrl": "http://localhost:19194/protocol/2025-1" }, "participantId": "anonymous", "@context": { @@ -151,7 +151,7 @@ Sample output: "dct": "https://purl.org/dc/terms/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } ``` @@ -216,9 +216,9 @@ Sample output: "@type": "ContractNegotiation", "@id": "5ca21b82-075b-4682-add8-c26c9a2ced67", "type": "CONSUMER", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "state": "FINALIZED", - "counterPartyAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", "callbackAddresses": [], "contractAgreementId": "0b3150be-feaf-43bc-91e1-90f050de28bd", <--------- "@context": { @@ -226,7 +226,7 @@ Sample output: "dct": "https://purl.org/dc/terms/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } ``` diff --git a/transfer/transfer-01-negotiation/resources/fetch-catalog.json b/transfer/transfer-01-negotiation/resources/fetch-catalog.json index 370b4f2f..28a0a7e7 100644 --- a/transfer/transfer-01-negotiation/resources/fetch-catalog.json +++ b/transfer/transfer-01-negotiation/resources/fetch-catalog.json @@ -2,6 +2,7 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } diff --git a/transfer/transfer-01-negotiation/resources/get-dataset.json b/transfer/transfer-01-negotiation/resources/get-dataset.json index 5286af00..f37c1661 100644 --- a/transfer/transfer-01-negotiation/resources/get-dataset.json +++ b/transfer/transfer-01-negotiation/resources/get-dataset.json @@ -2,6 +2,7 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "DatasetRequest", "@id": "assetId", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" -} \ No newline at end of file + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" +} diff --git a/transfer/transfer-01-negotiation/resources/negotiate-contract.json b/transfer/transfer-01-negotiation/resources/negotiate-contract.json index 82fe8036..bd76cb54 100644 --- a/transfer/transfer-01-negotiation/resources/negotiate-contract.json +++ b/transfer/transfer-01-negotiation/resources/negotiate-contract.json @@ -3,8 +3,9 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "{{contract-offer-id}}", diff --git a/transfer/transfer-02-provider-push/resources/start-transfer.json b/transfer/transfer-02-provider-push/resources/start-transfer.json index f0a02b4a..29e424e7 100644 --- a/transfer/transfer-02-provider-push/resources/start-transfer.json +++ b/transfer/transfer-02-provider-push/resources/start-transfer.json @@ -4,9 +4,9 @@ }, "@type": "TransferRequestDto", "connectorId": "provider", - "counterPartyAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", "contractId": "{{contract-agreement-id}}", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "HttpData-PUSH", "dataDestination": { "type": "HttpData", diff --git a/transfer/transfer-03-consumer-pull/resources/start-transfer.json b/transfer/transfer-03-consumer-pull/resources/start-transfer.json index ff44b695..f59ec024 100644 --- a/transfer/transfer-03-consumer-pull/resources/start-transfer.json +++ b/transfer/transfer-03-consumer-pull/resources/start-transfer.json @@ -4,8 +4,8 @@ }, "@type": "TransferRequestDto", "connectorId": "provider", - "counterPartyAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", "contractId": "{{contract-agreement-id}}", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "HttpData-PULL" } diff --git a/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json b/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json index b81e8ed5..28a0a7e7 100644 --- a/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json +++ b/transfer/transfer-05-file-transfer-cloud/resources/fetch-catalog.json @@ -2,6 +2,7 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" -} \ No newline at end of file + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" +} diff --git a/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json b/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json index b6674fe9..68792c3c 100644 --- a/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json +++ b/transfer/transfer-05-file-transfer-cloud/resources/get-dataset.json @@ -2,6 +2,7 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/"}, "@type": "DatasetRequest", "@id": "1", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http" -} \ No newline at end of file + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" +} diff --git a/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json b/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json index d04e405a..38434acf 100644 --- a/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json +++ b/transfer/transfer-05-file-transfer-cloud/resources/negotiate-contract.json @@ -3,8 +3,9 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://localhost:19194/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "{{contract-offer-id}}", @@ -17,4 +18,4 @@ } } } -} \ No newline at end of file +} diff --git a/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json b/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json index 0fa94fce..e49492b4 100644 --- a/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json +++ b/transfer/transfer-05-file-transfer-cloud/resources/start-transfer.json @@ -4,9 +4,9 @@ }, "@type": "TransferRequestDto", "connectorId": "provider", - "counterPartyAddress": "http://localhost:19194/protocol", + "counterPartyAddress": "http://localhost:19194/protocol/2025-1", "contractId": "{{contract-agreement-id}}", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "AmazonS3-PUSH", "dataDestination": { "type": "AmazonS3", diff --git a/transfer/transfer-06-kafka-broker/4-get-dataset.json b/transfer/transfer-06-kafka-broker/4-get-dataset.json index 0ec57558..829d8687 100644 --- a/transfer/transfer-06-kafka-broker/4-get-dataset.json +++ b/transfer/transfer-06-kafka-broker/4-get-dataset.json @@ -2,6 +2,7 @@ "@context": { "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "DatasetRequest", "@id": "kafka-stream-asset", - "counterPartyAddress": "http://localhost:18182/protocol", - "protocol": "dataspace-protocol-http" + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:18182/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1" } diff --git a/transfer/transfer-06-kafka-broker/5-negotiate-contract.json b/transfer/transfer-06-kafka-broker/5-negotiate-contract.json index 9dce9907..340db07c 100644 --- a/transfer/transfer-06-kafka-broker/5-negotiate-contract.json +++ b/transfer/transfer-06-kafka-broker/5-negotiate-contract.json @@ -3,8 +3,9 @@ "edc": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "ContractRequest", - "counterPartyAddress": "http://localhost:18182/protocol", - "protocol": "dataspace-protocol-http", + "counterPartyId": "provider", + "counterPartyAddress": "http://localhost:18182/protocol/2025-1", + "protocol": "dataspace-protocol-http:2025-1", "policy": { "@context": "http://www.w3.org/ns/odrl.jsonld", "@id": "{{offerId}}", diff --git a/transfer/transfer-06-kafka-broker/6-transfer.json b/transfer/transfer-06-kafka-broker/6-transfer.json index e30d4f4c..168ba241 100644 --- a/transfer/transfer-06-kafka-broker/6-transfer.json +++ b/transfer/transfer-06-kafka-broker/6-transfer.json @@ -3,11 +3,11 @@ "@vocab": "https://w3id.org/edc/v0.0.1/ns/" }, "@type": "TransferRequest", - "protocol": "dataspace-protocol-http", + "protocol": "dataspace-protocol-http:2025-1", "transferType": "KafkaBroker-PULL", "contractId": "{{contract-agreement-id}}", "connectorId": "provider", - "counterPartyAddress": "http://localhost:18182/protocol", + "counterPartyAddress": "http://localhost:18182/protocol/2025-1", "callbackAddresses": [ { "transactional": false, diff --git a/transfer/transfer-06-kafka-broker/README.md b/transfer/transfer-06-kafka-broker/README.md index 6656e305..8e1aca64 100644 --- a/transfer/transfer-06-kafka-broker/README.md +++ b/transfer/transfer-06-kafka-broker/README.md @@ -131,7 +131,7 @@ The output will be something like: "edc": "https://w3id.org/edc/v0.0.1/ns/", "dcat": "https://www.w3.org/ns/dcat/", "odrl": "http://www.w3.org/ns/odrl/2/", - "dspace": "https://w3id.org/dspace/v0.8/" + "dspace": "https://w3id.org/dspace/2025/1/" } } ```