Add loadflow an security analysis server to gateway (#74)

Signed-off-by: Geoffroy Jamgotchian <[email protected]>

Author: geofjamg

src/main/java/org/gridsuite/gateway/GatewayConfig.java

@@ -54,6 +54,8 @@ public RouteLocator myRoutes(RouteLocatorBuilder builder, ApplicationContext con
             .route(p -> context.getBean(UserAdminServer.class).getRoute(p))
             .route(p -> context.getBean(CgmesGlServer.class).getRoute(p))
             .route(p -> context.getBean(SensitivityAnalysisServer.class).getRoute(p))
+            .route(p -> context.getBean(LoadFlowServer.class).getRoute(p))
+            .route(p -> context.getBean(SecurityAnalysisServer.class).getRoute(p))
             .build();
     }
 }

src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java

@@ -87,4 +87,9 @@ public class ServiceURIsConfig {
     @Value("${gridsuite.services.sensitivity-analysis-server.base-uri:http://sensitivity-analysis-server/}")
     String sensitivityAnalysisServerBaseUri;
 
+    @Value("${gridsuite.services.loadflow-server.base-uri:http://loadflow-server/}")
+    String loadFlowServerBaseUri;
+
+    @Value("${gridsuite.services.security-analysis-server.base-uri:http://security-analysis-server/}")
+    String securityAnalysisServerBaseUri;
 }

src/main/java/org/gridsuite/gateway/endpoints/LoadFlowServer.java

@@ -0,0 +1,35 @@
+/*
+  Copyright (c) 2023, RTE (http://www.rte-france.com)
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.gateway.endpoints;
+
+import org.gridsuite.gateway.ServiceURIsConfig;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
+ */
+@Component(value = LoadFlowServer.ENDPOINT_NAME)
+public class LoadFlowServer implements EndPointServer {
+
+    public static final String ENDPOINT_NAME = "loadflow";
+
+    private final ServiceURIsConfig servicesURIsConfig;
+
+    public LoadFlowServer(ServiceURIsConfig servicesURIsConfig) {
+        this.servicesURIsConfig = servicesURIsConfig;
+    }
+
+    @Override
+    public String getEndpointBaseUri() {
+        return servicesURIsConfig.getLoadFlowServerBaseUri();
+    }
+
+    @Override
+    public String getEndpointName() {
+        return ENDPOINT_NAME;
+    }
+}

src/main/java/org/gridsuite/gateway/endpoints/SecurityAnalysisServer.java

@@ -0,0 +1,35 @@
+/*
+  Copyright (c) 2023, RTE (http://www.rte-france.com)
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.gateway.endpoints;
+
+import org.gridsuite.gateway.ServiceURIsConfig;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
+ */
+@Component(value = SecurityAnalysisServer.ENDPOINT_NAME)
+public class SecurityAnalysisServer implements EndPointServer {
+
+    public static final String ENDPOINT_NAME = "security-analysis";
+
+    private final ServiceURIsConfig servicesURIsConfig;
+
+    public SecurityAnalysisServer(ServiceURIsConfig servicesURIsConfig) {
+        this.servicesURIsConfig = servicesURIsConfig;
+    }
+
+    @Override
+    public String getEndpointBaseUri() {
+        return servicesURIsConfig.getSecurityAnalysisServerBaseUri();
+    }
+
+    @Override
+    public String getEndpointName() {
+        return ENDPOINT_NAME;
+    }
+}

src/main/java/org/gridsuite/gateway/endpoints/StudyServer.java

@@ -37,6 +37,7 @@ public String getEndpointName() {
 
     @Override
     public Set<String> getUncontrolledRootPaths() {
-        return Set.of("search", "svg-component-libraries", "export-network-formats", "loadflow-default-provider");
+        return Set.of("search", "svg-component-libraries", "export-network-formats", "loadflow-default-provider",
+                "security-analysis-default-provider", "sensitivity-analysis-default-provider");
     }
 }

src/main/resources/application-local.yml

@@ -50,4 +50,7 @@ gridsuite:
       base-uri: http://localhost:8095
     sensitivity-analysis-server:
       base-uri: http://localhost:5030
-
+    loadflow-server:
+      base-uri: http://localhost:5008
+    security-analysis-server:
+      base-uri: http://localhost:5023

src/test/java/org/gridsuite/gateway/ElementAccessControlTest.java

@@ -130,6 +130,9 @@ public void testWithNoControl() {
         stubFor(get(urlEqualTo("/v1/svg-component-libraries")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
         stubFor(get(urlEqualTo("/v1/export-network-formats")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
         stubFor(get(urlEqualTo("/v1/loadflow-default-provider")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
+        stubFor(get(urlEqualTo("/v1/loadflow-default-provider")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
+        stubFor(get(urlEqualTo("/v1/security-analysis-default-provider")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
+        stubFor(get(urlEqualTo("/v1/sensitivity-analysis-default-provider")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
         webClient
             .get().uri("study/v1/search")
             .header("Authorization", "Bearer " + tokenUser1)
@@ -150,6 +153,16 @@ public void testWithNoControl() {
             .header("Authorization", "Bearer " + tokenUser1)
             .exchange()
             .expectStatus().isOk();
+        webClient
+                .get().uri("study/v1/security-analysis-default-provider")
+                .header("Authorization", "Bearer " + tokenUser1)
+                .exchange()
+                .expectStatus().isOk();
+        webClient
+                .get().uri("study/v1/sensitivity-analysis-default-provider")
+                .header("Authorization", "Bearer " + tokenUser1)
+                .exchange()
+                .expectStatus().isOk();
     }
 
     @Test