You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2020/06/05 19:45:16 UTC
[airavata] branch develop updated: Add static storageId
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 57b0373 Add static storageId
new 7387adf Merge pull request #253 from isururanawaka/pythonSDK
57b0373 is described below
commit 57b03734441c2f0ff62f123187e045a43d337686
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Fri Jun 5 15:42:58 2020 -0400
Add static storageId
---
.../airavata-python-sdk/clients/utils/data_model_creation_util.py | 8 ++------
.../samples/create_launch_gaussian_experiment.py | 1 +
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/data_model_creation_util.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/data_model_creation_util.py
index a184289..2af7ea7 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/data_model_creation_util.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/clients/utils/data_model_creation_util.py
@@ -65,13 +65,11 @@ class DataModelCreationUtil(object):
def configure_computation_resource_scheduling(self,
experiment_model, computation_resource_name,
group_resource_profile_name,
- storage_name,
+ storageId,
node_count, total_cpu_count, queue_name, wall_time_limit,
experiment_dir_path):
resource_host_id = self.airavata_util.get_resource_host_id(computation_resource_name)
groupResourceProfileId = self.airavata_util.get_group_resource_profile_id(group_resource_profile_name)
- # storageId = self.airavata_util.get_storage_resource_id(storage_name)
- storageId = 'pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e'
computRes = ComputationalResourceSchedulingModel()
computRes.resourceHostId = resource_host_id
computRes.nodeCount = node_count
@@ -91,9 +89,7 @@ class DataModelCreationUtil(object):
return experiment_model
- def register_input_file(self, file_identifier, storage_name, input_file_name, uploaded_storage_path):
- #storageId = self.airavata_util.get_storage_resource_id(storage_name)
- storageId = 'pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e'
+ def register_input_file(self, file_identifier, storage_name, storageId, input_file_name, uploaded_storage_path):
dataProductModel = DataProductModel()
dataProductModel.gatewayId = self.gateway_id
dataProductModel.ownerName = self.username
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_gaussian_experiment.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_gaussian_experiment.py
index fb28a4a..d16eb2e 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_gaussian_experiment.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/samples/create_launch_gaussian_experiment.py
@@ -103,6 +103,7 @@ experiment = data_model_client.configure_computation_resource_scheduling(experim
data_uri = data_model_client.register_input_file(file_identifier="npentane12diol.inp",
storage_name='pgadev.scigap.org',
+ storageId='pgadev.scigap.org_asdasdad',
input_file_name="npentane12diol.inp",
uploaded_storage_path=path)