[airavata] 01/02: Merge branch 'develop' into mft-integration
This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch mft-integration in repository https://gitbox.apache.org/repos/asf/airavata.git commit 3d407e0f76406183c6efd2894b0296361d056763 Merge: ed5cb85 b801135 Author: Marcus Christie AuthorDate: Wed Mar 25 17:47:49 2020 -0400 Merge branch 'develop' into mft-integration .../appcatalog/groupresourceprofile/ttypes.py | 217 +- .../airavata_python_sdk.egg-info/SOURCES.txt | 3 + .../build/lib/clients/file_handling_client.py | 1 + .../build/lib/clients/utils/__init__.py| 16 + .../lib/clients/utils/api_server_client_util.py| 74 ++ .../lib/samples/create_launch_echo_experiment.py | 37 +- .../build/lib/samples/file_utils.py| 46 ++ .../build/lib/transport/settings.ini | 2 +- .../clients/file_handling_client.py| 1 - .../airavata-python-sdk/clients/utils/__init__.py | 16 + .../clients/utils/api_server_client_util.py| 74 ++ .../airavata_python_sdk-1.0.0-py2.py3-none-any.whl | Bin 327991 -> 330588 bytes .../samples/create_launch_echo_experiment.py | 34 +- .../ComputeResourcePolicy.java | 32 +- .../ComputeResourceReservation.java| 820 + .../GroupComputeResourcePreference.java| 189 - .../groupresourceprofile/GroupResourceProfile.java | 108 +-- airavata-api/airavata-model-utils/pom.xml | 6 + .../util/GroupComputeResourcePreferenceUtil.java | 44 ++ .../GroupComputeResourcePreferenceUtilTest.java| 116 +++ .../scigap/develop/host_vars/simccs/vars.yml | 2 +- .../scigap/production/host_vars/csbglsu/vars.yml | 2 + .../scigap/production/host_vars/dreg/vars.yml | 2 + .../scigap/production/host_vars/iugateway/vars.yml | 1 + .../scigap/production/host_vars/nexttdb/vars.yml | 1 + .../scigap/production/host_vars/seagrid/vars.yml | 1 + .../scigap/production/host_vars/simccs/vars.yml| 1 + .../production/host_vars/simvascular/vars.yml | 1 + .../production/host_vars/southdakota/vars.yml | 1 + .../scigap/production/host_vars/testdrive/vars.yml | 1 + dev-tools/ansible/roles/django/defaults/main.yml | 4 + .../roles/django/templates/settings_local.py.j2| 4 + dev-tools/ansible/roles/httpd/defaults/main.yml| 16 +- dev-tools/ansible/roles/httpd/tasks/main.yml | 23 + .../ansible/roles/httpd/templates/default.conf.j2 | 8 +- .../airavata/helix/impl/task/TaskContext.java | 9 + .../org/apache/airavata/common/utils/JPAUtils.java | 13 + .../src/main/resources/META-INF/persistence.xml| 1 + .../init/03-appcatalog-migrations.sql | 9 + modules/registry/registry-core/README.md | 13 + java => ComputeResourceReservationEntity.java} | 93 ++- .../appcatalog/GroupComputeResourcePrefEntity.java | 15 +- .../GroupSSHAccountProvisionerConfig.java | 2 +- .../core/repositories/AbstractRepository.java | 10 +- .../appcatalog/GroupResourceProfileRepository.java | 29 +- .../core/utils/JPAUtil/AppCatalogJPAUtils.java | 40 +- .../src/main/resources/META-INF/persistence.xml| 1 + .../src/main/resources/appcatalog-derby.sql| 6 + .../src/main/resources/appcatalog-mysql.sql| 8 + .../GroupResourceProfileRepositoryTest.java| 257 ++- .../next/DeltaScripts/appCatalog_schema_delta.sql | 9 + .../group_resource_profile_model.thrift| 13 +- 52 files changed, 2226 insertions(+), 206 deletions(-)
[airavata] 01/02: Merge branch 'develop' into mft-integration
This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch mft-integration in repository https://gitbox.apache.org/repos/asf/airavata.git commit c685eb2a4ab05514b776e51f95d4ff1d7b4f1447 Merge: 6097a2d 1442e84 Author: Dimuthu Wannipurage AuthorDate: Wed Jan 22 16:43:56 2020 -0500 Merge branch 'develop' into mft-integration .../api/server/handler/AiravataServerHandler.java | 2 + .../scigap/develop/group_vars/all/vars.yml | 1 + .../scigap/develop/host_vars/amp/vars.yml | 53 +++ .../scigap/develop/host_vars/amp/vault.yml | 15 ++ dev-tools/ansible/inventories/scigap/develop/hosts | 4 + .../scigap/production/group_vars/all/vars.yml | 1 + .../scigap/production/host_vars/cgpe/vars.yml | 50 +++ .../scigap/production/host_vars/cgpe/vault.yml | 15 ++ .../scigap/production/host_vars/dreg/vars.yml | 2 + .../production/host_vars/futurewater/vars.yml | 8 +- .../newsimccs/files/django-ssl-vhost.conf.j2 | 82 +++ .../scigap/production/host_vars/newsimccs/vars.yml | 70 ++ .../production/host_vars/newsimccs/vault.yml | 15 ++ .../ansible/inventories/scigap/production/hosts| 3 + .../scigap/staging/group_vars/all/vars.yml | 1 + dev-tools/ansible/roles/api-orch/defaults/main.yml | 1 + .../templates/airavata-server.properties.j2| 1 + dev-tools/ansible/roles/django/defaults/main.yml | 10 ++ .../roles/django/files/remove_old_js_css_files.py | 46 +++ dev-tools/ansible/roles/django/handlers/main.yml | 18 +++ dev-tools/ansible/roles/django/tasks/main.yml | 25 +++- .../roles/django/templates/settings_local.py.j2| 4 +- .../handlers => django_setup/defaults}/main.yml| 17 +-- .../ansible/roles/django_setup/files/00-wsgi.conf | 1 + .../ansible/roles/django_setup/tasks/main.yml | 91 ++-- .../ansible/roles/helix_setup/defaults/main.yml| 1 + .../parser-wm/airavata-server.properties.j2| 1 + .../participant/airavata-server.properties.j2 | 1 + .../post-wm/airavata-server.properties.j2 | 1 + .../templates/pre-wm/airavata-server.properties.j2 | 1 + dev-tools/ansible/roles/httpd/defaults/main.yml| 4 + .../tasks/install_deps_CentOS_7.yml} | 18 +-- .../roles/httpd/tasks/install_deps_Ubuntu_16.yml | 64 + dev-tools/ansible/roles/httpd/tasks/main.yml | 2 + .../ansible/roles/job_monitor/defaults/main.yml| 1 + .../email-monitor/airavata-server.properties.j2| 1 + dev-tools/ansible/roles/letsencrypt/tasks/main.yml | 2 + .../airavata/helix/adaptor/PoolingSSHJClient.java | 81 +++ .../airavata/helix/adaptor/SSHJAgentAdaptor.java | 152 +++-- .../adaptor/wrapper/SCPFileTransferWrapper.java| 12 +- .../helix/adaptor/wrapper/SFTPClientWrapper.java | 12 +- .../helix/adaptor/wrapper/SSHClientWrapper.java| 25 .../helix/adaptor/wrapper/SessionWrapper.java | 12 +- .../airavata/helix/impl/task/AiravataTask.java | 26 +++- .../impl/task/staging/InputDataStagingTask.java| 4 +- .../task/submission/config/GroovyMapBuilder.java | 7 + .../helix/impl/workflow/PreWorkflowManager.java| 33 +++-- .../airavata/common/utils/ApplicationSettings.java | 5 + .../airavata/common/utils/ThriftClientPool.java| 23 +++- .../common/utils/ThriftClientPoolTest.java | 63 + .../src/main/assembly/controller-bin-assembly.xml | 1 + .../main/assembly/email-monitor-bin-assembly.xml | 1 + .../src/main/assembly/parser-wm-bin-assembly.xml | 1 + .../src/main/assembly/participant-bin-assembly.xml | 1 + .../assembly/platform-monitor-bin-assembly.xml | 1 + .../src/main/assembly/post-wm-bin-assembly.xml | 1 + .../src/main/assembly/pre-wm-bin-assembly.xml | 1 + .../assembly/realtime-monitor-bin-assembly.xml | 1 + .../src/main/resources/airavata-server.properties | 1 + .../next/DeltaScripts/appCatalog_schema_delta.sql | 19 +++ 60 files changed, 985 insertions(+), 131 deletions(-)
