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
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/gateway/GatewayConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public RouteLocator myRoutes(RouteLocatorBuilder builder, ApplicationContext con
.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))
.route(p -> context.getBean(SnapshotRefinerServer.class).getRoute(p))
.route(p -> context.getBean(StudyConfigServer.class).getRoute(p))
.route(p -> context.getBean(GeoDataServer.class).getRoute(p))
.route(p -> context.getBean(PccMinServer.class).getRoute(p))
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/gateway/ServiceURIsConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ public class ServiceURIsConfig {
@Value("${gridsuite.services.state-estimation-server.base-uri:http://state-estimation-server/}")
String stateEstimationServerBaseUri;

@Value("${gridsuite.services.state-estimation-orchestrator-server.base-uri:http://state-estimation-orchestrator-server/}")
String stateEstimationOrchestratorServerBaseUri;
@Value("${gridsuite.services.snapshot-refiner-server.base-uri:http://snapshot-refiner-server/}")
String snapshotRefinerServerBaseUri;

@Value("${gridsuite.services.study-config-server.base-uri:http://study-config-server/}")
String studyConfigServerBaseUri;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
/**
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
*/
@Component(value = StateEstimationOrchestratorServer.ENDPOINT_NAME)
public class StateEstimationOrchestratorServer implements EndPointServer {
@Component(value = SnapshotRefinerServer.ENDPOINT_NAME)
public class SnapshotRefinerServer implements EndPointServer {

public static final String ENDPOINT_NAME = "state-estimation-orchestrator";
public static final String ENDPOINT_NAME = "snapshot-refiner";

private final ServiceURIsConfig servicesURIsConfig;

public StateEstimationOrchestratorServer(ServiceURIsConfig servicesURIsConfig) {
public SnapshotRefinerServer(ServiceURIsConfig servicesURIsConfig) {
this.servicesURIsConfig = servicesURIsConfig;
}

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

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ gridsuite:
base-uri: http://localhost:5031
state-estimation-server:
base-uri: http://localhost:6040
state-estimation-orchestrator-server:
snapshot-refiner-server:
base-uri: http://localhost:6041
study-config-server:
base-uri: http://localhost:5035
Expand All @@ -79,4 +79,4 @@ gridsuite:

# Note: The issuer configured in Docker Compose must match the one used here. Using localhost instead will not work.
allowed-issuers: http://172.17.0.1:9090
allowed-audiences: gridexplore-client, gridadmin-client, griddyna-client, gridstudy-client, gridexplore-local, gridadmin-local, griddyna-local, gridstudy-local
allowed-audiences: gridexplore-client, gridadmin-client, griddyna-client, gridstudy-client, gridexplore-local, gridadmin-local, griddyna-local, gridstudy-local