This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/airavata.git
commit ba7fd0e025ac207bc8fdd803d52ec810c8f55189 Author: yasithdev <[email protected]> AuthorDate: Tue Jul 15 04:06:41 2025 -0500 add hostname config for grpc server --- .../agent/connection/service/handlers/AgentManagementHandler.java | 5 ++++- .../agent/connection/service/services/AiravataService.java | 4 ---- .../agent-service/src/main/resources/application.yml | 8 +------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java index 2d697d00ac..409511c0db 100644 --- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java +++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/handlers/AgentManagementHandler.java @@ -61,6 +61,9 @@ public class AgentManagementHandler { @Value("${airavata.storagePath}") private String storagePath; + @Value("${grpc.server.host}") + private String grpcHost; + public AgentManagementHandler(AiravataService airavataService, ClusterApplicationConfig clusterApplicationConfig) { this.airavataService = airavataService; this.clusterApplicationConfig = clusterApplicationConfig; @@ -257,7 +260,7 @@ public class AgentManagementHandler { switch (input.getName()) { case "agent_id" -> input.setValue(agentId); case "env_name" -> input.setValue(envName); - case "server_url" -> input.setValue(airavataService.getServerUrl()); + case "server_url" -> input.setValue(grpcHost); case "libraries" -> input.setValue(req.getLibraries() != null ? String.join(",", req.getLibraries()) : ""); case "pip" -> input.setValue(req.getPip() != null ? String.join(",", req.getPip()) : ""); diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java index e49f014eab..1f37065c47 100644 --- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java +++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/services/AiravataService.java @@ -127,8 +127,4 @@ public class AiravataService { .map(ExperimentSummaryModel::getExperimentId) .collect(Collectors.toList()); } - - public String getServerUrl() { - return serverUrl; - } } diff --git a/modules/agent-framework/agent-service/src/main/resources/application.yml b/modules/agent-framework/agent-service/src/main/resources/application.yml index f730d50837..fbfd32da1d 100644 --- a/modules/agent-framework/agent-service/src/main/resources/application.yml +++ b/modules/agent-framework/agent-service/src/main/resources/application.yml @@ -16,6 +16,7 @@ grpc: server: + host: airavata.host port: 19900 max-inbound-message-size: 20971520 @@ -55,10 +56,3 @@ airavata: serverPort: 17000 serverToken: airavata serverApiUrl: http://airavata.host:8000 - -keystore: - path: keystores/airavata.p12 - password: airavata - -TLS: - enabled: true \ No newline at end of file
