Skip to content

Commit

Permalink
refactor: switch e2e tests to data plane signaling (eclipse-edc#4116)
Browse files Browse the repository at this point in the history 
* refactor: switch E2E tests to data plane signaling

* cleanup runtimes

* dependencies
  • Loading branch information
@ndr-brt
ndr-brt authored Apr 17, 2024
1 parent 5a80660 commit 49993d5
Show file tree
Hide file tree
Showing 17 changed files with 387 additions and 1,119 deletions.
2 changes: 1 addition & 1 deletion DEPENDENCIES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ maven/mavencentral/com.lmax/disruptor/3.4.4, Apache-2.0, approved, clearlydefine
maven/mavencentral/com.networknt/json-schema-validator/1.0.76, Apache-2.0, approved, CQ22638
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.28, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.37.3, Apache-2.0, approved, #11701
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.15.0, , restricted, clearlydefined
maven/mavencentral/com.puppycrawl.tools/checkstyle/10.15.0, LGPL-2.1-or-later, restricted, clearlydefined
maven/mavencentral/com.samskivert/jmustache/1.15, BSD-2-Clause, approved, clearlydefined
maven/mavencentral/com.squareup.okhttp3/okhttp-dnsoverhttps/4.12.0, Apache-2.0, approved, #11159
maven/mavencentral/com.squareup.okhttp3/okhttp/4.12.0, Apache-2.0, approved, #11156
Expand Down
3 changes: 2 additions & 1 deletion ...stFixtures/java/org/eclipse/edc/connector/controlplane/test/system/utils/Participant.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ public String initContractNegotiation(Participant provider, JsonObject policy) {
var requestBody = createObjectBuilder()
.add(CONTEXT, createObjectBuilder().add(VOCAB, EDC_NAMESPACE))
.add(TYPE, "ContractRequest")
.add("providerId", provider.id)
.add("counterPartyAddress", provider.protocolEndpoint.getUrl().toString())
.add("protocol", protocol)
.add("policy", jsonLd.compact(policy).getContent())
Expand Down Expand Up @@ -437,7 +436,9 @@ public JsonArray getTransferProcesses(JsonObject query) {
* @param privateProperties private properties of the data request
* @param destination data destination
* @return transfer process id.
* @deprecated transferType will become mandatory, please use {@link #requestAsset(Participant, String, JsonObject, JsonObject, String)}
*/
@Deprecated(since = "0.6.1")
public String requestAsset(Participant provider, String assetId, JsonObject privateProperties, JsonObject destination) {
return requestAsset(provider, assetId, privateProperties, destination, null);
}
Expand Down
95 changes: 56 additions & 39 deletions system-tests/e2e-transfer-test/runner/src/test/java/org/eclipse/edc/test/e2e/Runtimes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,55 +20,72 @@

public interface Runtimes {

static EdcRuntimeExtension controlPlane(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:control-plane",
":extensions:control-plane:transfer:transfer-data-plane",
":extensions:data-plane:data-plane-client"
);
}
interface InMemory {

static EdcRuntimeExtension controlPlaneSignaling(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
static EdcRuntimeExtension controlPlane(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:control-plane",
":core:common:edr-store-core",
":extensions:control-plane:transfer:transfer-data-plane-signaling",
":extensions:control-plane:api:management-api:edr-cache-api",
":extensions:control-plane:edr:edr-store-receiver",
":extensions:data-plane:data-plane-signaling:data-plane-signaling-client",
":extensions:control-plane:callback:callback-event-dispatcher",
":extensions:control-plane:callback:callback-http-dispatcher"
);
}

static EdcRuntimeExtension controlPlaneEmbeddedDataPlane(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:control-plane",
":extensions:control-plane:transfer:transfer-data-plane-signaling",
":extensions:data-plane:data-plane-signaling:data-plane-signaling-client"
);
}

static EdcRuntimeExtension dataPlane(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:data-plane",
":extensions:data-plane:data-plane-public-api"
);
}
":extensions:data-plane:data-plane-public-api-v2"
);
}

static EdcRuntimeExtension backendService(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:backend-service"
);
static EdcRuntimeExtension dataPlane(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:data-plane",
":extensions:data-plane:data-plane-public-api-v2"
);
}
}

static EdcRuntimeExtension postgresControlPlane(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:control-plane",
":extensions:control-plane:transfer:transfer-data-plane",
":extensions:data-plane:data-plane-client",
":extensions:control-plane:store:sql:control-plane-sql",
":extensions:common:sql:sql-pool:sql-pool-apache-commons",
":extensions:common:transaction:transaction-local",
":extensions:common:api:management-api-configuration",
":extensions:policy-monitor:store:sql:policy-monitor-store-sql"
);
interface Postgres {

static EdcRuntimeExtension controlPlane(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:control-plane",
":core:common:edr-store-core",
":extensions:common:store:sql:edr-index-sql",
":extensions:common:sql:sql-pool:sql-pool-apache-commons",
":extensions:common:transaction:transaction-local",
":extensions:control-plane:transfer:transfer-data-plane-signaling",
":extensions:control-plane:api:management-api:edr-cache-api",
":extensions:control-plane:edr:edr-store-receiver",
":extensions:control-plane:store:sql:control-plane-sql",
":extensions:data-plane:data-plane-signaling:data-plane-signaling-client",
":extensions:control-plane:callback:callback-event-dispatcher",
":extensions:control-plane:callback:callback-http-dispatcher"
);
}

static EdcRuntimeExtension dataPlane(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:data-plane",
":extensions:data-plane:store:sql:data-plane-store-sql",
":extensions:common:sql:sql-pool:sql-pool-apache-commons",
":extensions:common:transaction:transaction-local",
":extensions:data-plane:data-plane-public-api-v2"
);
}

}

static EdcRuntimeExtension postgresDataPlane(String name, Map<String, String> configuration) {
static EdcRuntimeExtension backendService(String name, Map<String, String> configuration) {
return new EdcRuntimeExtension(name, configuration,
":system-tests:e2e-transfer-test:data-plane",
":extensions:data-plane:data-plane-public-api",
":extensions:data-plane:store:sql:data-plane-store-sql",
":extensions:common:sql:sql-pool:sql-pool-apache-commons",
":extensions:common:transaction:transaction-local"
":system-tests:e2e-transfer-test:backend-service"
);
}
}
Loading

0 comments on commit 49993d5

Please sign in to comment.