Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/main/java/org/gridsuite/gateway/GatewayConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public RouteLocator myRoutes(RouteLocatorBuilder builder, ApplicationContext con
.route(p -> context.getBean(LoadFlowServer.class).getRoute(p))
.route(p -> context.getBean(SecurityAnalysisServer.class).getRoute(p))
.route(p -> context.getBean(DynamicSimulationServer.class).getRoute(p))
.route(p -> context.getBean(DynamicSecurityAnalysisServer.class).getRoute(p))
.route(p -> context.getBean(VoltageInitServer.class).getRoute(p))
.route(p -> context.getBean(ShortCircuitServer.class).getRoute(p))
.route(p -> context.getBean(StateEstimationOrchestratorServer.class).getRoute(p))
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ public class ServiceURIsConfig {
@Value("${gridsuite.services.dynamic-simulation-server.base-uri:http://dynamic-simulation-server/}")
String dynamicSimulationServerBaseUri;

@Value("${gridsuite.services.dynamic-security-analysis-server.base-uri:http://dynamic-security-analysis-server/}")
String dynamicSecurityAnalysisServerBaseUri;

@Value("${gridsuite.services.case-import-server.base-uri:http://case-import-server/}")
String caseImportServerBaseUri;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Copyright (c) 2025, 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 Thang PHAM <quyet-thang.pham at rte-france.com>
*/
@Component(value = DynamicSecurityAnalysisServer.ENDPOINT_NAME)
public class DynamicSecurityAnalysisServer implements EndPointServer {

public static final String ENDPOINT_NAME = "dynamic-security-analysis";

private final ServiceURIsConfig servicesURIsConfig;

public DynamicSecurityAnalysisServer(ServiceURIsConfig servicesURIsConfig) {
this.servicesURIsConfig = servicesURIsConfig;
}

@Override
public String getEndpointBaseUri() {
return servicesURIsConfig.getDynamicSecurityAnalysisServerBaseUri();
}

@Override
public String getEndpointName() {
return ENDPOINT_NAME;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ public String getEndpointName() {
public Set<String> getUncontrolledRootPaths() {
return Set.of("search", "svg-component-libraries", "export-network-formats", "loadflow-default-provider",
"security-analysis-default-provider", "sensitivity-analysis-default-provider", "non-evacuated-energy-default-provider",
"dynamic-simulation-default-provider", "optional-services", "servers");
"dynamic-simulation-default-provider", "dynamic-security-analysis-default-provider", "optional-services", "servers");
}
}
2 changes: 2 additions & 0 deletions src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ gridsuite:
base-uri: http://localhost:5023
dynamic-simulation-server:
base-uri: http://localhost:5032
dynamic-security-analysis-server:
base-uri: http://localhost:5040
case-import-server:
base-uri: http://localhost:5039
voltage-init-server:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ void testWithNoControl() {
stubFor(get(urlEqualTo("/v1/sensitivity-analysis-default-provider")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
stubFor(get(urlEqualTo("/v1/non-evacuated-energy-default-provider")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
stubFor(get(urlEqualTo("/v1/dynamic-simulation-default-provider")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
stubFor(get(urlEqualTo("/v1/dynamic-security-analysis-default-provider")).withHeader("userId", equalTo("user1")).willReturn(aResponse()));
webClient
.get().uri("study/v1/search")
.header(HttpHeaders.AUTHORIZATION, "Bearer " + tokenUser1)
Expand Down Expand Up @@ -170,6 +171,11 @@ void testWithNoControl() {
.header(HttpHeaders.AUTHORIZATION, "Bearer " + tokenUser1)
.exchange()
.expectStatus().isOk();
webClient
.get().uri("study/v1/dynamic-security-analysis-default-provider")
.header(HttpHeaders.AUTHORIZATION, "Bearer " + tokenUser1)
.exchange()
.expectStatus().isOk();
}

@Test
Expand Down