Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle loadflow parameters. #74

Merged
merged 4 commits into from
Feb 13, 2024
Merged

Handle loadflow parameters. #74

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a431f1
Handle security analysis parameters.
AAJELLAL Jan 31, 2024
3e3f0a3
Handle loadflow parameters.
AAJELLAL Feb 8, 2024
97cf1fa
Merge branch 'main' of https://github.com/gridsuite/explore-server in…
AAJELLAL Feb 8, 2024
6b380b0
Merge branch 'main' of https://github.com/gridsuite/explore-server in…
AAJELLAL Feb 13, 2024
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
4 changes: 3 additions & 1 deletion src/main/java/org/gridsuite/explore/server/services/DirectoryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ public DirectoryService(
STUDY, studyService,
DIRECTORY, this,
CASE, caseService,
ParametersType.VOLTAGE_INIT_PARAMETERS.name(), parametersService);
ParametersType.VOLTAGE_INIT_PARAMETERS.name(), parametersService,
ParametersType.SECURITY_ANALYSIS_PARAMETERS.name(), parametersService,
ParametersType.LOADFLOW_PARAMETERS.name(), parametersService);
}

public void setDirectoryServerBaseUri(String directoryServerBaseUri) {
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/gridsuite/explore/server/services/ParametersService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public class ParametersService implements IDirectoryElementsService {

private DirectoryService directoryService;

private final Map<ParametersType, String> genericParametersServices = Map.of(ParametersType.VOLTAGE_INIT_PARAMETERS, "voltage-init-server");
private final Map<ParametersType, String> genericParametersServices = Map.of(ParametersType.VOLTAGE_INIT_PARAMETERS, "voltage-init-server", ParametersType.SECURITY_ANALYSIS_PARAMETERS, "security-analysis-server",
ParametersType.LOADFLOW_PARAMETERS, "loadflow-server");

private RemoteServicesProperties remoteServicesProperties;

Expand Down Expand Up @@ -86,12 +87,11 @@ public void updateParameters(UUID parametersUuid, String parameters, ParametersT
public UUID createParameters(UUID sourceParametersUuid, ParametersType parametersType) {
String parametersServerBaseUri = remoteServicesProperties.getServiceUri(genericParametersServices.get(parametersType));
Objects.requireNonNull(sourceParametersUuid);

String urlParams = parametersType == ParametersType.VOLTAGE_INIT_PARAMETERS ? "?" + HEADER_DUPLICATE_FROM + "=" + sourceParametersUuid : "/" + sourceParametersUuid;
var path = UriComponentsBuilder
.fromPath(DELIMITER + SERVER_API_VERSION + "/parameters")
.queryParam(HEADER_DUPLICATE_FROM, sourceParametersUuid)
.toUriString();

.fromPath(DELIMITER + SERVER_API_VERSION + "/parameters" + urlParams)
.buildAndExpand()
.toUriString();
HttpHeaders headers = new HttpHeaders();
HttpEntity<String> httpEntity = new HttpEntity<>(headers);
return restTemplate.exchange(parametersServerBaseUri + path, HttpMethod.POST, httpEntity, UUID.class).getBody();
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/explore/server/utils/ParametersType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@
public enum ParametersType {

VOLTAGE_INIT_PARAMETERS,
SECURITY_ANALYSIS_PARAMETERS,
LOADFLOW_PARAMETERS

}
7 changes: 6 additions & 1 deletion src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,9 @@ gridsuite:
-
name: voltage-init-server
base-uri: http://localhost:5038

-
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: Do we have documentation somewhere where we document which micro-service talks to which? If yes, we need to update it as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this shema : https://github.com/gridsuite/documentation. But it's outdated a long time ago .
This file is only for local devs purposes.

name: security-analysis-server
base-uri: http://localhost:5023
-
name: loadflow-server
base-uri: http://localhost:5008
Loading