A1SDS-2516:Replacing the new Connector registration service in Autosetup

eclipse-tractusx · Jul 17, 2023 · 7950d19 · 7950d19
1 parent 4a2313e
commit 7950d19
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/org/eclipse/tractusx/autosetup/manager/ConnectorRegistrationManager.java b/src/main/java/org/eclipse/tractusx/autosetup/manager/ConnectorRegistrationManager.java
@@ -37,7 +37,6 @@
 import org.eclipse.tractusx.autosetup.portal.proxy.PortalIntegrationProxy;
 import org.eclipse.tractusx.autosetup.utility.LogUtil;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.FileSystemResource;
 import org.springframework.retry.annotation.Backoff;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.retry.support.RetrySynchronizationManager;
@@ -90,13 +89,10 @@ public Map<String, String> registerConnector(Customer customerDetails, SelectedT
 			file = getTestFile(inputData.get("selfsigncertificate"));
 
 			MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-
 			body.add("name", customerDetails.getOrganizationName());
 			body.add("connectorUrl", inputData.get("controlPlaneEndpoint"));
-			body.add("status", ACTIVE);
 			body.add("location", customerDetails.getCountry());
-			body.add("providerBpn", inputData.get("bpnNumber"));
-			body.add("certificate", new FileSystemResource(file.toFile()));
+			body.add("subscriptionId", inputData.get("subscriptionId"));
 			Map<String, String> header = new HashMap<>();
 			header.put("Authorization", "Bearer " + getKeycloakToken());
 

diff --git a/src/main/java/org/eclipse/tractusx/autosetup/portal/proxy/PortalIntegrationProxy.java b/src/main/java/org/eclipse/tractusx/autosetup/portal/proxy/PortalIntegrationProxy.java
@@ -52,7 +52,7 @@ public ServiceInstanceResultResponse postServiceInstanceResultAndGetTenantSpecs(
 			@RequestBody ServiceInstanceResultRequest serviceInstanceResultRequest);
 
 
-	@PostMapping("/api/administration/connectors/managed-daps")
+	@PostMapping("/api/administration/connectors/managed")
 	public String manageConnector(URI url, @RequestHeader Map<String, String> header,
 			@RequestBody MultiValueMap<String, Object> body);
 

diff --git 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<String, String> resultMap = sdeManager.managePackage(null, AppActions.CREATE, selectedTools,
 				mockInputMap, null);
-		assertEquals(22, resultMap.size());
+		assertEquals(26, resultMap.size());
 		assertEquals("test", mockInputMap.get("dnsName"));
 	}
 }
diff --git a/src/test/java/org/eclipse/tractusx/autosetup/manager/VaultManagerTest.java b/src/test/java/org/eclipse/tractusx/autosetup/manager/VaultManagerTest.java
@@ -93,7 +93,7 @@ void uploadKeyandValues() {
                 .build();
 
         mockInputMap = vaultManager.uploadKeyandValues(customer, selectedTools,mockInputMap, autoSetupTriggerEntry);
-        assertEquals(14, mockInputMap.size());
+        assertEquals(15, mockInputMap.size());
         assertEquals("test", mockInputMap.get("targetCluster"));
     }
 }
diff --git a/src/test/java/org/eclipse/tractusx/autosetup/service/AutoSetupOrchitestratorServiceTest.java b/src/test/java/org/eclipse/tractusx/autosetup/service/AutoSetupOrchitestratorServiceTest.java
@@ -24,6 +24,7 @@
 import org.eclipse.tractusx.autosetup.kubeapps.proxy.KubeAppManageProxy;
 import org.eclipse.tractusx.autosetup.mapper.AutoSetupRequestMapper;
 import org.eclipse.tractusx.autosetup.model.AutoSetupRequest;
+import org.eclipse.tractusx.autosetup.portal.proxy.PortalIntegrationProxy;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +45,9 @@ class AutoSetupOrchitestratorServiceTest {
     //@Spy
     @Autowired
     private AutoSetupOrchitestratorService autoSetupOrchitestratorService;
+
+    @MockBean
+    private PortalIntegrationProxy portalIntegrationProxy;
 
 
     @MockBean