You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/23 20:22:09 UTC
[08/14] airavata git commit: moving data movement structs to common
thrift file
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
index 80a501f..a0c89cc 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/task_model_types.h
@@ -35,6 +35,7 @@
#include "airavata_commons_types.h"
#include "status_models_types.h"
#include "compute_resource_model_types.h"
+#include "data_movement_models_types.h"
#include "application_io_models_types.h"
#include "job_model_types.h"
@@ -273,16 +274,16 @@ class EnvironmentSetupTaskModel {
EnvironmentSetupTaskModel(const EnvironmentSetupTaskModel&);
EnvironmentSetupTaskModel& operator=(const EnvironmentSetupTaskModel&);
- EnvironmentSetupTaskModel() : location(), protocol(( ::apache::airavata::model::appcatalog::computeresource::SecurityProtocol::type)0) {
+ EnvironmentSetupTaskModel() : location(), protocol(( ::apache::airavata::model::data::movement::SecurityProtocol::type)0) {
}
virtual ~EnvironmentSetupTaskModel() throw();
std::string location;
- ::apache::airavata::model::appcatalog::computeresource::SecurityProtocol::type protocol;
+ ::apache::airavata::model::data::movement::SecurityProtocol::type protocol;
void __set_location(const std::string& val);
- void __set_protocol(const ::apache::airavata::model::appcatalog::computeresource::SecurityProtocol::type val);
+ void __set_protocol(const ::apache::airavata::model::data::movement::SecurityProtocol::type val);
bool operator == (const EnvironmentSetupTaskModel & rhs) const
{
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index a63dab4..746c686 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -1974,14 +1974,14 @@ interface AiravataIf {
* @param string $resourceId
* @param int $dataMoveType
* @param int $priorityOrder
- * @param \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement
+ * @param \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
+ public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
/**
* Update the given Local data movement details
*
@@ -1997,14 +1997,14 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementInterfaceId
- * @param \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement
+ * @param \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
+ public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
/**
* * This method returns local datamovement object
* * @param dataMovementId
@@ -2014,7 +2014,7 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementId
- * @return \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement LOCAL
+ * @return \Airavata\Model\Data\Movement\LOCALDataMovement LOCAL
*
* alternativeSCPHostName:
* If the login to scp is different than the hostname itself, specify it here
@@ -2049,14 +2049,14 @@ interface AiravataIf {
* @param string $resourceId
* @param int $dataMoveType
* @param int $priorityOrder
- * @param \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement
+ * @param \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
+ public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
/**
* Update the given scp data movement details
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -2073,14 +2073,14 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementInterfaceId
- * @param \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement
+ * @param \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
+ public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
/**
* * This method returns SCP datamovement object
* * @param dataMovementId
@@ -2090,7 +2090,7 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementId
- * @return \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement Data Movement through Secured Copy
+ * @return \Airavata\Model\Data\Movement\SCPDataMovement Data Movement through Secured Copy
*
* alternativeSCPHostName:
* If the login to scp is different than the hostname itself, specify it here
@@ -2109,29 +2109,29 @@ interface AiravataIf {
* @param string $resourceId
* @param int $dataMoveType
* @param int $priorityOrder
- * @param \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement
+ * @param \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement);
+ public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementInterfaceId
- * @param \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement
+ * @param \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement);
+ public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementId
- * @return \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement Data Movement through UnicoreStorage
+ * @return \Airavata\Model\Data\Movement\UnicoreDataMovement Data Movement through UnicoreStorage
*
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
@@ -2163,14 +2163,14 @@ interface AiravataIf {
* @param string $resourceId
* @param int $dataMoveType
* @param int $priorityOrder
- * @param \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement
+ * @param \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement
* @return string
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
+ public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
/**
* Update the given GridFTP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -2187,14 +2187,14 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementInterfaceId
- * @param \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement
+ * @param \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
+ public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
/**
* * This method returns GridFTP datamovement object
* * @param dataMovementId
@@ -2204,7 +2204,7 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementId
- * @return \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement Data Movement through GridFTP
+ * @return \Airavata\Model\Data\Movement\GridFTPDataMovement Data Movement through GridFTP
*
* alternativeSCPHostName:
* If the login to scp is different than the hostname itself, specify it here
@@ -2533,7 +2533,7 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayID
- * @param string $dataMoveId
+ * @param string $storageResourceId
* @param \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
@@ -2541,7 +2541,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
+ public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
/**
* Fetch a Compute Resource Preference of a registered gateway profile.
*
@@ -2600,14 +2600,14 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayID
- * @param string $dataMoveId
+ * @param string $storageResourceId
* @return \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId);
+ public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId);
/**
* Fetch all Compute Resource Preferences of a registered gateway profile.
*
@@ -8318,13 +8318,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("updateUnicoreJobSubmissionDetails failed: unknown result");
}
- public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+ public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
{
$this->send_addLocalDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $localDataMovement);
return $this->recv_addLocalDataMovementDetails();
}
- public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+ public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
{
$args = new \Airavata\API\Airavata_addLocalDataMovementDetails_args();
$args->authzToken = $authzToken;
@@ -8385,13 +8385,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("addLocalDataMovementDetails failed: unknown result");
}
- public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+ public function updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
{
$this->send_updateLocalDataMovementDetails($authzToken, $dataMovementInterfaceId, $localDataMovement);
return $this->recv_updateLocalDataMovementDetails();
}
- public function send_updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+ public function send_updateLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
{
$args = new \Airavata\API\Airavata_updateLocalDataMovementDetails_args();
$args->authzToken = $authzToken;
@@ -8514,13 +8514,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getLocalDataMovement failed: unknown result");
}
- public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+ public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
{
$this->send_addSCPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $scpDataMovement);
return $this->recv_addSCPDataMovementDetails();
}
- public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+ public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
{
$args = new \Airavata\API\Airavata_addSCPDataMovementDetails_args();
$args->authzToken = $authzToken;
@@ -8581,13 +8581,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("addSCPDataMovementDetails failed: unknown result");
}
- public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+ public function updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
{
$this->send_updateSCPDataMovementDetails($authzToken, $dataMovementInterfaceId, $scpDataMovement);
return $this->recv_updateSCPDataMovementDetails();
}
- public function send_updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+ public function send_updateSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
{
$args = new \Airavata\API\Airavata_updateSCPDataMovementDetails_args();
$args->authzToken = $authzToken;
@@ -8710,13 +8710,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getSCPDataMovement failed: unknown result");
}
- public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
{
$this->send_addUnicoreDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $unicoreDataMovement);
return $this->recv_addUnicoreDataMovementDetails();
}
- public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
{
$args = new \Airavata\API\Airavata_addUnicoreDataMovementDetails_args();
$args->authzToken = $authzToken;
@@ -8777,13 +8777,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("addUnicoreDataMovementDetails failed: unknown result");
}
- public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ public function updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
{
$this->send_updateUnicoreDataMovementDetails($authzToken, $dataMovementInterfaceId, $unicoreDataMovement);
return $this->recv_updateUnicoreDataMovementDetails();
}
- public function send_updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ public function send_updateUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
{
$args = new \Airavata\API\Airavata_updateUnicoreDataMovementDetails_args();
$args->authzToken = $authzToken;
@@ -8906,13 +8906,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getUnicoreDataMovement failed: unknown result");
}
- public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+ public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
{
$this->send_addGridFTPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $gridFTPDataMovement);
return $this->recv_addGridFTPDataMovementDetails();
}
- public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+ public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
{
$args = new \Airavata\API\Airavata_addGridFTPDataMovementDetails_args();
$args->authzToken = $authzToken;
@@ -8973,13 +8973,13 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("addGridFTPDataMovementDetails failed: unknown result");
}
- public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+ public function updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
{
$this->send_updateGridFTPDataMovementDetails($authzToken, $dataMovementInterfaceId, $gridFTPDataMovement);
return $this->recv_updateGridFTPDataMovementDetails();
}
- public function send_updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+ public function send_updateGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementInterfaceId, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
{
$args = new \Airavata\API\Airavata_updateGridFTPDataMovementDetails_args();
$args->authzToken = $authzToken;
@@ -10135,18 +10135,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("addGatewayComputeResourcePreference failed: unknown result");
}
- public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
+ public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
{
- $this->send_addGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId, $storagePreference);
+ $this->send_addGatewayStoragePreference($authzToken, $gatewayID, $storageResourceId, $storagePreference);
return $this->recv_addGatewayStoragePreference();
}
- public function send_addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
+ public function send_addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
{
$args = new \Airavata\API\Airavata_addGatewayStoragePreference_args();
$args->authzToken = $authzToken;
$args->gatewayID = $gatewayID;
- $args->dataMoveId = $dataMoveId;
+ $args->storageResourceId = $storageResourceId;
$args->storagePreference = $storagePreference;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
@@ -10266,18 +10266,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getGatewayComputeResourcePreference failed: unknown result");
}
- public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+ public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId)
{
- $this->send_getGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId);
+ $this->send_getGatewayStoragePreference($authzToken, $gatewayID, $storageResourceId);
return $this->recv_getGatewayStoragePreference();
}
- public function send_getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+ public function send_getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageResourceId)
{
$args = new \Airavata\API\Airavata_getGatewayStoragePreference_args();
$args->authzToken = $authzToken;
$args->gatewayID = $gatewayID;
- $args->dataMoveId = $dataMoveId;
+ $args->storageResourceId = $storageResourceId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -37611,7 +37611,7 @@ class Airavata_addLocalDataMovementDetails_args {
*/
public $priorityOrder = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement
+ * @var \Airavata\Model\Data\Movement\LOCALDataMovement
*/
public $localDataMovement = null;
@@ -37638,7 +37638,7 @@ class Airavata_addLocalDataMovementDetails_args {
5 => array(
'var' => 'localDataMovement',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\LOCALDataMovement',
),
);
}
@@ -37711,7 +37711,7 @@ class Airavata_addLocalDataMovementDetails_args {
break;
case 5:
if ($ftype == TType::STRUCT) {
- $this->localDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
+ $this->localDataMovement = new \Airavata\Model\Data\Movement\LOCALDataMovement();
$xfer += $this->localDataMovement->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -37955,7 +37955,7 @@ class Airavata_updateLocalDataMovementDetails_args {
*/
public $dataMovementInterfaceId = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement
+ * @var \Airavata\Model\Data\Movement\LOCALDataMovement
*/
public $localDataMovement = null;
@@ -37974,7 +37974,7 @@ class Airavata_updateLocalDataMovementDetails_args {
3 => array(
'var' => 'localDataMovement',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\LOCALDataMovement',
),
);
}
@@ -38027,7 +38027,7 @@ class Airavata_updateLocalDataMovementDetails_args {
break;
case 3:
if ($ftype == TType::STRUCT) {
- $this->localDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
+ $this->localDataMovement = new \Airavata\Model\Data\Movement\LOCALDataMovement();
$xfer += $this->localDataMovement->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -38356,7 +38356,7 @@ class Airavata_getLocalDataMovement_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement
+ * @var \Airavata\Model\Data\Movement\LOCALDataMovement
*/
public $success = null;
/**
@@ -38382,7 +38382,7 @@ class Airavata_getLocalDataMovement_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\LOCALDataMovement',
),
1 => array(
'var' => 'ire',
@@ -38446,7 +38446,7 @@ class Airavata_getLocalDataMovement_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
+ $this->success = new \Airavata\Model\Data\Movement\LOCALDataMovement();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -38552,7 +38552,7 @@ class Airavata_addSCPDataMovementDetails_args {
*/
public $priorityOrder = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement
+ * @var \Airavata\Model\Data\Movement\SCPDataMovement
*/
public $scpDataMovement = null;
@@ -38579,7 +38579,7 @@ class Airavata_addSCPDataMovementDetails_args {
5 => array(
'var' => 'scpDataMovement',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\SCPDataMovement',
),
);
}
@@ -38652,7 +38652,7 @@ class Airavata_addSCPDataMovementDetails_args {
break;
case 5:
if ($ftype == TType::STRUCT) {
- $this->scpDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement();
+ $this->scpDataMovement = new \Airavata\Model\Data\Movement\SCPDataMovement();
$xfer += $this->scpDataMovement->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -38896,7 +38896,7 @@ class Airavata_updateSCPDataMovementDetails_args {
*/
public $dataMovementInterfaceId = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement
+ * @var \Airavata\Model\Data\Movement\SCPDataMovement
*/
public $scpDataMovement = null;
@@ -38915,7 +38915,7 @@ class Airavata_updateSCPDataMovementDetails_args {
3 => array(
'var' => 'scpDataMovement',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\SCPDataMovement',
),
);
}
@@ -38968,7 +38968,7 @@ class Airavata_updateSCPDataMovementDetails_args {
break;
case 3:
if ($ftype == TType::STRUCT) {
- $this->scpDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement();
+ $this->scpDataMovement = new \Airavata\Model\Data\Movement\SCPDataMovement();
$xfer += $this->scpDataMovement->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -39297,7 +39297,7 @@ class Airavata_getSCPDataMovement_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement
+ * @var \Airavata\Model\Data\Movement\SCPDataMovement
*/
public $success = null;
/**
@@ -39323,7 +39323,7 @@ class Airavata_getSCPDataMovement_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\SCPDataMovement',
),
1 => array(
'var' => 'ire',
@@ -39387,7 +39387,7 @@ class Airavata_getSCPDataMovement_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement();
+ $this->success = new \Airavata\Model\Data\Movement\SCPDataMovement();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -39493,7 +39493,7 @@ class Airavata_addUnicoreDataMovementDetails_args {
*/
public $priorityOrder = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement
+ * @var \Airavata\Model\Data\Movement\UnicoreDataMovement
*/
public $unicoreDataMovement = null;
@@ -39520,7 +39520,7 @@ class Airavata_addUnicoreDataMovementDetails_args {
5 => array(
'var' => 'unicoreDataMovement',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\UnicoreDataMovement',
),
);
}
@@ -39593,7 +39593,7 @@ class Airavata_addUnicoreDataMovementDetails_args {
break;
case 5:
if ($ftype == TType::STRUCT) {
- $this->unicoreDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+ $this->unicoreDataMovement = new \Airavata\Model\Data\Movement\UnicoreDataMovement();
$xfer += $this->unicoreDataMovement->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -39837,7 +39837,7 @@ class Airavata_updateUnicoreDataMovementDetails_args {
*/
public $dataMovementInterfaceId = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement
+ * @var \Airavata\Model\Data\Movement\UnicoreDataMovement
*/
public $unicoreDataMovement = null;
@@ -39856,7 +39856,7 @@ class Airavata_updateUnicoreDataMovementDetails_args {
3 => array(
'var' => 'unicoreDataMovement',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\UnicoreDataMovement',
),
);
}
@@ -39909,7 +39909,7 @@ class Airavata_updateUnicoreDataMovementDetails_args {
break;
case 3:
if ($ftype == TType::STRUCT) {
- $this->unicoreDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+ $this->unicoreDataMovement = new \Airavata\Model\Data\Movement\UnicoreDataMovement();
$xfer += $this->unicoreDataMovement->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -40238,7 +40238,7 @@ class Airavata_getUnicoreDataMovement_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement
+ * @var \Airavata\Model\Data\Movement\UnicoreDataMovement
*/
public $success = null;
/**
@@ -40264,7 +40264,7 @@ class Airavata_getUnicoreDataMovement_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\UnicoreDataMovement',
),
1 => array(
'var' => 'ire',
@@ -40328,7 +40328,7 @@ class Airavata_getUnicoreDataMovement_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+ $this->success = new \Airavata\Model\Data\Movement\UnicoreDataMovement();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -40434,7 +40434,7 @@ class Airavata_addGridFTPDataMovementDetails_args {
*/
public $priorityOrder = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement
+ * @var \Airavata\Model\Data\Movement\GridFTPDataMovement
*/
public $gridFTPDataMovement = null;
@@ -40461,7 +40461,7 @@ class Airavata_addGridFTPDataMovementDetails_args {
5 => array(
'var' => 'gridFTPDataMovement',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\GridFTPDataMovement',
),
);
}
@@ -40534,7 +40534,7 @@ class Airavata_addGridFTPDataMovementDetails_args {
break;
case 5:
if ($ftype == TType::STRUCT) {
- $this->gridFTPDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement();
+ $this->gridFTPDataMovement = new \Airavata\Model\Data\Movement\GridFTPDataMovement();
$xfer += $this->gridFTPDataMovement->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -40778,7 +40778,7 @@ class Airavata_updateGridFTPDataMovementDetails_args {
*/
public $dataMovementInterfaceId = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement
+ * @var \Airavata\Model\Data\Movement\GridFTPDataMovement
*/
public $gridFTPDataMovement = null;
@@ -40797,7 +40797,7 @@ class Airavata_updateGridFTPDataMovementDetails_args {
3 => array(
'var' => 'gridFTPDataMovement',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\GridFTPDataMovement',
),
);
}
@@ -40850,7 +40850,7 @@ class Airavata_updateGridFTPDataMovementDetails_args {
break;
case 3:
if ($ftype == TType::STRUCT) {
- $this->gridFTPDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement();
+ $this->gridFTPDataMovement = new \Airavata\Model\Data\Movement\GridFTPDataMovement();
$xfer += $this->gridFTPDataMovement->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -41179,7 +41179,7 @@ class Airavata_getGridFTPDataMovement_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement
+ * @var \Airavata\Model\Data\Movement\GridFTPDataMovement
*/
public $success = null;
/**
@@ -41205,7 +41205,7 @@ class Airavata_getGridFTPDataMovement_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement',
+ 'class' => '\Airavata\Model\Data\Movement\GridFTPDataMovement',
),
1 => array(
'var' => 'ire',
@@ -41269,7 +41269,7 @@ class Airavata_getGridFTPDataMovement_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement();
+ $this->success = new \Airavata\Model\Data\Movement\GridFTPDataMovement();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -46127,7 +46127,7 @@ class Airavata_addGatewayStoragePreference_args {
/**
* @var string
*/
- public $dataMoveId = null;
+ public $storageResourceId = null;
/**
* @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
*/
@@ -46146,7 +46146,7 @@ class Airavata_addGatewayStoragePreference_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'dataMoveId',
+ 'var' => 'storageResourceId',
'type' => TType::STRING,
),
4 => array(
@@ -46163,8 +46163,8 @@ class Airavata_addGatewayStoragePreference_args {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
- if (isset($vals['dataMoveId'])) {
- $this->dataMoveId = $vals['dataMoveId'];
+ if (isset($vals['storageResourceId'])) {
+ $this->storageResourceId = $vals['storageResourceId'];
}
if (isset($vals['storagePreference'])) {
$this->storagePreference = $vals['storagePreference'];
@@ -46208,7 +46208,7 @@ class Airavata_addGatewayStoragePreference_args {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMoveId);
+ $xfer += $input->readString($this->storageResourceId);
} else {
$xfer += $input->skip($ftype);
}
@@ -46247,9 +46247,9 @@ class Airavata_addGatewayStoragePreference_args {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataMoveId !== null) {
- $xfer += $output->writeFieldBegin('dataMoveId', TType::STRING, 3);
- $xfer += $output->writeString($this->dataMoveId);
+ if ($this->storageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 3);
+ $xfer += $output->writeString($this->storageResourceId);
$xfer += $output->writeFieldEnd();
}
if ($this->storagePreference !== null) {
@@ -46762,7 +46762,7 @@ class Airavata_getGatewayStoragePreference_args {
/**
* @var string
*/
- public $dataMoveId = null;
+ public $storageResourceId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -46777,7 +46777,7 @@ class Airavata_getGatewayStoragePreference_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'dataMoveId',
+ 'var' => 'storageResourceId',
'type' => TType::STRING,
),
);
@@ -46789,8 +46789,8 @@ class Airavata_getGatewayStoragePreference_args {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
- if (isset($vals['dataMoveId'])) {
- $this->dataMoveId = $vals['dataMoveId'];
+ if (isset($vals['storageResourceId'])) {
+ $this->storageResourceId = $vals['storageResourceId'];
}
}
}
@@ -46831,7 +46831,7 @@ class Airavata_getGatewayStoragePreference_args {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMoveId);
+ $xfer += $input->readString($this->storageResourceId);
} else {
$xfer += $input->skip($ftype);
}
@@ -46862,9 +46862,9 @@ class Airavata_getGatewayStoragePreference_args {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataMoveId !== null) {
- $xfer += $output->writeFieldBegin('dataMoveId', TType::STRING, 3);
- $xfer += $output->writeString($this->dataMoveId);
+ if ($this->storageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 3);
+ $xfer += $output->writeString($this->storageResourceId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 12a4ac0..006e85b 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -127,37 +127,6 @@ final class FileSystems {
}
/**
- * Enumeration of security authentication and authorization mechanisms supported by Airavata. This enumeration just
- * describes the supported mechanism. The corresponding security credentials are registered with Airavata Credential
- * store.
- *
- * USERNAME_PASSWORD:
- * A User Name.
- *
- * SSH_KEYS:
- * SSH Keys
- *
- * FIXME: Change GSI to a more precise generic security protocol - X509
- *
- */
-final class SecurityProtocol {
- const USERNAME_PASSWORD = 0;
- const SSH_KEYS = 1;
- const GSI = 2;
- const KERBEROS = 3;
- const OAUTH = 4;
- const LOCAL = 5;
- static public $__names = array(
- 0 => 'USERNAME_PASSWORD',
- 1 => 'SSH_KEYS',
- 2 => 'GSI',
- 3 => 'KERBEROS',
- 4 => 'OAUTH',
- 5 => 'LOCAL',
- );
-}
-
-/**
* Enumeration of Airavata supported Job Submission Mechanisms for High Performance Computing Clusters.
*
* SSH:
@@ -213,46 +182,6 @@ final class MonitorMode {
);
}
-final class DMType {
- const COMPUTE_RESOURCE = 0;
- const STORAGE_RESOURCE = 1;
- static public $__names = array(
- 0 => 'COMPUTE_RESOURCE',
- 1 => 'STORAGE_RESOURCE',
- );
-}
-
-/**
- * Enumeration of data movement supported by Airavata
- *
- * SCP:
- * Job manager supporting the Portal Batch System (PBS) protocol. Some examples include TORQUE, PBSPro, Grid Engine.
- *
- * SFTP:
- * The Simple Linux Utility for Resource Management is a open source workload manager.
- *
- * GridFTP:
- * Globus File Transfer Protocol
- *
- * UNICORE_STORAGE_SERVICE:
- * Storage Service Provided by Unicore
- *
- */
-final class DataMovementProtocol {
- const LOCAL = 0;
- const SCP = 1;
- const SFTP = 2;
- const GridFTP = 3;
- const UNICORE_STORAGE_SERVICE = 4;
- static public $__names = array(
- 0 => 'LOCAL',
- 1 => 'SCP',
- 2 => 'SFTP',
- 3 => 'GridFTP',
- 4 => 'UNICORE_STORAGE_SERVICE',
- );
-}
-
/**
* Provider name
*
@@ -642,466 +571,10 @@ class BatchQueue {
} else {
$xfer += $input->skip($ftype);
}
- break;
- case 7:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->maxMemory);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('BatchQueue');
- if ($this->queueName !== null) {
- $xfer += $output->writeFieldBegin('queueName', TType::STRING, 1);
- $xfer += $output->writeString($this->queueName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->queueDescription !== null) {
- $xfer += $output->writeFieldBegin('queueDescription', TType::STRING, 2);
- $xfer += $output->writeString($this->queueDescription);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->maxRunTime !== null) {
- $xfer += $output->writeFieldBegin('maxRunTime', TType::I32, 3);
- $xfer += $output->writeI32($this->maxRunTime);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->maxNodes !== null) {
- $xfer += $output->writeFieldBegin('maxNodes', TType::I32, 4);
- $xfer += $output->writeI32($this->maxNodes);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->maxProcessors !== null) {
- $xfer += $output->writeFieldBegin('maxProcessors', TType::I32, 5);
- $xfer += $output->writeI32($this->maxProcessors);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->maxJobsInQueue !== null) {
- $xfer += $output->writeFieldBegin('maxJobsInQueue', TType::I32, 6);
- $xfer += $output->writeI32($this->maxJobsInQueue);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->maxMemory !== null) {
- $xfer += $output->writeFieldBegin('maxMemory', TType::I32, 7);
- $xfer += $output->writeI32($this->maxMemory);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-/**
- * Data Movement through Secured Copy
- *
- * alternativeSCPHostName:
- * If the login to scp is different than the hostname itself, specify it here
- *
- * sshPort:
- * If a non-default port needs to used, specify it.
- */
-class SCPDataMovement {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS";
- /**
- * @var int
- */
- public $securityProtocol = null;
- /**
- * @var string
- */
- public $alternativeSCPHostName = null;
- /**
- * @var int
- */
- public $sshPort = 22;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'dataMovementInterfaceId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'securityProtocol',
- 'type' => TType::I32,
- ),
- 3 => array(
- 'var' => 'alternativeSCPHostName',
- 'type' => TType::STRING,
- ),
- 4 => array(
- 'var' => 'sshPort',
- 'type' => TType::I32,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['dataMovementInterfaceId'])) {
- $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
- }
- if (isset($vals['securityProtocol'])) {
- $this->securityProtocol = $vals['securityProtocol'];
- }
- if (isset($vals['alternativeSCPHostName'])) {
- $this->alternativeSCPHostName = $vals['alternativeSCPHostName'];
- }
- if (isset($vals['sshPort'])) {
- $this->sshPort = $vals['sshPort'];
- }
- }
- }
-
- public function getName() {
- return 'SCPDataMovement';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMovementInterfaceId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->securityProtocol);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->alternativeSCPHostName);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 4:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->sshPort);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('SCPDataMovement');
- if ($this->dataMovementInterfaceId !== null) {
- $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
- $xfer += $output->writeString($this->dataMovementInterfaceId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->securityProtocol !== null) {
- $xfer += $output->writeFieldBegin('securityProtocol', TType::I32, 2);
- $xfer += $output->writeI32($this->securityProtocol);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->alternativeSCPHostName !== null) {
- $xfer += $output->writeFieldBegin('alternativeSCPHostName', TType::STRING, 3);
- $xfer += $output->writeString($this->alternativeSCPHostName);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->sshPort !== null) {
- $xfer += $output->writeFieldBegin('sshPort', TType::I32, 4);
- $xfer += $output->writeI32($this->sshPort);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-/**
- * Data Movement through GridFTP
- *
- * alternativeSCPHostName:
- * If the login to scp is different than the hostname itself, specify it here
- *
- * sshPort:
- * If a non-default port needs to used, specify it.
- */
-class GridFTPDataMovement {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS";
- /**
- * @var int
- */
- public $securityProtocol = null;
- /**
- * @var string[]
- */
- public $gridFTPEndPoints = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'dataMovementInterfaceId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'securityProtocol',
- 'type' => TType::I32,
- ),
- 3 => array(
- 'var' => 'gridFTPEndPoints',
- 'type' => TType::LST,
- 'etype' => TType::STRING,
- 'elem' => array(
- 'type' => TType::STRING,
- ),
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['dataMovementInterfaceId'])) {
- $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
- }
- if (isset($vals['securityProtocol'])) {
- $this->securityProtocol = $vals['securityProtocol'];
- }
- if (isset($vals['gridFTPEndPoints'])) {
- $this->gridFTPEndPoints = $vals['gridFTPEndPoints'];
- }
- }
- }
-
- public function getName() {
- return 'GridFTPDataMovement';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMovementInterfaceId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->securityProtocol);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::LST) {
- $this->gridFTPEndPoints = array();
- $_size9 = 0;
- $_etype12 = 0;
- $xfer += $input->readListBegin($_etype12, $_size9);
- for ($_i13 = 0; $_i13 < $_size9; ++$_i13)
- {
- $elem14 = null;
- $xfer += $input->readString($elem14);
- $this->gridFTPEndPoints []= $elem14;
- }
- $xfer += $input->readListEnd();
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('GridFTPDataMovement');
- if ($this->dataMovementInterfaceId !== null) {
- $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
- $xfer += $output->writeString($this->dataMovementInterfaceId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->securityProtocol !== null) {
- $xfer += $output->writeFieldBegin('securityProtocol', TType::I32, 2);
- $xfer += $output->writeI32($this->securityProtocol);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->gridFTPEndPoints !== null) {
- if (!is_array($this->gridFTPEndPoints)) {
- throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
- }
- $xfer += $output->writeFieldBegin('gridFTPEndPoints', TType::LST, 3);
- {
- $output->writeListBegin(TType::STRING, count($this->gridFTPEndPoints));
- {
- foreach ($this->gridFTPEndPoints as $iter15)
- {
- $xfer += $output->writeString($iter15);
- }
- }
- $output->writeListEnd();
- }
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-/**
- * Data Movement through UnicoreStorage
- *
- * unicoreEndPointURL:
- * unicoreGateway End Point. The provider will query this service to fetch required service end points.
- */
-class UnicoreDataMovement {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS";
- /**
- * @var int
- */
- public $securityProtocol = null;
- /**
- * @var string
- */
- public $unicoreEndPointURL = null;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'dataMovementInterfaceId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'securityProtocol',
- 'type' => TType::I32,
- ),
- 3 => array(
- 'var' => 'unicoreEndPointURL',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['dataMovementInterfaceId'])) {
- $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
- }
- if (isset($vals['securityProtocol'])) {
- $this->securityProtocol = $vals['securityProtocol'];
- }
- if (isset($vals['unicoreEndPointURL'])) {
- $this->unicoreEndPointURL = $vals['unicoreEndPointURL'];
- }
- }
- }
-
- public function getName() {
- return 'UnicoreDataMovement';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMovementInterfaceId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->securityProtocol);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->unicoreEndPointURL);
+ break;
+ case 7:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->maxMemory);
} else {
$xfer += $input->skip($ftype);
}
@@ -1118,20 +591,40 @@ class UnicoreDataMovement {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('UnicoreDataMovement');
- if ($this->dataMovementInterfaceId !== null) {
- $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
- $xfer += $output->writeString($this->dataMovementInterfaceId);
+ $xfer += $output->writeStructBegin('BatchQueue');
+ if ($this->queueName !== null) {
+ $xfer += $output->writeFieldBegin('queueName', TType::STRING, 1);
+ $xfer += $output->writeString($this->queueName);
$xfer += $output->writeFieldEnd();
}
- if ($this->securityProtocol !== null) {
- $xfer += $output->writeFieldBegin('securityProtocol', TType::I32, 2);
- $xfer += $output->writeI32($this->securityProtocol);
+ if ($this->queueDescription !== null) {
+ $xfer += $output->writeFieldBegin('queueDescription', TType::STRING, 2);
+ $xfer += $output->writeString($this->queueDescription);
$xfer += $output->writeFieldEnd();
}
- if ($this->unicoreEndPointURL !== null) {
- $xfer += $output->writeFieldBegin('unicoreEndPointURL', TType::STRING, 3);
- $xfer += $output->writeString($this->unicoreEndPointURL);
+ if ($this->maxRunTime !== null) {
+ $xfer += $output->writeFieldBegin('maxRunTime', TType::I32, 3);
+ $xfer += $output->writeI32($this->maxRunTime);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->maxNodes !== null) {
+ $xfer += $output->writeFieldBegin('maxNodes', TType::I32, 4);
+ $xfer += $output->writeI32($this->maxNodes);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->maxProcessors !== null) {
+ $xfer += $output->writeFieldBegin('maxProcessors', TType::I32, 5);
+ $xfer += $output->writeI32($this->maxProcessors);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->maxJobsInQueue !== null) {
+ $xfer += $output->writeFieldBegin('maxJobsInQueue', TType::I32, 6);
+ $xfer += $output->writeI32($this->maxJobsInQueue);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->maxMemory !== null) {
+ $xfer += $output->writeFieldBegin('maxMemory', TType::I32, 7);
+ $xfer += $output->writeI32($this->maxMemory);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -1277,90 +770,6 @@ class LOCALSubmission {
}
/**
- * LOCAL
- *
- * alternativeSCPHostName:
- * If the login to scp is different than the hostname itself, specify it here
- *
- * sshPort:
- * If a non-defualt port needs to used, specify it.
- */
-class LOCALDataMovement {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $dataMovementInterfaceId = "DO_NOT_SET_AT_CLIENTS";
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'dataMovementInterfaceId',
- 'type' => TType::STRING,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['dataMovementInterfaceId'])) {
- $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
- }
- }
- }
-
- public function getName() {
- return 'LOCALDataMovement';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMovementInterfaceId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('LOCALDataMovement');
- if ($this->dataMovementInterfaceId !== null) {
- $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
- $xfer += $output->writeString($this->dataMovementInterfaceId);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-/**
* Authenticate using Secured Shell
*
* alternativeSSHHostName:
@@ -1536,14 +945,14 @@ class SSHJobSubmission {
case 7:
if ($ftype == TType::LST) {
$this->batchQueueEmailSenders = array();
- $_size16 = 0;
- $_etype19 = 0;
- $xfer += $input->readListBegin($_etype19, $_size16);
- for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+ $_size9 = 0;
+ $_etype12 = 0;
+ $xfer += $input->readListBegin($_etype12, $_size9);
+ for ($_i13 = 0; $_i13 < $_size9; ++$_i13)
{
- $elem21 = null;
- $xfer += $input->readString($elem21);
- $this->batchQueueEmailSenders []= $elem21;
+ $elem14 = null;
+ $xfer += $input->readString($elem14);
+ $this->batchQueueEmailSenders []= $elem14;
}
$xfer += $input->readListEnd();
} else {
@@ -1604,9 +1013,9 @@ class SSHJobSubmission {
{
$output->writeListBegin(TType::STRING, count($this->batchQueueEmailSenders));
{
- foreach ($this->batchQueueEmailSenders as $iter22)
+ foreach ($this->batchQueueEmailSenders as $iter15)
{
- $xfer += $output->writeString($iter22);
+ $xfer += $output->writeString($iter15);
}
}
$output->writeListEnd();
@@ -1706,14 +1115,14 @@ class GlobusJobSubmission {
case 3:
if ($ftype == TType::LST) {
$this->globusGateKeeperEndPoint = array();
- $_size23 = 0;
- $_etype26 = 0;
- $xfer += $input->readListBegin($_etype26, $_size23);
- for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
+ $_size16 = 0;
+ $_etype19 = 0;
+ $xfer += $input->readListBegin($_etype19, $_size16);
+ for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
{
- $elem28 = null;
- $xfer += $input->readString($elem28);
- $this->globusGateKeeperEndPoint []= $elem28;
+ $elem21 = null;
+ $xfer += $input->readString($elem21);
+ $this->globusGateKeeperEndPoint []= $elem21;
}
$xfer += $input->readListEnd();
} else {
@@ -1751,9 +1160,9 @@ class GlobusJobSubmission {
{
$output->writeListBegin(TType::STRING, count($this->globusGateKeeperEndPoint));
{
- foreach ($this->globusGateKeeperEndPoint as $iter29)
+ foreach ($this->globusGateKeeperEndPoint as $iter22)
{
- $xfer += $output->writeString($iter29);
+ $xfer += $output->writeString($iter22);
}
}
$output->writeListEnd();
@@ -2223,137 +1632,6 @@ class JobSubmissionInterface {
}
/**
- * Data Movement Interfaces
- *
- * dataMovementInterfaceId: The Data Movement Interface has to be previously registered and referenced here.
- *
- * priorityOrder:
- * For resources with multiple interfaces, the priority order should be selected.
- * Lower the numerical number, higher the priority
- *
- */
-class DataMovementInterface {
- static $_TSPEC;
-
- /**
- * @var string
- */
- public $dataMovementInterfaceId = null;
- /**
- * @var int
- */
- public $dataMovementProtocol = null;
- /**
- * @var int
- */
- public $priorityOrder = 0;
-
- public function __construct($vals=null) {
- if (!isset(self::$_TSPEC)) {
- self::$_TSPEC = array(
- 1 => array(
- 'var' => 'dataMovementInterfaceId',
- 'type' => TType::STRING,
- ),
- 2 => array(
- 'var' => 'dataMovementProtocol',
- 'type' => TType::I32,
- ),
- 3 => array(
- 'var' => 'priorityOrder',
- 'type' => TType::I32,
- ),
- );
- }
- if (is_array($vals)) {
- if (isset($vals['dataMovementInterfaceId'])) {
- $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
- }
- if (isset($vals['dataMovementProtocol'])) {
- $this->dataMovementProtocol = $vals['dataMovementProtocol'];
- }
- if (isset($vals['priorityOrder'])) {
- $this->priorityOrder = $vals['priorityOrder'];
- }
- }
- }
-
- public function getName() {
- return 'DataMovementInterface';
- }
-
- public function read($input)
- {
- $xfer = 0;
- $fname = null;
- $ftype = 0;
- $fid = 0;
- $xfer += $input->readStructBegin($fname);
- while (true)
- {
- $xfer += $input->readFieldBegin($fname, $ftype, $fid);
- if ($ftype == TType::STOP) {
- break;
- }
- switch ($fid)
- {
- case 1:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMovementInterfaceId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 2:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->dataMovementProtocol);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->priorityOrder);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- default:
- $xfer += $input->skip($ftype);
- break;
- }
- $xfer += $input->readFieldEnd();
- }
- $xfer += $input->readStructEnd();
- return $xfer;
- }
-
- public function write($output) {
- $xfer = 0;
- $xfer += $output->writeStructBegin('DataMovementInterface');
- if ($this->dataMovementInterfaceId !== null) {
- $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
- $xfer += $output->writeString($this->dataMovementInterfaceId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->dataMovementProtocol !== null) {
- $xfer += $output->writeFieldBegin('dataMovementProtocol', TType::I32, 2);
- $xfer += $output->writeI32($this->dataMovementProtocol);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->priorityOrder !== null) {
- $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
- $xfer += $output->writeI32($this->priorityOrder);
- $xfer += $output->writeFieldEnd();
- }
- $xfer += $output->writeFieldStop();
- $xfer += $output->writeStructEnd();
- return $xfer;
- }
-
-}
-
-/**
* Computational Resource Description
*
* computeResourceId: Airavata Internal Unique Identifier to distinguish Compute Resource.
@@ -2422,7 +1700,7 @@ class ComputeResourceDescription {
*/
public $jobSubmissionInterfaces = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface[]
+ * @var \Airavata\Model\Data\Movement\DataMovementInterface[]
*/
public $dataMovementInterfaces = null;
/**
@@ -2501,7 +1779,7 @@ class ComputeResourceDescription {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface',
+ 'class' => '\Airavata\Model\Data\Movement\DataMovementInterface',
),
),
11 => array(
@@ -2583,14 +1861,14 @@ class ComputeResourceDescription {
case 3:
if ($ftype == TType::LST) {
$this->hostAliases = array();
- $_size30 = 0;
- $_etype33 = 0;
- $xfer += $input->readListBegin($_etype33, $_size30);
- for ($_i34 = 0; $_i34 < $_size30; ++$_i34)
+ $_size23 = 0;
+ $_etype26 = 0;
+ $xfer += $input->readListBegin($_etype26, $_size23);
+ for ($_i27 = 0; $_i27 < $_size23; ++$_i27)
{
- $elem35 = null;
- $xfer += $input->readString($elem35);
- $this->hostAliases []= $elem35;
+ $elem28 = null;
+ $xfer += $input->readString($elem28);
+ $this->hostAliases []= $elem28;
}
$xfer += $input->readListEnd();
} else {
@@ -2600,14 +1878,14 @@ class ComputeResourceDescription {
case 4:
if ($ftype == TType::LST) {
$this->ipAddresses = array();
- $_size36 = 0;
- $_etype39 = 0;
- $xfer += $input->readListBegin($_etype39, $_size36);
- for ($_i40 = 0; $_i40 < $_size36; ++$_i40)
+ $_size29 = 0;
+ $_etype32 = 0;
+ $xfer += $input->readListBegin($_etype32, $_size29);
+ for ($_i33 = 0; $_i33 < $_size29; ++$_i33)
{
- $elem41 = null;
- $xfer += $input->readString($elem41);
- $this->ipAddresses []= $elem41;
+ $elem34 = null;
+ $xfer += $input->readString($elem34);
+ $this->ipAddresses []= $elem34;
}
$xfer += $input->readListEnd();
} else {
@@ -2631,15 +1909,15 @@ class ComputeResourceDescription {
case 7:
if ($ftype == TType::LST) {
$this->batchQueues = array();
- $_size42 = 0;
- $_etype45 = 0;
- $xfer += $input->readListBegin($_etype45, $_size42);
- for ($_i46 = 0; $_i46 < $_size42; ++$_i46)
+ $_size35 = 0;
+ $_etype38 = 0;
+ $xfer += $input->readListBegin($_etype38, $_size35);
+ for ($_i39 = 0; $_i39 < $_size35; ++$_i39)
{
- $elem47 = null;
- $elem47 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
- $xfer += $elem47->read($input);
- $this->batchQueues []= $elem47;
+ $elem40 = null;
+ $elem40 = new \Airavata\Model\AppCatalog\ComputeResource\BatchQueue();
+ $xfer += $elem40->read($input);
+ $this->batchQueues []= $elem40;
}
$xfer += $input->readListEnd();
} else {
@@ -2649,17 +1927,17 @@ class ComputeResourceDescription {
case 8:
if ($ftype == TType::MAP) {
$this->fileSystems = array();
- $_size48 = 0;
- $_ktype49 = 0;
- $_vtype50 = 0;
- $xfer += $input->readMapBegin($_ktype49, $_vtype50, $_size48);
- for ($_i52 = 0; $_i52 < $_size48; ++$_i52)
+ $_size41 = 0;
+ $_ktype42 = 0;
+ $_vtype43 = 0;
+ $xfer += $input->readMapBegin($_ktype42, $_vtype43, $_size41);
+ for ($_i45 = 0; $_i45 < $_size41; ++$_i45)
{
- $key53 = 0;
- $val54 = '';
- $xfer += $input->readI32($key53);
- $xfer += $input->readString($val54);
- $this->fileSystems[$key53] = $val54;
+ $key46 = 0;
+ $val47 = '';
+ $xfer += $input->readI32($key46);
+ $xfer += $input->readString($val47);
+ $this->fileSystems[$key46] = $val47;
}
$xfer += $input->readMapEnd();
} else {
@@ -2669,15 +1947,15 @@ class ComputeResourceDescription {
case 9:
if ($ftype == TType::LST) {
$this->jobSubmissionInterfaces = array();
- $_size55 = 0;
- $_etype58 = 0;
- $xfer += $input->readListBegin($_etype58, $_size55);
- for ($_i59 = 0; $_i59 < $_size55; ++$_i59)
+ $_size48 = 0;
+ $_etype51 = 0;
+ $xfer += $input->readListBegin($_etype51, $_size48);
+ for ($_i52 = 0; $_i52 < $_size48; ++$_i52)
{
- $elem60 = null;
- $elem60 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
- $xfer += $elem60->read($input);
- $this->jobSubmissionInterfaces []= $elem60;
+ $elem53 = null;
+ $elem53 = new \Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface();
+ $xfer += $elem53->read($input);
+ $this->jobSubmissionInterfaces []= $elem53;
}
$xfer += $input->readListEnd();
} else {
@@ -2687,15 +1965,15 @@ class ComputeResourceDescription {
case 10:
if ($ftype == TType::LST) {
$this->dataMovementInterfaces = array();
- $_size61 = 0;
- $_etype64 = 0;
- $xfer += $input->readListBegin($_etype64, $_size61);
- for ($_i65 = 0; $_i65 < $_size61; ++$_i65)
+ $_size54 = 0;
+ $_etype57 = 0;
+ $xfer += $input->readListBegin($_etype57, $_size54);
+ for ($_i58 = 0; $_i58 < $_size54; ++$_i58)
{
- $elem66 = null;
- $elem66 = new \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface();
- $xfer += $elem66->read($input);
- $this->dataMovementInterfaces []= $elem66;
+ $elem59 = null;
+ $elem59 = new \Airavata\Model\Data\Movement\DataMovementInterface();
+ $xfer += $elem59->read($input);
+ $this->dataMovementInterfaces []= $elem59;
}
$xfer += $input->readListEnd();
} else {
@@ -2740,9 +2018,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRING, count($this->hostAliases));
{
- foreach ($this->hostAliases as $iter67)
+ foreach ($this->hostAliases as $iter60)
{
- $xfer += $output->writeString($iter67);
+ $xfer += $output->writeString($iter60);
}
}
$output->writeListEnd();
@@ -2757,9 +2035,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRING, count($this->ipAddresses));
{
- foreach ($this->ipAddresses as $iter68)
+ foreach ($this->ipAddresses as $iter61)
{
- $xfer += $output->writeString($iter68);
+ $xfer += $output->writeString($iter61);
}
}
$output->writeListEnd();
@@ -2784,9 +2062,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->batchQueues));
{
- foreach ($this->batchQueues as $iter69)
+ foreach ($this->batchQueues as $iter62)
{
- $xfer += $iter69->write($output);
+ $xfer += $iter62->write($output);
}
}
$output->writeListEnd();
@@ -2801,10 +2079,10 @@ class ComputeResourceDescription {
{
$output->writeMapBegin(TType::I32, TType::STRING, count($this->fileSystems));
{
- foreach ($this->fileSystems as $kiter70 => $viter71)
+ foreach ($this->fileSystems as $kiter63 => $viter64)
{
- $xfer += $output->writeI32($kiter70);
- $xfer += $output->writeString($viter71);
+ $xfer += $output->writeI32($kiter63);
+ $xfer += $output->writeString($viter64);
}
}
$output->writeMapEnd();
@@ -2819,9 +2097,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->jobSubmissionInterfaces));
{
- foreach ($this->jobSubmissionInterfaces as $iter72)
+ foreach ($this->jobSubmissionInterfaces as $iter65)
{
- $xfer += $iter72->write($output);
+ $xfer += $iter65->write($output);
}
}
$output->writeListEnd();
@@ -2836,9 +2114,9 @@ class ComputeResourceDescription {
{
$output->writeListBegin(TType::STRUCT, count($this->dataMovementInterfaces));
{
- foreach ($this->dataMovementInterfaces as $iter73)
+ foreach ($this->dataMovementInterfaces as $iter66)
{
- $xfer += $iter73->write($output);
+ $xfer += $iter66->write($output);
}
}
$output->writeListEnd();
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca89eaee/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/StorageResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/StorageResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/StorageResource/Types.php
index 0cf3227..cf8f4b3 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/StorageResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/StorageResource/Types.php
@@ -54,7 +54,7 @@ class StorageResourceDescription {
*/
public $enabled = null;
/**
- * @var \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface[]
+ * @var \Airavata\Model\Data\Movement\DataMovementInterface[]
*/
public $dataMovementInterfaces = null;
@@ -83,7 +83,7 @@ class StorageResourceDescription {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface',
+ 'class' => '\Airavata\Model\Data\Movement\DataMovementInterface',
),
),
);
@@ -163,7 +163,7 @@ class StorageResourceDescription {
for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
{
$elem5 = null;
- $elem5 = new \Airavata\Model\AppCatalog\ComputeResource\DataMovementInterface();
+ $elem5 = new \Airavata\Model\Data\Movement\DataMovementInterface();
$xfer += $elem5->read($input);
$this->dataMovementInterfaces []= $elem5;
}