Skip to content

feat: add dsp tck metadata test integration #5035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2025
Merged

feat: add dsp tck metadata test integration #5035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ocols/dsp/dsp-spi/src/main/java/org/eclipse/edc/protocol/dsp/spi/version/DspVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public interface DspVersions {
ProtocolVersion V_08 = new ProtocolVersion(V_08_VERSION, V_08_PATH);


String V_2025_1_VERSION = "2025/1";
String V_2025_1_VERSION = "2025-1";
String V_2025_1_PATH = "/" + V_2025_1_VERSION;
ProtocolVersion V_2025_1 = new ProtocolVersion(V_2025_1_VERSION, V_2025_1_PATH);

Expand Down
3 changes: 2 additions & 1 deletion ...sp-compatibility-tests/compatibility-test-runner/src/test/resources/docker.tck.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
dataspacetck.debug=true
dataspacetck.dsp.local.connector=false
dataspacetck.dsp.connector.agent.id=CONNECTOR_UNDER_TEST
dataspacetck.dsp.connector.http.url=http://host.docker.internal:8282/api/dsp/2025/1
dataspacetck.dsp.connector.http.url=http://host.docker.internal:8282/api/dsp/2025-1
dataspacetck.dsp.connector.http.base.url=http://host.docker.internal:8282/api/dsp
dataspacetck.dsp.connector.http.headers.authorization="{\"region\": \"any\", \"audience\": \"any\", \"clientId\":\"any\"}"
dataspacetck.dsp.connector.negotiation.initiate.url=http://host.docker.internal:8687/tck/negotiations/requests
dataspacetck.dsp.connector.transfer.initiate.url=http://host.docker.internal:8687/tck/transfers/requests
Expand Down
4 changes: 2 additions & 2 deletions ...transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/TransferPullEndToEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,8 +550,8 @@ class InMemoryV2025Rev1 extends Tests {
static void beforeAll() {
jsonLd = CONSUMER.getJsonLd();
CONSUMER.setJsonLd(CONSUMER_CONTROL_PLANE.getService(JsonLd.class));
CONSUMER.setProtocol("dataspace-protocol-http:2025/1", "/2025/1");
PROVIDER.setProtocol("dataspace-protocol-http:2025/1", "/2025/1");
CONSUMER.setProtocol("dataspace-protocol-http:2025-1", "/2025-1");
PROVIDER.setProtocol("dataspace-protocol-http:2025-1", "/2025-1");
}

@AfterAll
Expand Down
4 changes: 2 additions & 2 deletions .../tck-extension/src/main/java/org/eclipse/edc/tck/dsp/controller/TckWebhookController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void startNegotiation(ContractNegotiationRequest request) {
.callbackAddresses(List.of(CallbackAddress.Builder.newInstance().uri(request.connectorAddress()).build()))
.counterPartyAddress(request.connectorAddress())
.contractOffer(contractOffer)
.protocol("dataspace-protocol-http:2025/1")
.protocol("dataspace-protocol-http:2025-1")
.build();

monitor.debug("Starting contract negotiation for [provider, address, offer]: [%s, %s, %s]".formatted(request.providerId(), request.connectorAddress(), request.offerId()));
Expand Down Expand Up @@ -107,7 +107,7 @@ public void startTransfer(TransferProcessRequest request) {
.id(request.agreementId() + "_" + UUID.randomUUID())
.transferType(request.format())
.counterPartyAddress(request.connectorAddress())
.protocol("dataspace-protocol-http:2025/1")
.protocol("dataspace-protocol-http:2025-1")
.contractId(request.agreementId())
.build();

Expand Down
Loading