You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2016/11/01 16:12:25 UTC

[2/6] airavata git commit: Merge pull request #2 from apache/develop

Merge pull request #2 from apache/develop

Merge airavata-develop

Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b66fa88f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b66fa88f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b66fa88f

Branch: refs/heads/develop
Commit: b66fa88fff988159e72617d34a97e1bd0e665600
Parents: 7dd8516 325d163
Author: Gourav Shenoy <sh...@gmail.com>
Authored: Fri Oct 28 12:46:17 2016 -0400
Committer: GitHub <no...@github.com>
Committed: Fri Oct 28 12:46:17 2016 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |    25 +
 .../java/org/apache/airavata/api/Airavata.java  |  9663 ++++++-----
 .../main/resources/lib/airavata/Airavata.cpp    |  6276 ++++---
 .../src/main/resources/lib/airavata/Airavata.h  |   533 +
 .../lib/airavata/Airavata_server.skeleton.cpp   |    77 +
 .../resources/lib/airavata/airavata_api_types.h |     1 +
 .../airavata/compute_resource_model_types.cpp   |     4 +-
 .../lib/airavata/compute_resource_model_types.h |     9 +-
 .../airavata/credential_summary_constants.cpp   |    34 +
 .../lib/airavata/credential_summary_constants.h |    41 +
 .../lib/airavata/credential_summary_types.cpp   |   234 +
 .../lib/airavata/credential_summary_types.h     |   122 +
 .../user_resource_profile_model_types.cpp       |    22 +
 .../user_resource_profile_model_types.h         |    12 +-
 .../resources/lib/Airavata/API/Airavata.php     |  2118 ++-
 .../Model/AppCatalog/ComputeResource/Types.php  |    18 +-
 .../Model/AppCatalog/CredetialSummary/Types.php |   210 +
 .../AppCatalog/UserResourceProfile/Types.php    |   788 +
 .../Airavata/Model/Credential/Store/Types.php   |  1029 ++
 .../lib/apache/airavata/api/Airavata-remote     |    21 +
 .../lib/apache/airavata/api/Airavata.py         |  1543 +-
 .../resources/lib/apache/airavata/api/ttypes.py |     1 +
 .../model/appcatalog/computeresource/ttypes.py  |    27 +-
 .../appcatalog/credentialsummary/__init__.py    |     1 +
 .../appcatalog/credentialsummary/constants.py   |    11 +
 .../appcatalog/credentialsummary/ttypes.py      |   154 +
 .../appcatalog/userresourceprofile/__init__.py  |     1 +
 .../appcatalog/userresourceprofile/constants.py |    11 +
 .../appcatalog/userresourceprofile/ttypes.py    |   538 +
 .../main/resources/samples/AiravataClient.py    |   306 +
 .../resources/samples/testAiravataClient.py     |    32 +
 .../appcatalog/computeresource/MonitorMode.java |    17 +-
 .../credentialsummary/CredentialSummary.java    |   127 +-
 .../UserResourceProfile.java                    |   116 +-
 apache-license-header.txt                       |    17 +
 .../cloud/ansible-playbooks/group_vars/all.yml  |    20 +
 .../ansible-playbooks/roles/ec2/tasks/main.yml  |    20 +
 .../roles/ec2/vars/aws-credential.yml           |    20 +
 .../ansible-playbooks/roles/ec2/vars/main.yml   |    20 +
 .../ansible-playbooks/roles/java/tasks/main.yml |    20 +
 .../ansible-playbooks/roles/java/vars/main.yml  |    20 +
 .../roles/mesos-master/tasks/backup_main.yml    |    20 +
 .../roles/mesos-master/tasks/main.yml           |    20 +
 .../roles/mesos-slave/tasks/main.yml            |    20 +
 .../roles/openstack/tasks/main.yml              |    20 +
 .../roles/openstack/vars/main.yml               |    20 +
 .../openstack/vars/openstack-credentials.yml    |    20 +
 .../ansible-playbooks/roles/test/tasks/main.yml |    20 +
 .../roles/zookeeper/handlers/main.yml           |    20 +
 .../roles/zookeeper/tasks/main.yml              |    20 +
 .../roles/zookeeper/vars/main.yml               |    20 +
 modules/cloud/ansible-playbooks/site.yml        |    20 +
 modules/cloud/aurora-client/README.md           |    49 +
 modules/cloud/aurora-client/pom.xml             |    76 +
 .../client/AuroraSchedulerClientFactory.java    |    69 +
 .../cloud/aurora/client/AuroraThriftClient.java |   216 +
 .../aurora/client/bean/GetJobsResponseBean.java |    53 +
 .../cloud/aurora/client/bean/IdentityBean.java  |    58 +
 .../cloud/aurora/client/bean/JobConfigBean.java |   236 +
 .../client/bean/JobDetailsResponseBean.java     |    69 +
 .../cloud/aurora/client/bean/JobKeyBean.java    |   104 +
 .../client/bean/PendingJobReasonBean.java       |    70 +
 .../cloud/aurora/client/bean/ProcessBean.java   |   193 +
 .../cloud/aurora/client/bean/ResourceBean.java  |   104 +
 .../cloud/aurora/client/bean/ResponseBean.java  |    79 +
 .../aurora/client/bean/ServerInfoBean.java      |    87 +
 .../aurora/client/bean/TaskConfigBean.java      |   136 +
 .../cloud/aurora/client/sdk/AppcImage.java      |   549 +
 .../cloud/aurora/client/sdk/AssignedTask.java   |  1084 ++
 .../cloud/aurora/client/sdk/Attribute.java      |   574 +
 .../cloud/aurora/client/sdk/AuroraAdmin.java    | 14400 +++++++++++++++++
 .../client/sdk/AuroraSchedulerManager.java      | 13414 +++++++++++++++
 .../cloud/aurora/client/sdk/ConfigGroup.java    |   581 +
 .../cloud/aurora/client/sdk/ConfigRewrite.java  |   389 +
 .../cloud/aurora/client/sdk/ConfigSummary.java  |   581 +
 .../aurora/client/sdk/ConfigSummaryResult.java  |   422 +
 .../cloud/aurora/client/sdk/Constraint.java     |   539 +
 .../cloud/aurora/client/sdk/Container.java      |   392 +
 .../aurora/client/sdk/CronCollisionPolicy.java  |    80 +
 .../aurora/client/sdk/DockerContainer.java      |   606 +
 .../cloud/aurora/client/sdk/DockerImage.java    |   549 +
 .../aurora/client/sdk/DockerParameter.java      |   549 +
 .../aurora/client/sdk/DrainHostsResult.java     |   471 +
 .../aurora/client/sdk/EndMaintenanceResult.java |   471 +
 .../cloud/aurora/client/sdk/ExecutorConfig.java |   546 +
 .../sdk/ExplicitReconciliationSettings.java     |   412 +
 .../client/sdk/GetJobUpdateDetailsResult.java   |   584 +
 .../client/sdk/GetJobUpdateDiffResult.java      |   996 ++
 .../client/sdk/GetJobUpdateSummariesResult.java |   474 +
 .../cloud/aurora/client/sdk/GetJobsResult.java  |   471 +
 .../client/sdk/GetPendingReasonResult.java      |   471 +
 .../cloud/aurora/client/sdk/GetQuotaResult.java |   931 ++
 .../aurora/client/sdk/GetTierConfigResult.java  |   603 +
 .../cloud/aurora/client/sdk/HostAttributes.java |   810 +
 .../cloud/aurora/client/sdk/HostStatus.java     |   538 +
 .../airavata/cloud/aurora/client/sdk/Hosts.java |   466 +
 .../cloud/aurora/client/sdk/Identity.java       |   417 +
 .../airavata/cloud/aurora/client/sdk/Image.java |   392 +
 .../client/sdk/InstanceConfigRewrite.java       |   678 +
 .../cloud/aurora/client/sdk/InstanceKey.java    |   552 +
 .../aurora/client/sdk/InstanceTaskConfig.java   |   608 +
 .../aurora/client/sdk/JobConfigRewrite.java     |   556 +
 .../aurora/client/sdk/JobConfiguration.java     |  1049 ++
 .../client/sdk/JobInstanceUpdateEvent.java      |   666 +
 .../cloud/aurora/client/sdk/JobKey.java         |   666 +
 .../cloud/aurora/client/sdk/JobStats.java       |   760 +
 .../cloud/aurora/client/sdk/JobSummary.java     |   649 +
 .../aurora/client/sdk/JobSummaryResult.java     |   471 +
 .../cloud/aurora/client/sdk/JobUpdate.java      |   559 +
 .../aurora/client/sdk/JobUpdateAction.java      |   101 +
 .../aurora/client/sdk/JobUpdateDetails.java     |   776 +
 .../cloud/aurora/client/sdk/JobUpdateEvent.java |   798 +
 .../client/sdk/JobUpdateInstructions.java       |   730 +
 .../cloud/aurora/client/sdk/JobUpdateKey.java   |   554 +
 .../aurora/client/sdk/JobUpdatePulseStatus.java |    74 +
 .../cloud/aurora/client/sdk/JobUpdateQuery.java |  1189 ++
 .../aurora/client/sdk/JobUpdateRequest.java     |   848 +
 .../aurora/client/sdk/JobUpdateSettings.java    |  1285 ++
 .../cloud/aurora/client/sdk/JobUpdateState.java |   666 +
 .../aurora/client/sdk/JobUpdateStatus.java      |   129 +
 .../aurora/client/sdk/JobUpdateSummary.java     |   850 +
 .../aurora/client/sdk/LimitConstraint.java      |   419 +
 .../aurora/client/sdk/ListBackupsResult.java    |   466 +
 .../airavata/cloud/aurora/client/sdk/Lock.java  |   903 ++
 .../cloud/aurora/client/sdk/LockKey.java        |   331 +
 .../aurora/client/sdk/MaintenanceMode.java      |    70 +
 .../client/sdk/MaintenanceStatusResult.java     |   471 +
 .../cloud/aurora/client/sdk/MesosContainer.java |   432 +
 .../aurora/client/sdk/MesosFetcherURI.java      |   661 +
 .../cloud/aurora/client/sdk/Metadata.java       |   525 +
 .../airavata/cloud/aurora/client/sdk/Mode.java  |    73 +
 .../cloud/aurora/client/sdk/Package.java        |   625 +
 .../cloud/aurora/client/sdk/PendingReason.java  |   522 +
 .../aurora/client/sdk/PopulateJobResult.java    |   422 +
 .../aurora/client/sdk/PulseJobUpdateResult.java |   436 +
 .../aurora/client/sdk/QueryRecoveryResult.java  |   471 +
 .../airavata/cloud/aurora/client/sdk/Range.java |   517 +
 .../aurora/client/sdk/ReadOnlyScheduler.java    | 11291 +++++++++++++
 .../cloud/aurora/client/sdk/Resource.java       |   561 +
 .../aurora/client/sdk/ResourceAggregate.java    |   820 +
 .../cloud/aurora/client/sdk/Response.java       |   840 +
 .../cloud/aurora/client/sdk/ResponseCode.java   |    85 +
 .../cloud/aurora/client/sdk/ResponseDetail.java |   417 +
 .../cloud/aurora/client/sdk/Result.java         |  1487 ++
 .../client/sdk/RewriteConfigsRequest.java       |   471 +
 .../cloud/aurora/client/sdk/RoleSummary.java    |   619 +
 .../aurora/client/sdk/RoleSummaryResult.java    |   471 +
 .../cloud/aurora/client/sdk/ScheduleStatus.java |   143 +
 .../aurora/client/sdk/ScheduleStatusResult.java |   471 +
 .../cloud/aurora/client/sdk/ScheduledTask.java  |   973 ++
 .../cloud/aurora/client/sdk/ServerInfo.java     |   537 +
 .../aurora/client/sdk/StartJobUpdateResult.java |   562 +
 .../client/sdk/StartMaintenanceResult.java      |   471 +
 .../cloud/aurora/client/sdk/TaskConfig.java     |  2769 ++++
 .../cloud/aurora/client/sdk/TaskConstraint.java |   392 +
 .../cloud/aurora/client/sdk/TaskEvent.java      |   794 +
 .../cloud/aurora/client/sdk/TaskQuery.java      |  1611 ++
 .../cloud/aurora/client/sdk/TierConfig.java     |   601 +
 .../aurora/client/sdk/ValueConstraint.java      |   585 +
 .../cloud/aurora/client/sdk/Volume.java         |   674 +
 .../aurora/client/sdk/aurora_apiConstants.java  |   124 +
 .../cloud/aurora/sample/AuroraClientSample.java |   157 +
 .../aurora/util/AuroraThriftClientUtil.java     |   383 +
 .../airavata/cloud/aurora/util/Constants.java   |    44 +
 .../cloud/aurora/util/ResponseCodeEnum.java     |    95 +
 .../cloud/aurora/util/ResponseResultType.java   |    47 +
 .../src/main/resources/aurora-api.thrift        |  1238 ++
 .../main/resources/aurora-scheduler.properties  |     9 +
 .../resources/executor-config-template.json     |    48 +
 modules/cloud/cloud-provisioning/pom.xml        |    31 +-
 .../airavata/cloud/intf/CloudInterface.java     |     4 +-
 .../cloud/intf/impl/OpenstackIntfImpl.java      |     4 +-
 .../cloud/openstack/OS4JClientProvider.java     |     4 +-
 .../apache/airavata/cloud/util/CloudRef.java    |     4 +-
 .../apache/airavata/cloud/util/Constants.java   |     6 +-
 .../org/apache/airavata/cloud/util/IPType.java  |     4 +-
 .../airavata/cloud/util/OpenstackIntfUtil.java  |     4 +-
 .../airavata/cloud/test/CloudIntfTest.java      |     4 +-
 modules/cloud/pom.xml                           |    57 +-
 .../org/apache/airavata/cloud/CloudMain.java    |     3 +-
 .../store/store/impl/db/CredentialsDAO.java     |     4 +-
 .../cpi/SSHSummaryTest/SSHSummaryTest.java      |   173 +
 .../store/store/impl/db/CredentialsDAOTest.java |     4 +-
 .../gfac/core/DataStagingException.java         |    43 +
 .../gfac/core/cluster/RemoteCluster.java        |    33 +-
 .../gfac/core/cluster/SessionConsumer.java      |    28 +
 .../airavata/gfac/impl/BESRemoteCluster.java    |     9 +-
 .../airavata/gfac/impl/HPCRemoteCluster.java    |    37 +-
 .../airavata/gfac/impl/LocalRemoteCluster.java  |    26 +-
 .../org/apache/airavata/gfac/impl/SSHUtils.java |   198 +-
 .../airavata/gfac/impl/task/ArchiveTask.java    |     8 +-
 .../gfac/impl/task/BESJobSubmissionTask.java    |     5 +-
 .../airavata/gfac/impl/task/DataStageTask.java  |    13 +-
 .../gfac/impl/task/EnvironmentSetupTask.java    |     4 +-
 .../gfac/impl/task/SCPDataStageTask.java        |    31 +-
 .../gfac/impl/task/utils/StreamData.java        |    37 +-
 .../catalog/impl/UsrResourceProfileImpl.java    |     4 +-
 .../UserStoragePreferenceResource.java          |     4 +-
 .../util/AppCatalogThriftConversion.java        |     5 +
 .../app/catalog/UserResourceProfileTest.java    |    31 +-
 .../airavata-apis/airavata_api.thrift           |    26 +
 .../compute_resource_model.thrift               |     1 +
 .../credential_summary.thrift                   |     7 +-
 .../user_resource_profile_model.thrift          |     6 +-
 204 files changed, 115586 insertions(+), 7464 deletions(-)
----------------------------------------------------------------------