This is an automated email from the ASF dual-hosted git repository.
eroma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/master by this push:
new b7ab318b72 Resurrecting DELTA topology gateway
b7ab318b72 is described below
commit b7ab318b7214d77c8ac6ce8899c0ea94cfea0ebb
Author: eroma2014 <[email protected]>
AuthorDate: Fri Jun 7 16:34:58 2024 -0400
Resurrecting DELTA topology gateway
---
.../airavata/api/client/AiravataClientFactory.java | 27 ++++++++++++++++++++++
.../scigap/production/host_vars/delta/vars.yml | 26 ++++++++++-----------
.../ansible/inventories/scigap/production/hosts | 1 +
3 files changed, 41 insertions(+), 13 deletions(-)
diff --git
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
index 98ab9ed99c..42bd38f8c3 100644
---
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
+++
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/client/AiravataClientFactory.java
@@ -21,7 +21,10 @@ package org.apache.airavata.api.client;
import org.apache.airavata.api.Airavata;
+import org.apache.airavata.common.utils.Constants;
import org.apache.airavata.model.error.AiravataClientException;
+import org.apache.airavata.model.security.AuthzToken;
+import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
@@ -31,6 +34,11 @@ import org.apache.thrift.transport.TSSLTransportFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class AiravataClientFactory {
private final static Logger logger =
LoggerFactory.getLogger(AiravataClientFactory.class);
@@ -77,4 +85,23 @@ public class AiravataClientFactory {
throw clientError;
}
}
+
+ public static void main(String a[]) throws TException {
+ AuthzToken token = new AuthzToken();
+
token.setAccessToken("eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJBUGFKRUpERFc4ZEdzMExnc3ozYUdydERsZ2U0eWlQblFibUNsYnpJX2NVIn0.eyJqdGkiOiI1NmMwZDZmYy0yMGVhLTQ1Y2UtODUwNC1kMTY0MTZkYTdkYzEiLCJleHAiOjE2NDc0NTQyNjcsIm5iZiI6MCwiaWF0IjoxNjQ3NDUyNDY3LCJpc3MiOiJodHRwczovL2lhbWRldi5zY2lnYXAub3JnL2F1dGgvcmVhbG1zL3NlYWdyaWQiLCJhdWQiOiJwZ2EiLCJzdWIiOiI3ZGZkYjI4MS1lNWIzLTQ4MjQtOTcxZC00YzQ2ZmNkMzIwYTEiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJwZ2EiLCJhdXRoX3RpbWUiOjAsInNlc3Npb25fc3RhdGUiOiI1NWVkOD
[...]
+ Map<String, String> claimsMap = new HashMap<>();
+ claimsMap.put(Constants.GATEWAY_ID, "seagrid");
+ claimsMap.put(Constants.USER_NAME, "2021test1");
+ token.setClaimsMap(claimsMap);
+ Airavata.Client apiClient =
createAiravataSecureClient("apidev.scigap.org", 9930,
+
"/Users/eromaabeysinghe/development/local-airavata/airavata/dev-tools/ansible/inventories/scigap/production/files/client_truststore.jks",
"airavata",
+ 10000);
+
+
+
+ List<String> outputNames = new ArrayList<>();
+ outputNames.add("Gaussian-Application-Output");
+ outputNames.add("Gaussian-Standar-Out");
+
apiClient.fetchIntermediateOutputs(token,"Clone_of_Gaussian16_on_Mar_16,_2022_1:42_PM_1ad9e887-6ec4-4b1a-9ffb-e028ccb3c86c",
outputNames);
+ }
}
\ No newline at end of file
diff --git
a/dev-tools/ansible/inventories/scigap/production/host_vars/delta/vars.yml
b/dev-tools/ansible/inventories/scigap/production/host_vars/delta/vars.yml
index 2c4fea075e..ccc39d175e 100644
--- a/dev-tools/ansible/inventories/scigap/production/host_vars/delta/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/host_vars/delta/vars.yml
@@ -23,11 +23,11 @@
# NOTE: Delta gateway is deployed to a Jetstream VM
real_user_data_dir: "/media/volume/sdb/data/gateway-user-data"
user_data_dir: "/var/www/portals/gateway-user-data"
-gateway_data_store_hostname: "delta-topology.org"
+gateway_data_store_hostname: "delta.js2.scigap.org"
gateway_data_store_resource_id:
"delta-topology.jetstream-cloud.org_61fe21d4-07ea-41fc-9f2e-104bc3061318"
# tus isn't setup yet
tusd_vhost_servername:
-airavata_django_git_branch: "delta-topology-workshop"
+#airavata_django_git_branch: "delta-topology-workshop"
vhost_servername: "delta-topology.scigap.org"
vhost_ssl: True
@@ -35,12 +35,12 @@ ssl_certificate_file: "/etc/letsencrypt/live/{{
vhost_servername }}/cert.pem"
ssl_certificate_chain_file: "/etc/letsencrypt/live/{{ vhost_servername
}}/fullchain.pem"
ssl_certificate_key_file: "/etc/letsencrypt/live/{{ vhost_servername
}}/privkey.pem"
-vhost_server_redirect: "delta-topology.org"
-vhost_server_redirect_ssl_certificate_file: "/etc/letsencrypt/live/{{
vhost_server_redirect }}/cert.pem"
-vhost_server_redirect_ssl_certificate_chain_file: "/etc/letsencrypt/live/{{
vhost_server_redirect }}/fullchain.pem"
-vhost_server_redirect_ssl_certificate_key_file: "/etc/letsencrypt/live/{{
vhost_server_redirect }}/privkey.pem"
+#vhost_server_redirect: "delta-topology.org"
+#vhost_server_redirect_ssl_certificate_file: "/etc/letsencrypt/live/{{
vhost_server_redirect }}/cert.pem"
+#vhost_server_redirect_ssl_certificate_chain_file: "/etc/letsencrypt/live/{{
vhost_server_redirect }}/fullchain.pem"
+#vhost_server_redirect_ssl_certificate_key_file: "/etc/letsencrypt/live/{{
vhost_server_redirect }}/privkey.pem"
-django_file_upload_max_file_size_mb: 10000
+django_file_upload_max_file_size_mb: 3000
## Keycloak related variables
tenant_domain: "delta"
@@ -59,14 +59,14 @@ auth_options:
gateway_id: "delta"
experiment_data_dir: "{{ user_data_dir }}/delta"
-gateway_data_store_ssh_public_key: "ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQCLjM9LkUfp7WEBCAOKn4+2JmOHqCNnOt8ZKa5LZYi6DerREMH1oaiDBwrOd8LEL6bC1Ac6X7aA7tz6Z3F8rM6czVKUVeGcfUglPFj7fNqetIY4R5hkidLBkXrOiR9fPFDyiBJnG+/WIlJm4HJN3dM2jzlcGcx5O0syXdgDY5lM2mgKCmhG/Q6qt3/GxZ/DtG2QV5tV3cLTaufncFoyNtBthnVzVagnJ+4tnWsEEv/S2RZDA09LHALH/51zrcLIyRRMD/qNSTf6hPMOAM2+90naVALy84qbTfdcEsATQU9eOyUZ/qb8kc78CM0tmz37e9xlH30W/E2a8lr+qRBxSLPD"
+#gateway_data_store_ssh_public_key: "ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQCLjM9LkUfp7WEBCAOKn4+2JmOHqCNnOt8ZKa5LZYi6DerREMH1oaiDBwrOd8LEL6bC1Ac6X7aA7tz6Z3F8rM6czVKUVeGcfUglPFj7fNqetIY4R5hkidLBkXrOiR9fPFDyiBJnG+/WIlJm4HJN3dM2jzlcGcx5O0syXdgDY5lM2mgKCmhG/Q6qt3/GxZ/DtG2QV5tV3cLTaufncFoyNtBthnVzVagnJ+4tnWsEEv/S2RZDA09LHALH/51zrcLIyRRMD/qNSTf6hPMOAM2+90naVALy84qbTfdcEsATQU9eOyUZ/qb8kc78CM0tmz37e9xlH30W/E2a8lr+qRBxSLPD"
-admin_emails: "[('SGRC', '[email protected]'),('Aurora
Clark','[email protected]'),('Sudhakar Pamidighantam','[email protected]')]"
+admin_emails: "[('Sudhakar Pamidighantam','[email protected]')]"
portal_title: "DELTA Gateway"
-django_google_analytics_tracking_id: "UA-178024455-1"
+#django_google_analytics_tracking_id: "UA-178024455-1"
-django_extra_settings:
- ACCESS_TOKEN_REDIRECT_ALLOWED_URIS:
- - URI:
"https://jupyterhub.delta-topology.scigap.org/hub/login?next=/hub/spawn";
+#django_extra_settings:
+# ACCESS_TOKEN_REDIRECT_ALLOWED_URIS:
+# - URI:
"https://jupyterhub.delta-topology.scigap.org/hub/login?next=/hub/spawn";
...
diff --git a/dev-tools/ansible/inventories/scigap/production/hosts
b/dev-tools/ansible/inventories/scigap/production/hosts
index 281dcd3c63..d8f9610094 100644
--- a/dev-tools/ansible/inventories/scigap/production/hosts
+++ b/dev-tools/ansible/inventories/scigap/production/hosts
@@ -102,6 +102,7 @@ futurewater ansible_host=149.165.154.212
ansible_user=exouser
# Delta Jetstream server
# delta ansible_host=149.165.153.181 ansible_user=exouser
+delta ansible_host=149.165.173.140 ansible_user=exouser
# Container-Tutorial Jetstream server
# This JS1 VM no longer exists
