Hello Team,
-
The SDE/DFT application deployed successfully for ${orgname}.
+
The SDE application deployed successfully for ${orgname}.
Frontend URL : ${sdeFrontEndUrl}
Backend URL : ${sdeBackEndUrl}
-
Please send the Digital Twin and Keycloak details to configure SDE/DFT tool for ${orgname} use.
+
Please send the Digital Twin and Keycloak details to configure SDE tool for ${orgname} use.
Kind Regards
Catina-X
diff --git a/src/main/resources/templates/success_activate.html b/src/main/resources/templates/success_activate.html
index 77179866..40855607 100644
--- a/src/main/resources/templates/success_activate.html
+++ b/src/main/resources/templates/success_activate.html
@@ -31,7 +31,7 @@
Hello ${orgname},
-
The SDE/DFT tool successfully activated for your use.
+
The SDE successfully activated for your use.
Please click here to start using it.
DT Registry Details
@@ -45,7 +45,7 @@
EDC ApiKeyValue : ${edcApiKeyValue}
Your connector status through connector test service: ${connectorTestResult}, check status again here
-
Note: You need to use your own organization login credential to login SDE/DFT tool.
+
Note: You need to use your own organization login credential to login SDE tool.
Kind Regards
Catina-X
diff --git a/src/test/java/org/eclipse/tractusx/autosetup/controller/AutoSetupHandlerControllerTest.java b/src/test/java/org/eclipse/tractusx/autosetup/controller/AutoSetupHandlerControllerTest.java
index b9379fcf..51888266 100644
--- a/src/test/java/org/eclipse/tractusx/autosetup/controller/AutoSetupHandlerControllerTest.java
+++ b/src/test/java/org/eclipse/tractusx/autosetup/controller/AutoSetupHandlerControllerTest.java
@@ -25,7 +25,6 @@
import org.eclipse.tractusx.autosetup.manager.AutoSetupTriggerManager;
import org.eclipse.tractusx.autosetup.model.AutoSetupRequest;
import org.eclipse.tractusx.autosetup.model.AutoSetupResponse;
-import org.eclipse.tractusx.autosetup.model.DFTUpdateRequest;
import org.eclipse.tractusx.autosetup.service.AutoSetupOrchitestratorService;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
@@ -61,30 +60,6 @@ class AutoSetupHandlerControllerTest {
@Autowired
private MockMvc mockMvc;
- @Test
- void updateDftPackage() throws Exception {
- String request = "{\n" +
- " \"keycloakUrl\": \"https://keycloak.cx.dih-cloud.com\",\n" +
- " \"keycloakRealm\": \"orchestrator\",\n" +
- " \"keycloakFrontendClientId\": \"orchestratorservice\",\n" +
- " \"keycloakBackendClientId\": \"orchestratorservice\",\n" +
- " \"digitalTwinUrl\": \"https://semantics.dev.demo.catena-x.net/registry\",\n" +
- " \"digitalTwinAuthUrl\": \"https://centralidp.dev.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token\",\n" +
- " \"digitalTwinClientId\": \"sa-cl6-cx-17\",\n" +
- " \"digitalTwinClientSecret\": \"T8yxHEoPdluIQkPwJi3KSGf3mcSTWoij\"\n" +
- "}";
- String response = "1ca680dc-8947-4afa-9621-2a72a31f9bb9";
- Mockito.when(appHandlerService.updateDftPackage(Mockito.anyString(),Mockito.any(DFTUpdateRequest.class))).thenReturn(response);
- RequestBuilder requestBuilder = MockMvcRequestBuilders
- .put("/internal/update-package/1ca680dc-8947-4afa-9621-2a72a31f9bb9")
- .accept(MediaType.APPLICATION_JSON).content(request)
- .contentType(MediaType.APPLICATION_JSON);
- MvcResult result = mockMvc.perform(requestBuilder).andReturn();
-
- MockHttpServletResponse apiResponse = result.getResponse();
-
- assertEquals(HttpStatus.OK.value(), apiResponse.getStatus());
- }
@Test
void createPackage() throws Exception {
@@ -100,7 +75,7 @@ void createPackage() throws Exception {
" \"bpnNumber\": \"BPN12345611\",\n" +
" \"role\": \"recycler\",\n" +
" \"subscriptionId\": \"DAS-D234\",\n" +
- " \"serviceId\": \"T-SYSTEM-DFT-EDC\"\n" +
+ " \"serviceId\": \"T-SYSTEM-SDE-EDC\"\n" +
" }\n" +
"}";
String response = "1ca680dc-8947-4afa-9621-2a72a31f9bb9";
@@ -130,7 +105,7 @@ void updatePackage() throws Exception {
" \"bpnNumber\": \"BPN12345611\",\n" +
" \"role\": \"recycler\",\n" +
" \"subscriptionId\": \"DAS-D234\",\n" +
- " \"serviceId\": \"T-SYSTEM-DFT-EDC\"\n" +
+ " \"serviceId\": \"T-SYSTEM-SDE-EDC\"\n" +
" }\n" +
"}";
String response = "1ca680dc-8947-4afa-9621-2a72a31f9bb9";
@@ -160,7 +135,7 @@ void deletePackage() throws Exception {
" \"bpnNumber\": \"BPN12345611\",\n" +
" \"role\": \"recycler\",\n" +
" \"subscriptionId\": \"DAS-D234\",\n" +
- " \"serviceId\": \"T-SYSTEM-DFT-EDC\"\n" +
+ " \"serviceId\": \"T-SYSTEM-SDE-EDC\"\n" +
" }\n" +
"}";
String response = "1ca680dc-8947-4afa-9621-2a72a31f9bb9";
@@ -193,7 +168,7 @@ void getCheckDetails() throws Exception {
" \"properties\": {\n" +
" \"bpnNumber\": \"BPN12345611\",\n" +
" \"subscriptionId\": \"DAS-D234\",\n" +
- " \"serviceId\": \"T-SYSTEM-DFT-EDC\",\n" +
+ " \"serviceId\": \"T-SYSTEM-SDE-EDC\",\n" +
" \"role\": \"recycler\"\n" +
" }\n" +
" },\n" +
diff --git a/src/test/java/org/eclipse/tractusx/autosetup/manager/InputConfigurationManagerTest.java b/src/test/java/org/eclipse/tractusx/autosetup/manager/InputConfigurationManagerTest.java
index 0492b50d..d35efcea 100644
--- a/src/test/java/org/eclipse/tractusx/autosetup/manager/InputConfigurationManagerTest.java
+++ b/src/test/java/org/eclipse/tractusx/autosetup/manager/InputConfigurationManagerTest.java
@@ -59,7 +59,7 @@ void prepareInputConfiguration() {
" \"bpnNumber\": \"BPN12345611\",\n" +
" \"role\": \"recycler\",\n" +
" \"subscriptionId\": \"DAS-D234\",\n" +
- " \"serviceId\": \"T-SYSTEM-DFT-EDC\"\n" +
+ " \"serviceId\": \"T-SYSTEM-SDE-EDC\"\n" +
" }\n" +
"}";
String uuID = UUID.randomUUID().toString();
diff --git a/src/test/java/org/eclipse/tractusx/autosetup/manager/SDEManagerTest.java b/src/test/java/org/eclipse/tractusx/autosetup/manager/SDEManagerTest.java
index eb63cdc6..fd3d21b6 100644
--- a/src/test/java/org/eclipse/tractusx/autosetup/manager/SDEManagerTest.java
+++ b/src/test/java/org/eclipse/tractusx/autosetup/manager/SDEManagerTest.java
@@ -63,7 +63,7 @@ void managePackage() {
mockInputMap.put("dnsNameURLProtocol", "https");
Map