You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2023/07/03 19:45:28 UTC
[airavata] branch AIRAVATA-3697 updated (33300327fc -> 6fcefb2c47)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch AIRAVATA-3697
in repository https://gitbox.apache.org/repos/asf/airavata.git
from 33300327fc AIRAVATA-3697 Db migrations and changing PRODUCT_NAME, REPLICA_NAME to clobs
add 6ee9a3f3b7 Commenting out shelving gateways
add bd2efcf861 Commented shelving gateways, Mines and UNG.
add 09e6aaf435 AIRAVATA-3694 Ansible: configure data archive max ages for scigap hosted gateways
add 0bafa1eaa4 Commented gateways SMALTR to shelve.
add 8a30c61ee5 Ansible: add ssl certificate generation and HAProxy for api server
add 960086dcf6 Ansible fixes and configuring api server to NOT listen on TLS port
add fe68cafe32 Removing unneeded task
add 6f2116e3bf Merge pull request #423 from apache/ansible-haproxy
add eec05021bc Ansible: switching dev.amp domain back
add 9fd7b2e620 Merge branch 'master' into develop
add f87b434db9 Ansible: cyberwater config for js2
add dba1280045 Ansible: remove interactwel app until install is fixed
add 39a05612d2 Ansible: switching interactwel domain name back
add e7fd8c2d90 Merge branch 'master' into develop
add f347f1922c Merge branch 'master' into develop
add ce941d765f Ansible: tusd for js2 dev web server
add e1b7afb681 Merge branch 'master' into develop
add 8567fd7e74 Merge branch 'master' into develop
add f378e0c973 Ansible: dev delta on js2
add ad4757a98e Merge branch 'master' into develop
add eb8cd037e2 AIRAVATA-3609 Enable legacy TLS security by disabling system properties
add 4847c7f0b4 AIRAVATA-3609 PGA Ansible updates for Rocky and Ansible 2.13
add a7747e6c26 Merge branch 'dev-scigap-org' into develop
add d03a6e54cb Ansible: make develop-js2 inventory the new develop inventory
add 3a580125f3 Ansible: Helix 0.9.10 has replaced 0.9.9 and 0.9.9 is no longer available for download
add 0d3497eb62 Ansible: change dev api server domain address back to apidev.scigap.org
add 51b5f58ad9 Switching the Django seagrid domain in the new JS2 VM
add ea21942f33 Switching the Django simccs domain in the new JS2 VM
add a1d1f50664 Switching the Django Cyberwater domain in the new JS2 VM
add 9f0c6cd780 Ansible: fixing yaml syntax error
add d8ab05e534 Merge branch 'master' into develop
add a9e7edb468 Airavata Metascheduler Project Structure
add 0deaad9937 Add new process status QUEUED, DEQUEUING, REQUEUED
add c8e3b43036 support multiple computeResourceSchedulingEntities
add 09e520416e implement default CR selection policy
add f2f7f1419d intigrate Process Scheduler with Orchestrator
add aa30d23606 fix import error
add 13a8bcd324 Merge branch 'develop' of github.com:fengggli/airavata into develop
add 586da2006f InsecureRequestWarning shall be suppressed inside requests
add d0c22ce0d7 Merge pull request #297 from fengggli/develop
add ddadc7326c Merge branch 'develop' of https://github.com/apache/airavata into metaschedular
add b7e1c2a204 implement cluster live checking
add d5ee89f284 fix ambigutity
add 4594edb8d2 add COMPUTE_RESOURCE_SCHEDULING to expectacatalog
add b0462bd84f Big fix
add 00d2a920bf Big fix
add dfae694159 Big fix
add baf6cc3b9d Bug fix
add d63cf86af5 remove association
add 5831df890d remove association
add 86af4910c8 Add CRP and GRP existance checking methods to stubs
add 2ba55e54cc airavata-api/
add acf39e95f7 externalize monitoring service and implement daemon service to monitor CR
add 4ca3297045 Add monitoring service startup code
add a67235f307 Integrate queue statuc checking into metascheduler
add d912b6cd3d Orchestrator server
add 8edf3255cb support slurm default cases
add e1ebd36414 update python sdk to create remote file folders
add 0f47d334d7 Update settings.ini
add ca70d2c566 conflict resolve
add 29956f713d conflict resolve
add 9bfa2ed3a6 upgrade python sdk
add 21d8cbb7e8 increase sdk version
add cd8d8afe32 Merge pull request #330 from isururanawaka/develop
add 119233ee01 Ansible: re-enabled interactwel django app
add e604a557e6 Minor logging improvements to ssh agent
add 15a3a3833c Merge branch 'master' into develop
add 9ac01f9cba Merge branch 'develop' of https://github.com/apache/airavata into metaschedular
add 3fa679d7c4 bug fix
add c7acf67554 Merge pull request #329 from isururanawaka/metaschedular
add 8dca9578cc update server settings
add b9d880b6b5 Merge pull request #331 from isururanawaka/metaschedular
add 895a44bf93 Adding error logging
add acdbb13d6f Merge pull request #332 from isururanawaka/metaschedular
add 60e2fd9ef2 Add server stating status
add a24f9bd1b4 Merge pull request #333 from isururanawaka/metaschedular
add 618d3fea16 Adding debug logs
add 61aff68bb3 Merge pull request #334 from isururanawaka/metaschedular
add 6b2f7d7759 Adding debug logs
add aa2e3430c0 Merge pull request #335 from isururanawaka/metaschedular
add 3b9c54036f Adding debug logs
add fb1ca69222 Merge pull request #336 from isururanawaka/metaschedular
add a0249cf7d1 Adding debug logs
add 51a797e61f Adding debug logs
add adb6cd2c44 Merge pull request #337 from isururanawaka/metaschedular
add 9371301315 command output logging
add ff3348f5af Merge pull request #338 from isururanawaka/metaschedular
add 3ec0e93da6 Fix monitoring issues
add 229e943e0a Merge pull request #339 from isururanawaka/metaschedular
add 6a96df21a8 metaschedular
add 47b89f90fc Merge pull request #340 from isururanawaka/metaschedular
add 86966b4659 requeue Process for failures in job submission
add 450ed11fac Merge pull request #341 from isururanawaka/metaschedular
add 8d2ba4d09b add process selection
add 38d9a56560 add method to registry handler to list processIds
add a75ecb15b0 implement process scheduler service
add 2eaa5098ea Adding orchestrator integration for resubmitter
add 30f85f7354 Merge pull request #342 from isururanawaka/metaschedular
add 086a817d51 Add metascheduler properties settings file
add b8393e714f Bug fix in JPQ query
add 226f0bdf6a Bug fix on client returing to pool
add 90e30d4eb1 Bug fix in while looping continuation in getProcessListInState
add 4ad39bba03 Bug fix in registry
add b17d03f929 Adding offset
add 9efb93b9a5 Update thrift stubs to include job commands
add b36f85158b Fix registry client creation
add eb68c6f302 Fix registry client creation
add 6c0f6453bb Fix registry client creation
add 45b8019114 big fix in airavata python sdk
add b762aa5623 fix getStatus
add ed25ea29cb add queries
add 340a2fb048 Fix bug in DefaultComputeResourceSelectionPolicy
add 3948596272 bug fix in ProcessSchedulerImpl.java
add 622a290c19 Bug fix in getProcessInState
add 77ae0f4876 Bug fix in ProcessStatusRepository
add b9dabc1a53 Bug fix in ProcessStatusRepository
add ee9c018b96 Bug fix in ProcessStatusRepository
add c57921d140 updating process status by replacing current one
add c25bf68989 multiple job stacks can be created for autoscheduled enabled processes
add 4497259eff delete unsussessfull job models except last one
add b84e425be3 delete by jobPK
add fcf4b3b297 delete by jobPK
add 45972f76f8 Fix optimistic locking error by adding version
add a65c96daec modules
add d713715d6f add execute mthod to delete entites with native query
add d5da9402fb adding named query
add 97decf3d3b Queries
add a2ac18b00b Queries
add e9ff0ef0ac Queries
add 1c8b1ead6a add transtion commit
add 117466786a add transtion commit
add 7502b29bb8 Support multiple compute resources selection for load testing
add 0f466da3e7 Implementing metadata analyzer module for metascheduler
add 280ffe5e30 Implementing metadata analyzer module for metascheduler
add 2b53738cac add getJobCount method
add 0ed42bc1f2 print 5, 10, 15 avgs
add 33e82ca593 Bug fix in Job counting query
add 453cced2c1 Add sql subquery based filtering
add dc4f52dbeb Bug fix in Job counting query
add 51befb362e query modification
add 8122e02dc8 query modification
add 5b55ee6fa7 add time distribution calculation
add d11eafb182 Add process
add 241ad912c1 Add process
add 8eef0e1433 bug fix in data analyzer
add e4f41c2d00 Bug fix in time printing
add 4816daedf1 change time unit
add 8e199d7bfb update user configuration data model to support multiple compute resource scheduling objects
add 8ad28b84d4 Adding ComputationalResourceSchedulingEntity model
add 750393f4e2 declare ComputeResourceSchedulingEntity in persistence.xml
add fe6a08210d support multiple compute resources
add f71eaeb3cf add parallel group count into computeresourcescheduling object
add 363468ac5f Bug fix in Thrift model to ENtity mapping
add dc1b2cfc1b bug fix in Orchestyrator
add 6560baa22c enhance MultiComputeResourcePolicy and orchestrator to select best CR
add ab20a8ed83 change default policy class
add d6171ec2f8 Add metascheduler
add 85b2c26276 Adding OrchService
add 63cb65f95d Fix rescheduler
add 60ad74c677 Add scheduled status to updateExperiment
add d71b97fee2 change process model inputs
add 9d4c72691b Change process inputs according to selected CR
add 579140d350 Change process inputs according to selected CR
add bd92967870 remove experiment update in processScheduler
add e69ed0a66d Read processmodel from updated model in registry
add 7925f86801 Process synchornization after input change
add f2371e0544 update experiment model after slecting CR
add db8bf345f8 cleaning up metscheduler multiple CRs
add b353c6676e Fix wrong rescheduler class
add d25064535e update airavata keystore
add f9980f76ba update cluster status when job failed
add 95eaf43160 Bug fix:relaunching message flow skipping task creation
add e22c9e4125 Bug fix:relaunching message flow skipping task creation
add fba23ee247 return resource to pool
add 81ae9c440b Add delete tasks method
add 5a6219aed1 Merge pull request #343 from isururanawaka/metaschedular
add 290804d129 Merge pull request #344 from isururanawaka/metaschedular
add a02719894a Merge pull request #345 from isururanawaka/metaschedular
add b90fb93381 Merge pull request #346 from isururanawaka/metaschedular
add d7adb5f2cd Merge pull request #347 from isururanawaka/metaschedular
add 6f99b9bcdc Merge pull request #348 from isururanawaka/metaschedular
add f449e2f8e7 Merge pull request #349 from isururanawaka/metaschedular
add d0ee709f9f Merge pull request #350 from isururanawaka/metaschedular
add 196d96d8f4 Merge pull request #351 from isururanawaka/metaschedular
add 141602cc88 Merge pull request #352 from isururanawaka/metaschedular
add c265079ca6 Merge pull request #353 from isururanawaka/metaschedular
add e2c1f2b9bd Merge pull request #354 from isururanawaka/metaschedular
add 34862e7372 Merge pull request #355 from isururanawaka/metaschedular
add 8654097195 Merge pull request #356 from isururanawaka/metaschedular
add 6a3736262a Merge pull request #357 from isururanawaka/metaschedular
add 495defd1f7 AIRAVATA-3676 simplifying gateway user storages configuration
add 2f3e62ea3d Ansible: update interactwel django app to master branch
add d59b826161 Ansible: updating to new zabbix location for dev scigap
add bac234617d Merge pull request #362 from isururanawaka/metaschedular
add 9f398dc98f Merge pull request #363 from isururanawaka/metaschedular
add a5678462f0 Merge pull request #364 from isururanawaka/metaschedular
add 1b70f2dd92 Merge pull request #365 from isururanawaka/metaschedular
add be7368309b Merge pull request #366 from isururanawaka/metaschedular
add 48d4b21f31 Merge pull request #367 from isururanawaka/metaschedular
add eb534f7e65 Merge pull request #368 from isururanawaka/metaschedular
add ea03a7645d Merge pull request #369 from isururanawaka/metaschedular
add cd39efcb08 Merge pull request #370 from isururanawaka/metaschedular
add c8fdf596d8 Merge pull request #371 from isururanawaka/metaschedular
add abf2d7857e Adding dev UltraScan Portal
add 505ebda77e Adding dev UltraScan Portal
add 68562b2b0d Adding dev UltraScan Portal
add e90de56a80 Adding dev UltraScan Portal
add 2feb3e2485 Reming travis file as we move to github actions
add 15f3114ee7 Merge pull request #372 from isururanawaka/metaschedular
add 317ffa64d8 Merge pull request #374 from isururanawaka/metaschedular
add 6a573ad947 Merge pull request #375 from isururanawaka/metaschedular
add 9bc5411049 Merge pull request #376 from isururanawaka/metaschedular
add e4a06b0f4c Merge pull request #377 from isururanawaka/metaschedular
add 36a8dc29b3 Merge pull request #378 from isururanawaka/metaschedular
add 3ada9dbfe2 Merge pull request #379 from isururanawaka/metaschedular
add e354b45ea5 Merge pull request #380 from isururanawaka/metaschedular
add 0be3097e99 Merge pull request #381 from isururanawaka/metaschedular
add 3a7585548c Merge pull request #382 from isururanawaka/metaschedular
add 68f4d3a9d0 Merge pull request #383 from isururanawaka/metaschedular
add 2dc66ff72e Merge pull request #384 from isururanawaka/metaschedular
add df5f7c8041 Merge branch 'AIRAVATA-3680' into develop
add 78e24e0b7b Ansible: shared directory for django.seagrid.org
add 25db1af189 Merge pull request #386 from isururanawaka/metaschedular
add 6f94545327 Merge pull request #387 from isururanawaka/metaschedular
add 5836029d0e Merging transfer input files from pre job commands for HTCondor script
add 35f78c00b0 Merge pull request #388 from isururanawaka/metaschedular
add 51f196ef03 Merge pull request #389 from isururanawaka/metaschedular
add 79394bfcb7 Merge pull request #390 from isururanawaka/metaschedular
add 66683319a3 Merge pull request #391 from isururanawaka/metaschedular
add e91abc3d99 Merge pull request #392 from isururanawaka/metaschedular
add 80925babf1 Merge pull request #393 from isururanawaka/metaschedular
add a2d7b2d0b1 Merge pull request #394 from isururanawaka/metaschedular
add 42fdcfc109 Merge pull request #395 from isururanawaka/metaschedular
add d86792a883 Merge pull request #396 from isururanawaka/metaschedular
add bf07c02007 Merge pull request #397 from isururanawaka/metaschedular
add ce29e9f0c8 Merge pull request #398 from isururanawaka/metaschedular
add 8d3f250823 Merge pull request #399 from isururanawaka/metaschedular
add 0bb6ad8e05 Merge pull request #400 from isururanawaka/metaschedular
add d61becc45b Merge pull request #401 from isururanawaka/metaschedular
add 9e77ace42d Merge pull request #402 from isururanawaka/metaschedular
add 25a5da1ab2 Merge pull request #403 from isururanawaka/metaschedular
add c97ac4890c Merge pull request #404 from isururanawaka/metaschedular
add ab68e54c68 Merge pull request #405 from isururanawaka/metaschedular
add 52c4299c96 Merge pull request #406 from isururanawaka/metaschedular
add e7d9b90c20 Merge pull request #407 from isururanawaka/metaschedular
add 8a95dc0738 Removing realtime monitoring from condor jobs
add 5c6f87ff83 Merge pull request #408 from isururanawaka/metaschedular
add eabb865930 AIRAVATA-3529 Upgrade Thrift to 0.18.1
add 1ba0eebd8a AIRAVATA-3529 Publishing new version of python sdk with 0.18.1 generated stubs
add 94266a6fd2 Merge pull request #409 from apache/thrift-0.18.1-upgrade
add 232ef5ced4 ide-integration fixes: add missing table to migration script and default properties
add 1530cb3ca3 Merge pull request #411 from isururanawaka/metaschedular
add dcae5a3575 Merge pull request #412 from isururanawaka/metaschedular
add 9c8e0600eb Merge pull request #413 from isururanawaka/metaschedular
add 29b3934272 Merge pull request #414 from isururanawaka/metaschedular
add 039e8607c5 add delete tasks method
add a1e9996ec3 all full queue model
add e64a28a934 Merge pull request #415 from isururanawaka/metaschedular
add 85e2ef4581 Merge branch 'archive-user-data' into develop
add 089ff2bd8f Merge branch 'archive-user-data' into develop
add e99c83d7a9 Ansible: dev configuration for user data archive
add fc8b3ed725 Merge branch 'develop' of https://github.com/apache/airavata into metaschedular
add d153e225ab Merge pull request #419 from isururanawaka/metaschedular
add 538745201b Merge branch 'AIRAVATA-3697' into develop
add 8bf8ee0069 Merge branch 'AIRAVATA-3697' into develop
add c76ada3b9e Deploying dev Gkeyll gateway
add 4e50fab5e9 Ansible: Use inventory_hostname for CN of default self-signed cert
add eb4b8e9091 Ansible: disable tusd deploy for dev-gkeyll
add f16fba5036 Commented gateways to discontinue. WVSU, UAB, TopPIC, V4I
add f27dc9b69b Adding gateway SSH key to dev Gkeyll.
add 1961fc5c51 Added gateway storage details in to the file.
add a8ac0ca3a7 Adding metascheduler migration script
add 1937289596 Ansible: add zenodo integration django app to dev-gkeyll
add c3ac4b390f Merge branch 'ansible-haproxy' into develop
add 4da6cffda5 Merge branch 'ansible-haproxy' into develop
add 431c414ded Merge branch 'develop'
add d9d1224ef3 Ansible: adding metascheduler properties for prod
add 7a91399b97 Ansible: prod metascheduler config for ultrascan
add a5ba0ca77f Ansible: add public hostname for api server
add ff6ebdffa0 Log error message if db init fails
add d1f439491e changing check table to CONFIGURATION
add 709493625c Ansible: fixes for haproxy configuration
add ca9d5155ba AIRAVATA-3694 Fix comparison when var is a string
add 161dd0a21b AIRAVATA-3694 Fix comparison when var is a string
add 4acfa4aa84 fix hardcorded ipaddress
add 0b1880f8b7 Merge pull request #428 from isururanawaka/metaschedular
add 7daac92d61 Ansible: updating google analytics tracking id to GA4 one
add 244a1fa235 Ansible: smiles django app config
new 6fcefb2c47 AIRAVATA-3697 Switching to column level utf8 character set
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
AWSCLIV2.pkg | Bin 0 -> 14479360 bytes
.../airavata/api/server/AiravataAPIServer.java | 7 +-
.../api/server/handler/AiravataServerHandler.java | 27 +-
.../java/org/apache/airavata/api/Airavata.java | 22284 ++++--
.../apache/airavata/api/airavata_apiConstants.java | 2 +-
.../java/org/apache/airavata/base/api/BaseAPI.java | 75 +-
.../src/main/resources/lib/airavata/Airavata.cpp | 7726 +-
.../src/main/resources/lib/airavata/Airavata.h | 415 +-
.../lib/airavata/Airavata_server.skeleton.cpp | 54 +-
.../lib/airavata/application_io_models_types.cpp | 22 +
.../lib/airavata/application_io_models_types.h | 12 +-
.../lib/airavata/compute_resource_model_types.cpp | 20 +-
.../lib/airavata/compute_resource_model_types.h | 8 +-
.../lib/airavata/experiment_model_types.cpp | 544 +-
.../lib/airavata/experiment_model_types.h | 10 +-
.../lib/airavata/group_manager_model_types.cpp | 8 +-
.../lib/airavata/group_manager_model_types.h | 3 +-
.../group_resource_profile_model_types.cpp | 596 +-
.../airavata/group_resource_profile_model_types.h | 98 +-
.../lib/airavata/messaging_events_types.cpp | 202 +-
.../lib/airavata/messaging_events_types.h | 55 +-
.../lib/airavata/scheduling_model_types.cpp | 22 +
.../lib/airavata/scheduling_model_types.h | 12 +-
.../resources/lib/airavata/status_models_types.cpp | 34 +-
.../resources/lib/airavata/status_models_types.h | 17 +-
.../lib/airavata/workspace_model_types.cpp | 180 +-
.../resources/lib/airavata/workspace_model_types.h | 52 +
.../main/resources/lib/Airavata/API/Airavata.php | 7746 +-
.../API/Sharing/SharingRegistryService.php | 1 +
.../Model/AppCatalog/ComputeResource/Types.php | 8 +
.../AppCatalog/GroupResourceProfile/Types.php | 411 +-
.../lib/Airavata/Model/Application/Io/Types.php | 25 +
.../lib/Airavata/Model/Experiment/Types.php | 289 +-
.../resources/lib/Airavata/Model/Group/Types.php | 2 +
.../lib/Airavata/Model/Messaging/Event/Types.php | 149 +
.../lib/Airavata/Model/Scheduling/Types.php | 23 +
.../resources/lib/Airavata/Model/Sharing/Types.php | 24 +
.../resources/lib/Airavata/Model/Status/Types.php | 29 +
.../lib/Airavata/Model/Workspace/Types.php | 121 +
.../airavata/api/Airavata-remote | 2 +-
.../airavata-python-sdk/airavata/api/Airavata.py | 12552 +--
.../airavata-python-sdk/airavata/api/constants.py | 4 +-
.../credential/store/CredentialStoreService-remote | 2 +-
.../api/credential/store/CredentialStoreService.py | 640 +-
.../airavata/api/credential/store/constants.py | 4 +-
.../api/credential/store/error/constants.py | 4 +-
.../airavata/api/credential/store/error/ttypes.py | 44 +-
.../airavata/api/credential/store/ttypes.py | 7 +-
.../airavata/api/error/constants.py | 4 +-
.../airavata/api/error/ttypes.py | 428 +-
.../api/sharing/SharingRegistryService-remote | 2 +-
.../airavata/api/sharing/SharingRegistryService.py | 2855 +-
.../airavata/api/sharing/constants.py | 4 +-
.../airavata/api/sharing/ttypes.py | 7 +-
.../airavata-python-sdk/airavata/api/ttypes.py | 7 +-
.../airavata/base/api/BaseAPI-remote | 2 +-
.../airavata/base/api/BaseAPI.py | 46 +-
.../airavata/base/api/constants.py | 4 +-
.../airavata/base/api/ttypes.py | 7 +-
.../appcatalog/accountprovisioning/constants.py | 4 +-
.../model/appcatalog/accountprovisioning/ttypes.py | 55 +-
.../model/appcatalog/appdeployment/constants.py | 4 +-
.../model/appcatalog/appdeployment/ttypes.py | 139 +-
.../model/appcatalog/appinterface/constants.py | 4 +-
.../model/appcatalog/appinterface/ttypes.py | 47 +-
.../model/appcatalog/computeresource/constants.py | 4 +-
.../model/appcatalog/computeresource/ttypes.py | 336 +-
.../model/appcatalog/gatewaygroups/constants.py | 4 +-
.../model/appcatalog/gatewaygroups/ttypes.py | 35 +-
.../model/appcatalog/gatewayprofile/constants.py | 4 +-
.../model/appcatalog/gatewayprofile/ttypes.py | 143 +-
.../appcatalog/groupresourceprofile/constants.py | 4 +-
.../appcatalog/groupresourceprofile/ttypes.py | 253 +-
.../model/appcatalog/parallelism/constants.py | 4 +-
.../model/appcatalog/parallelism/ttypes.py | 8 +-
.../airavata/model/appcatalog/parser/constants.py | 4 +-
.../airavata/model/appcatalog/parser/ttypes.py | 225 +-
.../model/appcatalog/storageresource/constants.py | 4 +-
.../model/appcatalog/storageresource/ttypes.py | 43 +-
.../appcatalog/userresourceprofile/constants.py | 4 +-
.../model/appcatalog/userresourceprofile/ttypes.py | 125 +-
.../airavata/model/application/io/constants.py | 4 +-
.../airavata/model/application/io/ttypes.py | 112 +-
.../airavata/model/commons/constants.py | 4 +-
.../airavata/model/commons/ttypes.py | 77 +-
.../airavata/model/constants.py | 4 +-
.../airavata/model/credential/store/constants.py | 4 +-
.../airavata/model/credential/store/ttypes.py | 186 +-
.../airavata/model/data/movement/constants.py | 4 +-
.../airavata/model/data/movement/ttypes.py | 133 +-
.../airavata/model/data/replica/constants.py | 4 +-
.../airavata/model/data/replica/ttypes.py | 111 +-
.../airavata/model/dbevent/constants.py | 4 +-
.../airavata/model/dbevent/ttypes.py | 91 +-
.../airavata/model/experiment/constants.py | 4 +-
.../airavata/model/experiment/ttypes.py | 404 +-
.../airavata/model/group/constants.py | 4 +-
.../airavata/model/group/ttypes.py | 43 +-
.../airavata/model/job/constants.py | 4 +-
.../airavata/model/job/ttypes.py | 61 +-
.../airavata/model/messaging/event/constants.py | 4 +-
.../airavata/model/messaging/event/ttypes.py | 347 +-
.../airavata/model/process/constants.py | 4 +-
.../airavata/model/process/ttypes.py | 127 +-
.../airavata/model/scheduling/constants.py | 4 +-
.../airavata/model/scheduling/ttypes.py | 73 +-
.../airavata/model/security/constants.py | 4 +-
.../airavata/model/security/ttypes.py | 29 +-
.../airavata/model/sharing/constants.py | 4 +-
.../airavata/model/sharing/ttypes.py | 441 +-
.../airavata/model/status/constants.py | 4 +-
.../airavata/model/status/ttypes.py | 154 +-
.../airavata/model/task/constants.py | 4 +-
.../airavata/model/task/ttypes.py | 139 +-
.../airavata/model/tenant/constants.py | 4 +-
.../airavata/model/tenant/ttypes.py | 173 +-
.../airavata-python-sdk/airavata/model/ttypes.py | 7 +-
.../airavata/model/user/constants.py | 4 +-
.../airavata/model/user/ttypes.py | 266 +-
.../airavata/model/workflow/constants.py | 4 +-
.../airavata/model/workflow/ttypes.py | 271 +-
.../airavata/model/workspace/constants.py | 4 +-
.../airavata/model/workspace/ttypes.py | 261 +-
.../airavata/service/profile/constants.py | 4 +-
.../groupmanager/cpi/GroupManagerService-remote | 11 +-
.../groupmanager/cpi/GroupManagerService.py | 883 +-
.../service/profile/groupmanager/cpi/constants.py | 4 +-
.../profile/groupmanager/cpi/error/constants.py | 4 +-
.../profile/groupmanager/cpi/error/ttypes.py | 44 +-
.../service/profile/groupmanager/cpi/ttypes.py | 7 +-
.../iam/admin/services/cpi/IamAdminServices-remote | 2 +-
.../iam/admin/services/cpi/IamAdminServices.py | 825 +-
.../profile/iam/admin/services/cpi/constants.py | 4 +-
.../iam/admin/services/cpi/error/constants.py | 4 +-
.../profile/iam/admin/services/cpi/error/ttypes.py | 44 +-
.../profile/iam/admin/services/cpi/ttypes.py | 7 +-
.../profile/tenant/cpi/TenantProfileService-remote | 2 +-
.../profile/tenant/cpi/TenantProfileService.py | 375 +-
.../service/profile/tenant/cpi/constants.py | 4 +-
.../service/profile/tenant/cpi/error/constants.py | 4 +-
.../service/profile/tenant/cpi/error/ttypes.py | 44 +-
.../airavata/service/profile/tenant/cpi/ttypes.py | 7 +-
.../airavata/service/profile/ttypes.py | 7 +-
.../profile/user/cpi/UserProfileService-remote | 11 +-
.../service/profile/user/cpi/UserProfileService.py | 557 +-
.../airavata/service/profile/user/cpi/constants.py | 4 +-
.../service/profile/user/cpi/error/constants.py | 4 +-
.../service/profile/user/cpi/error/ttypes.py | 44 +-
.../airavata/service/profile/user/cpi/ttypes.py | 7 +-
.../airavata_sdk/clients/keycloak_token_fetcher.py | 38 +-
.../clients/sftp_file_handling_client.py | 53 +-
.../clients/utils/api_server_client_util.py | 25 +-
.../clients/utils/data_model_creation_util.py | 48 +-
.../clients/utils/experiment_handler_util.py | 199 +
.../airavata_sdk/transport/settings.ini | 15 +-
.../airavata_sdk/transport/settings.py | 19 +
.../airavata_sdk/transport/utils.py | 2 +-
.../airavata-python-sdk/requirements.txt | 4 +-
.../airavata-python-sdk/setup.py | 2 +-
.../org/apache/airavata/model/ComponentState.java | 9 +-
.../org/apache/airavata/model/ComponentStatus.java | 41 +-
.../java/org/apache/airavata/model/EdgeModel.java | 53 +-
.../java/org/apache/airavata/model/NodeModel.java | 67 +-
.../java/org/apache/airavata/model/PortModel.java | 60 +-
.../org/apache/airavata/model/WorkflowModel.java | 98 +-
.../org/apache/airavata/model/WorkflowState.java | 9 +-
.../org/apache/airavata/model/WorkflowStatus.java | 41 +-
.../accountprovisioning/SSHAccountProvisioner.java | 50 +-
.../SSHAccountProvisionerConfigParam.java | 48 +-
.../SSHAccountProvisionerConfigParamType.java | 9 +-
.../ApplicationDeploymentDescription.java | 168 +-
.../appdeployment/ApplicationModule.java | 55 +-
.../appcatalog/appdeployment/CommandObject.java | 36 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 43 +-
.../ApplicationInterfaceDescription.java | 94 +-
.../appcatalog/computeresource/BatchQueue.java | 68 +-
.../computeresource/CloudJobSubmission.java | 69 +-
.../ComputeResourceDescription.java | 181 +-
.../model/appcatalog/computeresource/DMType.java | 9 +-
.../appcatalog/computeresource/FileSystems.java | 9 +-
.../computeresource/GlobusJobSubmission.java | 53 +-
.../computeresource/JobManagerCommand.java | 20 +-
.../computeresource/JobSubmissionInterface.java | 43 +-
.../computeresource/JobSubmissionProtocol.java | 9 +-
.../computeresource/LOCALSubmission.java | 48 +-
.../appcatalog/computeresource/MonitorMode.java | 9 +-
.../appcatalog/computeresource/ProviderName.java | 9 +-
.../computeresource/ResourceJobManager.java | 125 +-
.../computeresource/ResourceJobManagerType.java | 9 +-
.../computeresource/SSHJobSubmission.java | 78 +-
.../computeresource/UnicoreJobSubmission.java | 48 +-
.../appcatalog/gatewaygroups/GatewayGroups.java | 53 +-
.../gatewayprofile/ComputeResourcePreference.java | 141 +-
.../gatewayprofile/GatewayResourceProfile.java | 83 +-
.../gatewayprofile/StoragePreference.java | 53 +-
.../BatchQueueResourcePolicy.java | 59 +-
.../ComputeResourcePolicy.java | 60 +-
.../ComputeResourceReservation.java | 57 +-
.../GroupAccountSSHProvisionerConfig.java | 53 +-
.../GroupComputeResourcePreference.java | 146 +-
.../groupresourceprofile/GroupResourceProfile.java | 101 +-
.../airavata/model/appcatalog/parser/IOType.java | 9 +-
.../airavata/model/appcatalog/parser/Parser.java | 95 +-
.../model/appcatalog/parser/ParserConnector.java | 67 +-
.../appcatalog/parser/ParserConnectorInput.java | 60 +-
.../model/appcatalog/parser/ParserInput.java | 55 +-
.../model/appcatalog/parser/ParserOutput.java | 55 +-
.../model/appcatalog/parser/ParsingTemplate.java | 74 +-
.../appcatalog/parser/ParsingTemplateInput.java | 60 +-
.../StorageResourceDescription.java | 68 +-
.../UserComputeResourcePreference.java | 89 +-
.../userresourceprofile/UserResourceProfile.java | 90 +-
.../userresourceprofile/UserStoragePreference.java | 53 +-
.../airavata/model/application/io/DataType.java | 9 +-
.../model/application/io/InputDataObjectType.java | 95 +-
.../model/application/io/OutputDataObjectType.java | 91 +-
.../apache/airavata/model/commons/ErrorModel.java | 64 +-
.../airavata/model/commons/ValidationResults.java | 41 +-
.../airavata/model/commons/ValidatorResult.java | 36 +-
.../model/commons/airavata_commonsConstants.java | 2 +-
.../credential/store/CertificateCredential.java | 71 +-
.../model/credential/store/CommunityUser.java | 46 +-
.../model/credential/store/CredentialSummary.java | 69 +-
.../model/credential/store/PasswordCredential.java | 69 +-
.../model/credential/store/SSHCredential.java | 76 +-
.../model/credential/store/SummaryType.java | 9 +-
.../credential_store_data_modelsConstants.java | 2 +-
.../airavata/model/data/movement/DMType.java | 9 +-
.../model/data/movement/DataMovementInterface.java | 54 +-
.../model/data/movement/DataMovementProtocol.java | 9 +-
.../model/data/movement/GridFTPDataMovement.java | 55 +-
.../model/data/movement/LOCALDataMovement.java | 34 +-
.../model/data/movement/SCPDataMovement.java | 50 +-
.../model/data/movement/SecurityProtocol.java | 9 +-
.../model/data/movement/UnicoreDataMovement.java | 48 +-
.../model/data/replica/DataProductModel.java | 111 +-
.../model/data/replica/DataProductType.java | 9 +-
.../data/replica/DataReplicaLocationModel.java | 104 +-
.../data/replica/ReplicaLocationCategory.java | 9 +-
.../model/data/replica/ReplicaPersistentType.java | 9 +-
.../apache/airavata/model/dbevent/CrudType.java | 9 +-
.../airavata/model/dbevent/DBEventMessage.java | 46 +-
.../model/dbevent/DBEventMessageContext.java | 16 +-
.../airavata/model/dbevent/DBEventPublisher.java | 32 +-
.../model/dbevent/DBEventPublisherContext.java | 47 +-
.../airavata/model/dbevent/DBEventSubscriber.java | 32 +-
.../apache/airavata/model/dbevent/DBEventType.java | 9 +-
.../apache/airavata/model/dbevent/EntityType.java | 9 +-
.../model/error/AiravataClientException.java | 41 +-
.../airavata/model/error/AiravataErrorType.java | 9 +-
.../model/error/AiravataSystemException.java | 41 +-
.../model/error/AuthenticationException.java | 34 +-
.../model/error/AuthorizationException.java | 34 +-
.../model/error/DuplicateEntryException.java | 34 +-
.../model/error/ExperimentNotFoundException.java | 34 +-
.../model/error/InvalidRequestException.java | 34 +-
.../model/error/LaunchValidationException.java | 39 +-
.../model/error/ProjectNotFoundException.java | 34 +-
.../airavata/model/error/TimedOutException.java | 27 +-
.../airavata/model/error/ValidationResults.java | 41 +-
.../airavata/model/error/ValidatorResult.java | 34 +-
.../airavata/model/experiment/ExperimentModel.java | 375 +-
.../model/experiment/ExperimentSearchFields.java | 9 +-
.../model/experiment/ExperimentStatistics.java | 301 +-
.../model/experiment/ExperimentSummaryModel.java | 92 +-
.../airavata/model/experiment/ExperimentType.java | 9 +-
.../model/experiment/ProjectSearchFields.java | 9 +-
.../experiment/UserConfigurationDataModel.java | 243 +-
.../apache/airavata/model/group/GroupModel.java | 81 +-
.../model/group/ResourcePermissionType.java | 9 +-
.../apache/airavata/model/group/ResourceType.java | 9 +-
.../org/apache/airavata/model/job/JobModel.java | 106 +-
.../event/ExperimentIntermediateOutputsEvent.java | 53 +-
.../event/ExperimentStatusChangeEvent.java | 46 +-
.../messaging/event/ExperimentSubmitEvent.java | 39 +-
.../model/messaging/event/JobIdentifier.java | 60 +-
.../messaging/event/JobStatusChangeEvent.java | 39 +-
.../event/JobStatusChangeRequestEvent.java | 39 +-
.../airavata/model/messaging/event/Message.java | 56 +-
.../model/messaging/event/MessageLevel.java | 9 +-
.../model/messaging/event/MessageType.java | 9 +-
.../model/messaging/event/ProcessIdentifier.java | 46 +-
.../messaging/event/ProcessStatusChangeEvent.java | 39 +-
.../event/ProcessStatusChangeRequestEvent.java | 39 +-
.../model/messaging/event/ProcessSubmitEvent.java | 53 +-
.../messaging/event/ProcessTerminateEvent.java | 46 +-
.../model/messaging/event/TaskIdentifier.java | 53 +-
.../messaging/event/TaskOutputChangeEvent.java | 46 +-
.../messaging/event/TaskStatusChangeEvent.java | 39 +-
.../event/TaskStatusChangeRequestEvent.java | 39 +-
.../parallelism/ApplicationParallelismType.java | 9 +-
.../airavata/model/process/ProcessModel.java | 233 +-
.../airavata/model/process/ProcessWorkflow.java | 48 +-
.../ComputationalResourceSchedulingModel.java | 192 +-
.../apache/airavata/model/security/AuthzToken.java | 49 +-
.../airavata/model/status/ExperimentState.java | 9 +-
.../airavata/model/status/ExperimentStatus.java | 50 +-
.../org/apache/airavata/model/status/JobState.java | 9 +-
.../apache/airavata/model/status/JobStatus.java | 48 +-
.../apache/airavata/model/status/ProcessState.java | 20 +-
.../airavata/model/status/ProcessStatus.java | 162 +-
.../airavata/model/status/QueueStatusModel.java | 47 +-
.../apache/airavata/model/status/TaskState.java | 9 +-
.../apache/airavata/model/status/TaskStatus.java | 48 +-
.../apache/airavata/model/task/DataStageType.java | 9 +-
.../airavata/model/task/DataStagingTaskModel.java | 71 +-
.../model/task/EnvironmentSetupTaskModel.java | 41 +-
.../model/task/JobSubmissionTaskModel.java | 41 +-
.../airavata/model/task/MonitorTaskModel.java | 32 +-
.../org/apache/airavata/model/task/TaskModel.java | 113 +-
.../org/apache/airavata/model/task/TaskTypes.java | 9 +-
.../org/apache/airavata/model/tenant/Tenant.java | 104 +-
.../model/tenant/TenantApprovalStatus.java | 9 +-
.../apache/airavata/model/tenant/TenantConfig.java | 53 +-
.../airavata/model/tenant/TenantPreferences.java | 46 +-
.../airavata/model/user/CustomDashboard.java | 202 +-
.../airavata/model/user/NSFDemographics.java | 120 +-
.../org/apache/airavata/model/user/Status.java | 9 +-
.../apache/airavata/model/user/USCitizenship.java | 9 +-
.../apache/airavata/model/user/UserProfile.java | 222 +-
.../org/apache/airavata/model/user/disability.java | 9 +-
.../org/apache/airavata/model/user/ethnicity.java | 9 +-
.../java/org/apache/airavata/model/user/race.java | 9 +-
.../model/user/user_profile_modelConstants.java | 2 +-
.../airavata/model/workflow/AiravataWorkflow.java | 120 +-
.../airavata/model/workflow/ApplicationState.java | 9 +-
.../airavata/model/workflow/ApplicationStatus.java | 48 +-
.../airavata/model/workflow/ComponentType.java | 9 +-
.../apache/airavata/model/workflow/DataBlock.java | 50 +-
.../airavata/model/workflow/HandlerState.java | 9 +-
.../airavata/model/workflow/HandlerStatus.java | 48 +-
.../airavata/model/workflow/HandlerType.java | 9 +-
.../model/workflow/WorkflowApplication.java | 100 +-
.../model/workflow/WorkflowConnection.java | 85 +-
.../airavata/model/workflow/WorkflowHandler.java | 99 +-
.../airavata/model/workflow/WorkflowState.java | 9 +-
.../airavata/model/workflow/WorkflowStatus.java | 48 +-
.../apache/airavata/model/workspace/Gateway.java | 160 +-
.../model/workspace/GatewayApprovalStatus.java | 9 +-
.../workspace/GatewayUsageReportingCommand.java | 46 +-
.../org/apache/airavata/model/workspace/Group.java | 39 +-
.../airavata/model/workspace/Notification.java | 66 +-
.../model/workspace/NotificationPriority.java | 9 +-
.../apache/airavata/model/workspace/Project.java | 90 +-
.../org/apache/airavata/model/workspace/User.java | 67 +-
.../groupmanager/cpi/GroupManagerService.java | 2388 +-
.../exception/GroupManagerServiceException.java | 32 +-
.../cpi/group_manager_cpiConstants.java | 2 +-
.../iam/admin/services/cpi/IamAdminServices.java | 1479 +-
.../cpi/exception/IamAdminServicesException.java | 32 +-
.../cpi/iam_admin_services_cpiConstants.java | 2 +-
.../profile/tenant/cpi/TenantProfileService.java | 680 +-
.../exception/TenantProfileServiceException.java | 32 +-
.../tenant/cpi/profile_tenant_cpiConstants.java | 2 +-
.../profile/user/cpi/UserProfileService.java | 1610 +-
.../cpi/exception/UserProfileServiceException.java | 32 +-
.../user/cpi/profile_user_cpiConstants.java | 2 +-
dev-tools/ansible/airavata.yml | 1 +
dev-tools/ansible/apiserver.yml | 1 +
.../scigap/develop-js2/files/airavata.jks | 76 -
.../scigap/develop-js2/files/airavata_sym.jks | 30 -
.../scigap/develop-js2/files/client_truststore.jks | Bin 6618 -> 0 bytes
.../scigap/develop-js2/files/keycloak.jks | 143 -
.../scigap/develop-js2/group_vars/all/vars.yml | 237 -
.../scigap/develop-js2/group_vars/all/vault.yml | 37 -
.../scigap/develop-js2/group_vars/django/vars.yml | 54 -
.../scigap/develop-js2/host_vars/amp/vars.yml | 76 -
.../scigap/develop-js2/host_vars/amp/vault.yml | 12 -
.../scigap/develop-js2/host_vars/csbglsu/vars.yml | 47 -
.../scigap/develop-js2/host_vars/csbglsu/vault.yml | 12 -
.../host_vars/custos-testdrive/vars.yml | 56 -
.../host_vars/custos-testdrive/vault.yml | 12 -
.../develop-js2/host_vars/cyberwater/vars.yml | 47 -
.../develop-js2/host_vars/cyberwater/vault.yml | 12 -
.../scigap/develop-js2/host_vars/delta/vars.yml | 61 -
.../scigap/develop-js2/host_vars/delta/vault.yml | 12 -
.../scigap/develop-js2/host_vars/geo/vars.yml | 60 -
.../scigap/develop-js2/host_vars/geo/vault.yml | 12 -
.../develop-js2/host_vars/interactwel/vault.yml | 12 -
.../scigap/develop-js2/host_vars/mines/vars.yml | 48 -
.../scigap/develop-js2/host_vars/mines/vault.yml | 12 -
.../scigap/develop-js2/host_vars/nexttdb/vars.yml | 47 -
.../scigap/develop-js2/host_vars/nexttdb/vault.yml | 12 -
.../develop-js2/host_vars/pfec-hydro/vars.yml | 47 -
.../develop-js2/host_vars/pfec-hydro/vault.yml | 12 -
.../scigap/develop-js2/host_vars/rnamake/vault.yml | 12 -
.../scigap/develop-js2/host_vars/saver-x/vars.yml | 47 -
.../scigap/develop-js2/host_vars/saver-x/vault.yml | 12 -
.../scigap/develop-js2/host_vars/seagrid/vars.yml | 49 -
.../scigap/develop-js2/host_vars/seagrid/vault.yml | 12 -
.../simccs/files/django-ssl-vhost.conf.j2 | 94 -
.../scigap/develop-js2/host_vars/simccs/vars.yml | 71 -
.../scigap/develop-js2/host_vars/simccs/vault.yml | 12 -
.../develop-js2/host_vars/simvascular/vars.yml | 46 -
.../develop-js2/host_vars/simvascular/vault.yml | 12 -
.../scigap/develop-js2/host_vars/usd/vars.yml | 48 -
.../scigap/develop-js2/host_vars/usd/vault.yml | 12 -
.../ansible/inventories/scigap/develop-js2/hosts | 40 -
.../inventories/scigap/develop/files/airavata.jks | Bin 6057 -> 6162 bytes
.../scigap/develop/files/airavata_sym.jks | Bin 2363 -> 6162 bytes
.../scigap/develop/group_vars/all/vars.yml | 26 +-
.../scigap/develop/group_vars/django/vars.yml | 25 +-
.../group_vars/django/vault.yml | 0
.../scigap/develop/host_vars/amp/vars.yml | 26 +-
.../scigap/develop/host_vars/amp/vault.yml | 25 +-
.../scigap/develop/host_vars/csbglsu/vars.yml | 6 -
.../scigap/develop/host_vars/csbglsu/vault.yml | 25 +-
.../develop/host_vars/custos-testdrive/vars.yml | 6 -
.../develop/host_vars/custos-testdrive/vault.yml | 25 +-
.../scigap/develop/host_vars/cyberwater/vars.yml | 18 +-
.../scigap/develop/host_vars/cyberwater/vault.yml | 25 +-
.../scigap/develop/host_vars/delta/vars.yml | 27 +-
.../scigap/develop/host_vars/delta/vault.yml | 25 +-
.../host_vars/dev-gkeyll}/vars.yml | 45 +-
.../scigap/develop/host_vars/dev-gkeyll/vault.yml | 12 +
.../host_vars/dev-ultrascan}/vars.yml | 14 +-
.../develop/host_vars/dev-ultrascan/vault.yml | 12 +
.../scigap/develop/host_vars/geo/vars.yml | 25 +-
.../scigap/develop/host_vars/geo/vault.yml | 25 +-
.../scigap/develop/host_vars/interactwel/vars.yml | 21 +-
.../scigap/develop/host_vars/interactwel/vault.yml | 25 +-
.../scigap/develop/host_vars/mines/vars.yml | 6 -
.../scigap/develop/host_vars/mines/vault.yml | 25 +-
.../scigap/develop/host_vars/nexttdb/vars.yml | 6 -
.../scigap/develop/host_vars/nexttdb/vault.yml | 25 +-
.../scigap/develop/host_vars/pfec-hydro/vars.yml | 6 -
.../scigap/develop/host_vars/pfec-hydro/vault.yml | 25 +-
.../scigap/develop/host_vars/rnamake/vars.yml | 17 +-
.../scigap/develop/host_vars/rnamake/vault.yml | 25 +-
.../scigap/develop/host_vars/saver-x/vars.yml | 6 -
.../scigap/develop/host_vars/saver-x/vault.yml | 25 +-
.../host_vars}/scigap/vars.yml | 0
.../host_vars}/scigap/vault.yml | 0
.../scigap/develop/host_vars/seagrid/vars.yml | 22 +-
.../scigap/develop/host_vars/seagrid/vault.yml | 25 +-
.../scigap/develop/host_vars/simccs/vars.yml | 18 +-
.../scigap/develop/host_vars/simccs/vault.yml | 25 +-
.../scigap/develop/host_vars/simvascular/vars.yml | 6 -
.../scigap/develop/host_vars/simvascular/vault.yml | 25 +-
.../scigap/develop/host_vars/usd/vars.yml | 6 -
.../scigap/develop/host_vars/usd/vault.yml | 25 +-
dev-tools/ansible/inventories/scigap/develop/hosts | 65 +-
.../scigap/develop/pga_config/scigap/vars.yml | 57 -
.../scigap/develop/pga_config/scigap/vault.yml | 18 -
.../scigap/develop/pga_config/seagrid/vars.yml | 67 -
.../scigap/develop/pga_config/seagrid/vault.yml | 18 -
.../scigap/develop/pga_config/simvascular/vars.yml | 65 -
.../develop/pga_config/simvascular/vault.yml | 18 -
.../scigap/develop/pga_config/testdrive/vars.yml | 65 -
.../scigap/develop/pga_config/testdrive/vault.yml | 18 -
.../scigap/production/group_vars/all/vars.yml | 16 +-
.../production/host_vars/ai-confluence/vars.yml | 1 +
.../production/host_vars/ampgateway/vars.yml | 1 +
.../scigap/production/host_vars/bcbportal/vars.yml | 1 +
.../production/host_vars/covid-geoact/vars.yml | 1 +
.../production/host_vars/ehtgateway/vars.yml | 1 +
.../scigap/production/host_vars/geo/vars.yml | 1 +
.../production/host_vars/georgiastate/vars.yml | 1 +
.../production/host_vars/global-flood/vars.yml | 1 +
.../scigap/production/host_vars/immune/vars.yml | 1 +
.../production/host_vars/interactwel/vars.yml | 1 +
.../scigap/production/host_vars/lrose/vars.yml | 1 +
.../host_vars/microbial-genomes/vars.yml | 1 +
.../host_vars/molecular-dynamics/vars.yml | 1 +
.../scigap/production/host_vars/nasa-veda/vars.yml | 1 +
.../host_vars/neuroscience-cybershuttle/vars.yml | 1 +
.../scigap/production/host_vars/nexttdb/vars.yml | 1 +
.../scigap/production/host_vars/physicell/vars.yml | 1 +
.../scigap/production/host_vars/regsnps/vars.yml | 1 +
.../scigap/production/host_vars/sdstate/vars.yml | 1 +
.../scigap/production/host_vars/seagrid/vars.yml | 1 +
.../scigap/production/host_vars/searchsra/vars.yml | 1 +
.../scigap/production/host_vars/simccs/vars.yml | 2 +-
.../production/host_vars/simvascular_old/vars.yml | 1 +
.../scigap/production/host_vars/smaltr/vars.yml | 1 +
.../scigap/production/host_vars/smiles/vars.yml | 12 +-
.../production/host_vars/snowvision/vars.yml | 1 +
.../scigap/production/host_vars/tsunami/vars.yml | 1 +
.../scigap/production/host_vars/ultrascan/vars.yml | 1 +
.../ansible/inventories/scigap/production/hosts | 42 +-
dev-tools/ansible/roles/api-orch/defaults/main.yml | 10 +
.../files/prepareLetsEncryptCertificates.sh | 14 +
.../handlers/main.yml} | 13 +-
.../tasks/haproxy}/install_deps_Centos_7.yml | 5 +-
.../tasks/haproxy}/install_deps_Rocky_8.yml | 4 +-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 60 +
.../templates/airavata-server.properties.j2 | 24 +
.../roles/api-orch/templates/apiorch.service.j2 | 2 +-
.../roles/api-orch/templates/haproxy.cfg.j2 | 75 +
dev-tools/ansible/roles/django/tasks/main.yml | 2 +-
.../roles/django/templates/settings_local.py.j2 | 4 +-
dev-tools/ansible/roles/httpd/tasks/main.yml | 2 +-
dev-tools/ansible/roles/java/files/java.security | 1283 -
dev-tools/ansible/roles/java/tasks/main.yml | 10 -
dev-tools/ansible/roles/pga/tasks/main.yml | 4 +-
.../lib/thrift/windows/StdAfx.cpp => lp.pdf | 0
.../org/apache/airavata/agents/api/AgentUtils.java | 7 +-
.../airavata/helix/adaptor/SSHJAgentAdaptor.java | 3 +
.../airavata/helix/impl/task/AiravataTask.java | 16 +
.../airavata/helix/impl/task/TaskContext.java | 1 +
.../impl/task/submission/JobSubmissionTask.java | 7 +-
.../submission/config/JobManagerConfiguration.java | 3 +
.../config/app/ForkJobConfiguration.java | 5 +
.../config/app/HTCondorJobConfiguration.java | 5 +
.../submission/config/app/LSFJobConfiguration.java | 6 +
.../submission/config/app/PBSJobConfiguration.java | 6 +
.../config/app/SlurmJobConfiguration.java | 9 +
.../submission/config/app/UGEJobConfiguration.java | 6 +
.../helix/impl/workflow/PreWorkflowManager.java | 1 +
.../metadata-analyzer/pom.xml | 63 +
.../metadata/analyzer/DataInterpreterService.java | 103 +
.../metadata/analyzer/impl/DataAnalyzerImpl.java | 82 +
.../metadata/analyzer/utils/Constants.java | 7 +
.../metascheduler-core/pom.xml | 66 +
.../metascheduler/core/api/ProcessScheduler.java | 32 +
.../engine/ComputeResourceSelectionPolicy.java | 24 +
.../metascheduler/core/engine/DataAnalyzer.java | 8 +
.../metascheduler/core/engine/ProcessScanner.java | 12 +
.../metascheduler/core/engine/ReScheduler.java | 13 +
.../airavata/metascheduler/core/utils/Utils.java | 130 +
modules/airavata-metascheduler/pom.xml | 20 +
.../process-scheduler/pom.xml | 70 +
.../scheduling/api/ProcessSchedulerImpl.java | 122 +
.../ComputeResourceSelectionPolicyImpl.java | 34 +
.../DefaultComputeResourceSelectionPolicy.java | 71 +
.../selection/MultipleComputeResourcePolicy.java | 80 +
.../rescheduler/ExponentialBackOffReScheduler.java | 163 +
.../rescheduler/ProcessReschedulingService.java | 106 +
.../engine/rescheduler/ProcessScannerImpl.java | 64 +
.../process/scheduling/utils/Constants.java | 7 +
.../ClusterStatusMonitorJobScheduler.java | 2 +-
.../airavata/common/utils/ApplicationSettings.java | 9 +-
.../airavata/common/utils/DBInitializer.java | 4 +-
.../airavata/common/utils/ServerSettings.java | 145 +-
.../airavata/common/utils/ThriftClientPool.java | 3 +-
.../computer-resource-monitoring-service/pom.xml | 66 +
.../ComputationalResourceMonitoringService.java | 119 +
.../monitoring/job/ComputeResourceMonitor.java | 119 +
.../resource/monitoring/job/MonitoringJob.java | 199 +
.../monitoring/job/output/OutputParser.java | 17 +
.../monitoring/job/output/OutputParserImpl.java | 49 +
.../resource/monitoring/utils/Constants.java | 15 +
.../src/main/resources/HTCONDOR_Groovy.template | 8 +-
.../src/main/resources/airavata-server.properties | 23 +-
.../src/main/resources/enableLegacyTLS.properties | 21 +-
.../credential-store-stubs/pom.xml | 5 +
.../store/cpi/CredentialStoreService.java | 1180 +-
.../store/cpi/credential_store_cpiConstants.java | 2 +-
.../store/exception/CredentialStoreException.java | 32 +-
.../src/main/assembly/api-server-bin-assembly.xml | 1 +
.../api-server/bin/airavata-server-start.sh | 6 +
.../init/04-expcatalog-migrations.sql | 20 +-
.../init/05-replica-catalog-migrations.sql | 32 +-
.../src/main/resources/airavata-server.properties | 6 +
.../orchestrator/cpi/OrchestratorService.java | 415 +-
.../cpi/orchestrator_cpiConstants.java | 2 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 54 +-
modules/orchestrator/orchestrator-service/pom.xml | 28 +
.../orchestrator/server/OrchestratorServer.java | 277 +-
.../server/OrchestratorServerHandler.java | 1375 +-
... => ComputationalResourceSchedulingEntity.java} | 100 +-
.../ComputationalResourceSchedulingPK.java | 67 +
.../core/entities/expcatalog/ExperimentEntity.java | 6 +-
.../expcatalog/UserConfigurationDataEntity.java | 15 +
.../core/repositories/AbstractRepository.java | 60 +
.../appcatalog/GroupResourceProfileRepository.java | 9 +
.../appcatalog/UserResourceProfileRepository.java | 10 +
.../expcatalog/ExperimentRepository.java | 14 +-
.../repositories/expcatalog/JobRepository.java | 6 +
.../expcatalog/JobStatusRepository.java | 9 +
.../expcatalog/ProcessErrorRepository.java | 2 +
.../repositories/expcatalog/ProcessRepository.java | 38 +-
.../expcatalog/ProcessStatusRepository.java | 40 +-
.../expcatalog/QueueStatusRepository.java | 21 +-
.../repositories/expcatalog/TaskRepository.java | 10 +
.../airavata/registry/core/utils/DBConstants.java | 30 +-
.../registry/core/utils/QueryConstants.java | 76 +-
.../core/utils/ReplicaCatalogDBInitConfig.java | 2 +-
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/expcatalog-derby.sql | 19 +
.../src/main/resources/expcatalog-mysql.sql | 18 +
.../src/main/resources/replicacatalog-mysql.sql | 22 +-
.../airavata/registry/cpi/UsrResourceProfile.java | 10 +
.../api/service/handler/RegistryServerHandler.java | 846 +-
.../airavata/registry/api/RegistryService.java | 76232 ++++++++++++-------
.../api/exception/RegistryServiceException.java | 32 +-
.../registry/api/registry_apiConstants.java | 2 +-
.../experimentCatalog_schema_delta.sql | 19 +-
.../DeltaScripts/replicaCatalog_schema_delta.sql | 33 +-
.../airavata/sharing/registry/models/Domain.java | 75 +-
.../registry/models/DuplicateEntryException.java | 42 +-
.../airavata/sharing/registry/models/Entity.java | 133 +-
.../sharing/registry/models/EntitySearchField.java | 9 +-
.../sharing/registry/models/EntityType.java | 75 +-
.../sharing/registry/models/GroupAdmin.java | 51 +-
.../sharing/registry/models/GroupCardinality.java | 9 +-
.../sharing/registry/models/GroupChildType.java | 9 +-
.../sharing/registry/models/GroupMembership.java | 79 +-
.../sharing/registry/models/GroupType.java | 9 +-
.../sharing/registry/models/PermissionType.java | 75 +-
.../sharing/registry/models/SearchCondition.java | 9 +-
.../sharing/registry/models/SearchCriteria.java | 61 +-
.../airavata/sharing/registry/models/Sharing.java | 95 +-
.../registry/models/SharingRegistryException.java | 42 +-
.../sharing/registry/models/SharingType.java | 9 +-
.../airavata/sharing/registry/models/User.java | 103 +-
.../sharing/registry/models/UserGroup.java | 122 +-
.../registry/models/sharing_modelsConstants.java | 2 +-
.../service/cpi/SharingRegistryService.java | 5161 +-
.../registry/service/cpi/sharing_cpiConstants.java | 2 +-
pom.xml | 44 +-
.../component-cpis/generate-cpi-stubs.sh | 23 +-
.../component-cpis/registry-api.thrift | 72 +-
.../experiment_model.thrift | 1 +
.../scheduling_model.thrift | 3 +-
.../experiment-catalog-models/status_models.thrift | 8 +-
.../compute_resource_model.thrift | 5 +-
.../generate-thrift-stubs.sh | 23 +-
.../service-cpis/generate-service-cpi-stubs.sh | 23 +-
.../group-manager/group-manager-cpi.thrift | 3 -
.../profile-user/profile-user-cpi.thrift | 5 +-
621 files changed, 112231 insertions(+), 64739 deletions(-)
create mode 100644 AWSCLIV2.pkg
create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/airavata_sdk/clients/utils/experiment_handler_util.py
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/files/airavata.jks
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/files/airavata_sym.jks
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/files/client_truststore.jks
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/files/keycloak.jks
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/group_vars/all/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/group_vars/django/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/amp/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/csbglsu/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/custos-testdrive/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/cyberwater/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/delta/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/geo/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/interactwel/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/mines/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/nexttdb/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/pfec-hydro/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/rnamake/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/saver-x/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/seagrid/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/files/django-ssl-vhost.conf.j2
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simccs/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/simvascular/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/host_vars/usd/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop-js2/hosts
rename dev-tools/ansible/inventories/scigap/{develop-js2 => develop}/group_vars/django/vault.yml (100%)
rename dev-tools/ansible/inventories/scigap/{develop-js2/host_vars/interactwel => develop/host_vars/dev-gkeyll}/vars.yml (51%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop/host_vars/dev-gkeyll/vault.yml
rename dev-tools/ansible/inventories/scigap/{develop-js2/host_vars/rnamake => develop/host_vars/dev-ultrascan}/vars.yml (66%)
create mode 100644 dev-tools/ansible/inventories/scigap/develop/host_vars/dev-ultrascan/vault.yml
rename dev-tools/ansible/inventories/scigap/{develop-js2/pga_config => develop/host_vars}/scigap/vars.yml (100%)
rename dev-tools/ansible/inventories/scigap/{develop-js2/pga_config => develop/host_vars}/scigap/vault.yml (100%)
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/simvascular/vault.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml
create mode 100644 dev-tools/ansible/roles/api-orch/files/prepareLetsEncryptCertificates.sh
copy dev-tools/ansible/roles/{django/tasks/install_deps_Rocky_8.yml => api-orch/handlers/main.yml} (82%)
copy dev-tools/ansible/roles/{django/tasks => api-orch/tasks/haproxy}/install_deps_Centos_7.yml (89%)
copy dev-tools/ansible/roles/{django/tasks => api-orch/tasks/haproxy}/install_deps_Rocky_8.yml (93%)
create mode 100644 dev-tools/ansible/roles/api-orch/templates/haproxy.cfg.j2
delete mode 100644 dev-tools/ansible/roles/java/files/java.security
copy airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/thrift/windows/StdAfx.cpp => lp.pdf (100%)
create mode 100644 modules/airavata-metascheduler/metadata-analyzer/pom.xml
create mode 100644 modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/DataInterpreterService.java
create mode 100644 modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
create mode 100644 modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/utils/Constants.java
create mode 100644 modules/airavata-metascheduler/metascheduler-core/pom.xml
create mode 100644 modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/api/ProcessScheduler.java
create mode 100644 modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/engine/ComputeResourceSelectionPolicy.java
create mode 100644 modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/engine/DataAnalyzer.java
create mode 100644 modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/engine/ProcessScanner.java
create mode 100644 modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/engine/ReScheduler.java
create mode 100644 modules/airavata-metascheduler/metascheduler-core/src/main/java/org/apache/airavata/metascheduler/core/utils/Utils.java
create mode 100644 modules/airavata-metascheduler/pom.xml
create mode 100644 modules/airavata-metascheduler/process-scheduler/pom.xml
create mode 100644 modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/api/ProcessSchedulerImpl.java
create mode 100644 modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/ComputeResourceSelectionPolicyImpl.java
create mode 100644 modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/DefaultComputeResourceSelectionPolicy.java
create mode 100644 modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/cr/selection/MultipleComputeResourcePolicy.java
create mode 100644 modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ExponentialBackOffReScheduler.java
create mode 100644 modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessReschedulingService.java
create mode 100644 modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/engine/rescheduler/ProcessScannerImpl.java
create mode 100644 modules/airavata-metascheduler/process-scheduler/src/main/java/org/apache/airavata/metascheduler/process/scheduling/utils/Constants.java
create mode 100644 modules/computer-resource-monitoring-service/pom.xml
create mode 100644 modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/ComputationalResourceMonitoringService.java
create mode 100644 modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/ComputeResourceMonitor.java
create mode 100644 modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/MonitoringJob.java
create mode 100644 modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/output/OutputParser.java
create mode 100644 modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/job/output/OutputParserImpl.java
create mode 100644 modules/computer-resource-monitoring-service/src/main/java/org/apache/airavata/compute/resource/monitoring/utils/Constants.java
copy dev-tools/ansible/airavata-iam-setup.yml => modules/configuration/server/src/main/resources/enableLegacyTLS.properties (77%)
copy modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/{ProcessResourceScheduleEntity.java => ComputationalResourceSchedulingEntity.java} (67%)
create mode 100644 modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ComputationalResourceSchedulingPK.java
[airavata] 01/01: AIRAVATA-3697 Switching to column level utf8 character set
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch AIRAVATA-3697
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 6fcefb2c476fd73cc5070d378f0730713f5ac65f
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jul 3 15:45:10 2023 -0400
AIRAVATA-3697 Switching to column level utf8 character set
---
.../init/05-replica-catalog-migrations.sql | 32 ++++++++-------------
.../src/main/resources/replicacatalog-mysql.sql | 22 +++++++--------
.../DeltaScripts/replicaCatalog_schema_delta.sql | 33 +++++++++-------------
3 files changed, 36 insertions(+), 51 deletions(-)
diff --git a/modules/ide-integration/src/main/containers/database_scripts/init/05-replica-catalog-migrations.sql b/modules/ide-integration/src/main/containers/database_scripts/init/05-replica-catalog-migrations.sql
index db5e878fb9..1c3b8d1c3f 100644
--- a/modules/ide-integration/src/main/containers/database_scripts/init/05-replica-catalog-migrations.sql
+++ b/modules/ide-integration/src/main/containers/database_scripts/init/05-replica-catalog-migrations.sql
@@ -1,35 +1,27 @@
USE replica_catalog;
-- AIRAVATA-3697: Support file names that have UTF8 characters and that are long
-SET
- FOREIGN_KEY_CHECKS = 0;
-
-ALTER DATABASE replica_catalog CHARACTER SET = utf8 COLLATE = utf8_bin;
-
-ALTER TABLE
- DATA_PRODUCT CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
-
ALTER TABLE
- DATA_REPLICA_LOCATION CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE
- DATA_PRODUCT_METADATA CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+ DATA_PRODUCT
+MODIFY
+ PRODUCT_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
ALTER TABLE
- DATA_REPLICA_METADATA CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+ DATA_PRODUCT
+MODIFY
+ PRODUCT_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
ALTER TABLE
- CONFIGURATION CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
-
-SET
- FOREIGN_KEY_CHECKS = 1;
+ DATA_REPLICA_LOCATION
+MODIFY
+ REPLICA_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
ALTER TABLE
DATA_REPLICA_LOCATION
MODIFY
- REPLICA_NAME text;
+ REPLICA_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
ALTER TABLE
- DATA_PRODUCT
+ DATA_REPLICA_LOCATION
MODIFY
- PRODUCT_NAME text;
+ FILE_PATH varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
diff --git a/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql
index 7c8a0ee11d..99731e0a9c 100644
--- a/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/replicacatalog-mysql.sql
@@ -21,8 +21,8 @@
CREATE TABLE DATA_PRODUCT (
PRODUCT_URI VARCHAR (255),
GATEWAY_ID VARCHAR (255),
- PRODUCT_NAME TEXT,
- PRODUCT_DESCRIPTION VARCHAR (255),
+ PRODUCT_NAME TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
+ PRODUCT_DESCRIPTION VARCHAR (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
OWNER_NAME VARCHAR (255),
PARENT_PRODUCT_URI VARCHAR (255),
PRODUCT_SIZE INT,
@@ -31,15 +31,15 @@ CREATE TABLE DATA_PRODUCT (
PRODUCT_TYPE VARCHAR(10),
PRIMARY KEY (PRODUCT_URI),
FOREIGN KEY (PARENT_PRODUCT_URI) REFERENCES DATA_PRODUCT (PRODUCT_URI) ON DELETE CASCADE
-) ENGINE = InnoDB DEFAULT CHARSET = utf8 COLLATE = utf8_bin;
+) ENGINE = InnoDB DEFAULT CHARSET = latin1;
CREATE TABLE DATA_REPLICA_LOCATION (
REPLICA_ID VARCHAR (255),
PRODUCT_URI VARCHAR (255) NOT NULL,
- REPLICA_NAME TEXT,
- REPLICA_DESCRIPTION VARCHAR (255),
+ REPLICA_NAME TEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
+ REPLICA_DESCRIPTION VARCHAR (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
STORAGE_RESOURCE_ID VARCHAR (255),
- FILE_PATH VARCHAR (1024),
+ FILE_PATH VARCHAR (1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
VALID_UNTIL_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
@@ -47,7 +47,7 @@ CREATE TABLE DATA_REPLICA_LOCATION (
REPLICA_PERSISTENT_TYPE VARCHAR(10),
PRIMARY KEY (REPLICA_ID),
FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-) ENGINE = InnoDB DEFAULT CHARSET = utf8 COLLATE = utf8_bin;
+) ENGINE = InnoDB DEFAULT CHARSET = latin1;
CREATE TABLE DATA_PRODUCT_METADATA (
PRODUCT_URI VARCHAR(255) NOT NULL,
@@ -55,7 +55,7 @@ CREATE TABLE DATA_PRODUCT_METADATA (
METADATA_VALUE VARCHAR(255),
PRIMARY KEY(PRODUCT_URI, METADATA_KEY),
FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-) ENGINE = InnoDB DEFAULT CHARSET = utf8 COLLATE = utf8_bin;
+) ENGINE = InnoDB DEFAULT CHARSET = latin1;
CREATE TABLE DATA_REPLICA_METADATA (
REPLICA_ID VARCHAR(255) NOT NULL,
@@ -63,15 +63,15 @@ CREATE TABLE DATA_REPLICA_METADATA (
METADATA_VALUE VARCHAR(255),
PRIMARY KEY(REPLICA_ID, METADATA_KEY),
FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION(REPLICA_ID) ON DELETE CASCADE
-) ENGINE = InnoDB DEFAULT CHARSET = utf8 COLLATE = utf8_bin;
+) ENGINE = InnoDB DEFAULT CHARSET = latin1;
CREATE TABLE CONFIGURATION (
CONFIG_KEY VARCHAR(255),
CONFIG_VAL VARCHAR(255),
PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8 COLLATE = utf8_bin;
+) ENGINE = InnoDB DEFAULT CHARSET = latin1;
INSERT INTO
CONFIGURATION (CONFIG_KEY, CONFIG_VAL)
VALUES
-('data_catalog_version', '0.16');
+ ('data_catalog_version', '0.16');
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
index 3b4645208f..8a23bf06c0 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
@@ -19,35 +19,28 @@
--
USE replica_catalog;
-SET
- FOREIGN_KEY_CHECKS = 0;
-
-ALTER DATABASE replica_catalog CHARACTER SET = utf8 COLLATE = utf8_bin;
-
-ALTER TABLE
- DATA_PRODUCT CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
-
+-- AIRAVATA-3697: Support file names that have UTF8 characters and that are long
ALTER TABLE
- DATA_REPLICA_LOCATION CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
-
-ALTER TABLE
- DATA_PRODUCT_METADATA CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+ DATA_PRODUCT
+MODIFY
+ PRODUCT_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
ALTER TABLE
- DATA_REPLICA_METADATA CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+ DATA_PRODUCT
+MODIFY
+ PRODUCT_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
ALTER TABLE
- CONFIGURATION CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
-
-SET
- FOREIGN_KEY_CHECKS = 1;
+ DATA_REPLICA_LOCATION
+MODIFY
+ REPLICA_NAME text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
ALTER TABLE
DATA_REPLICA_LOCATION
MODIFY
- REPLICA_NAME text;
+ REPLICA_DESCRIPTION varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;
ALTER TABLE
- DATA_PRODUCT
+ DATA_REPLICA_LOCATION
MODIFY
- PRODUCT_NAME text;
+ FILE_PATH varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;