Repository: airavata-php-gateway Updated Branches: refs/heads/develop 26c67fca6 -> e8ff6b16c
updating libraries Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/e8ff6b16 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e8ff6b16 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e8ff6b16 Branch: refs/heads/develop Commit: e8ff6b16ceeefac331b6a9eb5a67e4f1ca6c2fdc Parents: 26c67fc Author: Chathuri Wimalasena <[email protected]> Authored: Tue Nov 17 19:58:52 2015 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Nov 17 19:58:52 2015 -0500 ---------------------------------------------------------------------- app/libraries/Airavata/API/Airavata.php | 725 +++++++++++++++---- .../Model/AppCatalog/GatewayProfile/Types.php | 50 +- 2 files changed, 604 insertions(+), 171 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e8ff6b16/app/libraries/Airavata/API/Airavata.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/API/Airavata.php b/app/libraries/Airavata/API/Airavata.php index 8a0da1b..3f55ee1 100644 --- a/app/libraries/Airavata/API/Airavata.php +++ b/app/libraries/Airavata/API/Airavata.php @@ -634,6 +634,64 @@ interface AiravataIf { */ public function getExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId); /** + * Fetch the completed nested tree structue of previously created experiment metadata which includes processes -> + * tasks -> jobs information. + * + * @param airavataExperimentId + * The identifier for the requested experiment. This is returned during the create experiment step. + * + * @return experimentMetada + * This method will return the previously stored experiment metadata. + * + * @throws org.apache.airavata.model.error.InvalidRequestException + * For any incorrect forming of the request itself. + * + * @throws org.apache.airavata.model.error.ExperimentNotFoundException + * If the specified experiment is not previously created, then an Experiment Not Found Exception is thrown. + * + * @throws org.apache.airavata.model.error.AiravataClientException + * The following list of exceptions are thrown which Airavata Client can take corrective actions to resolve: + * + * UNKNOWN_GATEWAY_ID - If a Gateway is not registered with Airavata as a one time administrative + * step, then Airavata Registry will not have a provenance area setup. The client has to follow + * gateway registration steps and retry this request. + * + * AUTHENTICATION_FAILURE - How Authentication will be implemented is yet to be determined. + * For now this is a place holder. + * + * INVALID_AUTHORIZATION - This will throw an authorization exception. When a more robust security hand-shake + * is implemented, the authorization will be more substantial. + * + * @throws org.apache.airavata.model.error.AiravataSystemException + * This exception will be thrown for any Airavata Server side issues and if the problem cannot be corrected by the client + * rather an Airavata Administrator will be notified to take corrective action. + * + * + * @param \Airavata\Model\Security\AuthzToken $authzToken + * @param string $airavataExperimentId + * @return \Airavata\Model\Experiment\ExperimentModel A structure holding the experiment metadata and its child models. + * + * userName: + * The user name of the targeted gateway end user on whose behalf the experiment is being created. + * the associated gateway identity can only be inferred from the security hand-shake so as to avoid + * authorized Airavata Clients mimicking an unauthorized request. If a gateway is not registered with + * Airavata, an authorization exception is thrown. + * + * experimentName: + * The name of the experiment as defined by the user. The name need not be unique as uniqueness is enforced + * by the generated experiment id. + * + * experimentDescription: + * The verbose description of the experiment. This is an optional parameter. + * + * @throws \Airavata\API\Error\InvalidRequestException + * @throws \Airavata\API\Error\ExperimentNotFoundException + * @throws \Airavata\API\Error\AiravataClientException + * @throws \Airavata\API\Error\AiravataSystemException + * @throws \Airavata\API\Error\AuthorizationException + */ + public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId); + /** * Configure a previously created experiment with required inputs, scheduling and other quality of service * parameters. This method only updates the experiment object within the registry. The experiment has to be launched * to make it actionable by the server. @@ -2472,14 +2530,14 @@ interface AiravataIf { * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $gatewayID * @param string $dataMoveId - * @param \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference + * @param \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference * @return bool * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference); + public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference); /** * Fetch a Compute Resource Preference of a registered gateway profile. * @@ -2539,13 +2597,13 @@ interface AiravataIf { * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $gatewayID * @param string $dataMoveId - * @return \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference + * @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 getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId); + public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId); /** * Fetch all Compute Resource Preferences of a registered gateway profile. * @@ -2568,13 +2626,13 @@ interface AiravataIf { /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $gatewayID - * @return \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[] + * @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 getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID); + public function getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID); /** * Fetch all gateway profiles registered * @@ -2617,15 +2675,15 @@ interface AiravataIf { /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $gatewayID - * @param string $dataMoveId - * @param \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference + * @param string $storageId + * @param \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference * @return bool * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference); + public function updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference); /** * Delete the Compute Resource Preference of a registered gateway profile. * @@ -2652,14 +2710,14 @@ interface AiravataIf { /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $gatewayID - * @param string $dataMoveId + * @param string $storageId * @return bool * @throws \Airavata\API\Error\InvalidRequestException * @throws \Airavata\API\Error\AiravataClientException * @throws \Airavata\API\Error\AiravataSystemException * @throws \Airavata\API\Error\AuthorizationException */ - public function deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId); + public function deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId); /** * @param \Airavata\Model\Security\AuthzToken $authzToken * @param string $gatewayId @@ -4646,6 +4704,73 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("getExperiment failed: unknown result"); } + public function getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId) + { + $this->send_getDetailedExperimentTree($authzToken, $airavataExperimentId); + return $this->recv_getDetailedExperimentTree(); + } + + public function send_getDetailedExperimentTree(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId) + { + $args = new \Airavata\API\Airavata_getDetailedExperimentTree_args(); + $args->authzToken = $authzToken; + $args->airavataExperimentId = $airavataExperimentId; + $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); + if ($bin_accel) + { + thrift_protocol_write_binary($this->output_, 'getDetailedExperimentTree', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); + } + else + { + $this->output_->writeMessageBegin('getDetailedExperimentTree', TMessageType::CALL, $this->seqid_); + $args->write($this->output_); + $this->output_->writeMessageEnd(); + $this->output_->getTransport()->flush(); + } + } + + public function recv_getDetailedExperimentTree() + { + $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary'); + if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getDetailedExperimentTree_result', $this->input_->isStrictRead()); + else + { + $rseqid = 0; + $fname = null; + $mtype = 0; + + $this->input_->readMessageBegin($fname, $mtype, $rseqid); + if ($mtype == TMessageType::EXCEPTION) { + $x = new TApplicationException(); + $x->read($this->input_); + $this->input_->readMessageEnd(); + throw $x; + } + $result = new \Airavata\API\Airavata_getDetailedExperimentTree_result(); + $result->read($this->input_); + $this->input_->readMessageEnd(); + } + if ($result->success !== null) { + return $result->success; + } + if ($result->ire !== null) { + throw $result->ire; + } + if ($result->enf !== null) { + throw $result->enf; + } + if ($result->ace !== null) { + throw $result->ace; + } + if ($result->ase !== null) { + throw $result->ase; + } + if ($result->ae !== null) { + throw $result->ae; + } + throw new \Exception("getDetailedExperimentTree failed: unknown result"); + } + public function updateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, \Airavata\Model\Experiment\ExperimentModel $experiment) { $this->send_updateExperiment($authzToken, $airavataExperimentId, $experiment); @@ -10002,37 +10127,37 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("addGatewayComputeResourcePreference failed: unknown result"); } - public function addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference) + public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference) { - $this->send_addGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId, $dataStoragePreference); - return $this->recv_addGatewayDataStoragePreference(); + $this->send_addGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId, $storagePreference); + return $this->recv_addGatewayStoragePreference(); } - public function send_addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference) + public function send_addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference) { - $args = new \Airavata\API\Airavata_addGatewayDataStoragePreference_args(); + $args = new \Airavata\API\Airavata_addGatewayStoragePreference_args(); $args->authzToken = $authzToken; $args->gatewayID = $gatewayID; $args->dataMoveId = $dataMoveId; - $args->dataStoragePreference = $dataStoragePreference; + $args->storagePreference = $storagePreference; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { - thrift_protocol_write_binary($this->output_, 'addGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); + thrift_protocol_write_binary($this->output_, 'addGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); } else { - $this->output_->writeMessageBegin('addGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_); + $this->output_->writeMessageBegin('addGatewayStoragePreference', TMessageType::CALL, $this->seqid_); $args->write($this->output_); $this->output_->writeMessageEnd(); $this->output_->getTransport()->flush(); } } - public function recv_addGatewayDataStoragePreference() + public function recv_addGatewayStoragePreference() { $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary'); - if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_addGatewayDataStoragePreference_result', $this->input_->isStrictRead()); + if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_addGatewayStoragePreference_result', $this->input_->isStrictRead()); else { $rseqid = 0; @@ -10046,7 +10171,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { $this->input_->readMessageEnd(); throw $x; } - $result = new \Airavata\API\Airavata_addGatewayDataStoragePreference_result(); + $result = new \Airavata\API\Airavata_addGatewayStoragePreference_result(); $result->read($this->input_); $this->input_->readMessageEnd(); } @@ -10065,7 +10190,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { if ($result->ae !== null) { throw $result->ae; } - throw new \Exception("addGatewayDataStoragePreference failed: unknown result"); + throw new \Exception("addGatewayStoragePreference failed: unknown result"); } public function getGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId) @@ -10133,36 +10258,36 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("getGatewayComputeResourcePreference failed: unknown result"); } - public function getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId) + public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId) { - $this->send_getGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId); - return $this->recv_getGatewayDataStoragePreference(); + $this->send_getGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId); + return $this->recv_getGatewayStoragePreference(); } - public function send_getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId) + public function send_getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId) { - $args = new \Airavata\API\Airavata_getGatewayDataStoragePreference_args(); + $args = new \Airavata\API\Airavata_getGatewayStoragePreference_args(); $args->authzToken = $authzToken; $args->gatewayID = $gatewayID; $args->dataMoveId = $dataMoveId; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { - thrift_protocol_write_binary($this->output_, 'getGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); + thrift_protocol_write_binary($this->output_, 'getGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); } else { - $this->output_->writeMessageBegin('getGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_); + $this->output_->writeMessageBegin('getGatewayStoragePreference', TMessageType::CALL, $this->seqid_); $args->write($this->output_); $this->output_->writeMessageEnd(); $this->output_->getTransport()->flush(); } } - public function recv_getGatewayDataStoragePreference() + public function recv_getGatewayStoragePreference() { $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary'); - if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getGatewayDataStoragePreference_result', $this->input_->isStrictRead()); + if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getGatewayStoragePreference_result', $this->input_->isStrictRead()); else { $rseqid = 0; @@ -10176,7 +10301,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { $this->input_->readMessageEnd(); throw $x; } - $result = new \Airavata\API\Airavata_getGatewayDataStoragePreference_result(); + $result = new \Airavata\API\Airavata_getGatewayStoragePreference_result(); $result->read($this->input_); $this->input_->readMessageEnd(); } @@ -10195,7 +10320,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { if ($result->ae !== null) { throw $result->ae; } - throw new \Exception("getGatewayDataStoragePreference failed: unknown result"); + throw new \Exception("getGatewayStoragePreference failed: unknown result"); } public function getAllGatewayComputeResourcePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID) @@ -10262,35 +10387,35 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("getAllGatewayComputeResourcePreferences failed: unknown result"); } - public function getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID) + public function getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID) { - $this->send_getAllGatewayDataStoragePreferences($authzToken, $gatewayID); - return $this->recv_getAllGatewayDataStoragePreferences(); + $this->send_getAllGatewayStoragePreferences($authzToken, $gatewayID); + return $this->recv_getAllGatewayStoragePreferences(); } - public function send_getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID) + public function send_getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID) { - $args = new \Airavata\API\Airavata_getAllGatewayDataStoragePreferences_args(); + $args = new \Airavata\API\Airavata_getAllGatewayStoragePreferences_args(); $args->authzToken = $authzToken; $args->gatewayID = $gatewayID; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { - thrift_protocol_write_binary($this->output_, 'getAllGatewayDataStoragePreferences', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); + thrift_protocol_write_binary($this->output_, 'getAllGatewayStoragePreferences', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); } else { - $this->output_->writeMessageBegin('getAllGatewayDataStoragePreferences', TMessageType::CALL, $this->seqid_); + $this->output_->writeMessageBegin('getAllGatewayStoragePreferences', TMessageType::CALL, $this->seqid_); $args->write($this->output_); $this->output_->writeMessageEnd(); $this->output_->getTransport()->flush(); } } - public function recv_getAllGatewayDataStoragePreferences() + public function recv_getAllGatewayStoragePreferences() { $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary'); - if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getAllGatewayDataStoragePreferences_result', $this->input_->isStrictRead()); + if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getAllGatewayStoragePreferences_result', $this->input_->isStrictRead()); else { $rseqid = 0; @@ -10304,7 +10429,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { $this->input_->readMessageEnd(); throw $x; } - $result = new \Airavata\API\Airavata_getAllGatewayDataStoragePreferences_result(); + $result = new \Airavata\API\Airavata_getAllGatewayStoragePreferences_result(); $result->read($this->input_); $this->input_->readMessageEnd(); } @@ -10323,7 +10448,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { if ($result->ae !== null) { throw $result->ae; } - throw new \Exception("getAllGatewayDataStoragePreferences failed: unknown result"); + throw new \Exception("getAllGatewayStoragePreferences failed: unknown result"); } public function getAllGatewayResourceProfiles(\Airavata\Model\Security\AuthzToken $authzToken) @@ -10455,37 +10580,37 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("updateGatewayComputeResourcePreference failed: unknown result"); } - public function updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference) + public function updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference) { - $this->send_updateGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId, $dataStoragePreference); - return $this->recv_updateGatewayDataStoragePreference(); + $this->send_updateGatewayStoragePreference($authzToken, $gatewayID, $storageId, $storagePreference); + return $this->recv_updateGatewayStoragePreference(); } - public function send_updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference) + public function send_updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference) { - $args = new \Airavata\API\Airavata_updateGatewayDataStoragePreference_args(); + $args = new \Airavata\API\Airavata_updateGatewayStoragePreference_args(); $args->authzToken = $authzToken; $args->gatewayID = $gatewayID; - $args->dataMoveId = $dataMoveId; - $args->dataStoragePreference = $dataStoragePreference; + $args->storageId = $storageId; + $args->storagePreference = $storagePreference; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { - thrift_protocol_write_binary($this->output_, 'updateGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); + thrift_protocol_write_binary($this->output_, 'updateGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); } else { - $this->output_->writeMessageBegin('updateGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_); + $this->output_->writeMessageBegin('updateGatewayStoragePreference', TMessageType::CALL, $this->seqid_); $args->write($this->output_); $this->output_->writeMessageEnd(); $this->output_->getTransport()->flush(); } } - public function recv_updateGatewayDataStoragePreference() + public function recv_updateGatewayStoragePreference() { $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary'); - if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateGatewayDataStoragePreference_result', $this->input_->isStrictRead()); + if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateGatewayStoragePreference_result', $this->input_->isStrictRead()); else { $rseqid = 0; @@ -10499,7 +10624,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { $this->input_->readMessageEnd(); throw $x; } - $result = new \Airavata\API\Airavata_updateGatewayDataStoragePreference_result(); + $result = new \Airavata\API\Airavata_updateGatewayStoragePreference_result(); $result->read($this->input_); $this->input_->readMessageEnd(); } @@ -10518,7 +10643,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { if ($result->ae !== null) { throw $result->ae; } - throw new \Exception("updateGatewayDataStoragePreference failed: unknown result"); + throw new \Exception("updateGatewayStoragePreference failed: unknown result"); } public function deleteGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId) @@ -10586,36 +10711,36 @@ class AiravataClient implements \Airavata\API\AiravataIf { throw new \Exception("deleteGatewayComputeResourcePreference failed: unknown result"); } - public function deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId) + public function deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId) { - $this->send_deleteGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId); - return $this->recv_deleteGatewayDataStoragePreference(); + $this->send_deleteGatewayStoragePreference($authzToken, $gatewayID, $storageId); + return $this->recv_deleteGatewayStoragePreference(); } - public function send_deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId) + public function send_deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId) { - $args = new \Airavata\API\Airavata_deleteGatewayDataStoragePreference_args(); + $args = new \Airavata\API\Airavata_deleteGatewayStoragePreference_args(); $args->authzToken = $authzToken; $args->gatewayID = $gatewayID; - $args->dataMoveId = $dataMoveId; + $args->storageId = $storageId; $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary'); if ($bin_accel) { - thrift_protocol_write_binary($this->output_, 'deleteGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); + thrift_protocol_write_binary($this->output_, 'deleteGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite()); } else { - $this->output_->writeMessageBegin('deleteGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_); + $this->output_->writeMessageBegin('deleteGatewayStoragePreference', TMessageType::CALL, $this->seqid_); $args->write($this->output_); $this->output_->writeMessageEnd(); $this->output_->getTransport()->flush(); } } - public function recv_deleteGatewayDataStoragePreference() + public function recv_deleteGatewayStoragePreference() { $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary'); - if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_deleteGatewayDataStoragePreference_result', $this->input_->isStrictRead()); + if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_deleteGatewayStoragePreference_result', $this->input_->isStrictRead()); else { $rseqid = 0; @@ -10629,7 +10754,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { $this->input_->readMessageEnd(); throw $x; } - $result = new \Airavata\API\Airavata_deleteGatewayDataStoragePreference_result(); + $result = new \Airavata\API\Airavata_deleteGatewayStoragePreference_result(); $result->read($this->input_); $this->input_->readMessageEnd(); } @@ -10648,7 +10773,7 @@ class AiravataClient implements \Airavata\API\AiravataIf { if ($result->ae !== null) { throw $result->ae; } - throw new \Exception("deleteGatewayDataStoragePreference failed: unknown result"); + throw new \Exception("deleteGatewayStoragePreference failed: unknown result"); } public function getAllWorkflows(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId) @@ -20695,6 +20820,314 @@ class Airavata_getExperiment_result { } +class Airavata_getDetailedExperimentTree_args { + static $_TSPEC; + + /** + * @var \Airavata\Model\Security\AuthzToken + */ + public $authzToken = null; + /** + * @var string + */ + public $airavataExperimentId = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 1 => array( + 'var' => 'authzToken', + 'type' => TType::STRUCT, + 'class' => '\Airavata\Model\Security\AuthzToken', + ), + 2 => array( + 'var' => 'airavataExperimentId', + 'type' => TType::STRING, + ), + ); + } + if (is_array($vals)) { + if (isset($vals['authzToken'])) { + $this->authzToken = $vals['authzToken']; + } + if (isset($vals['airavataExperimentId'])) { + $this->airavataExperimentId = $vals['airavataExperimentId']; + } + } + } + + public function getName() { + return 'Airavata_getDetailedExperimentTree_args'; + } + + 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::STRUCT) { + $this->authzToken = new \Airavata\Model\Security\AuthzToken(); + $xfer += $this->authzToken->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; + case 2: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->airavataExperimentId); + } 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('Airavata_getDetailedExperimentTree_args'); + if ($this->authzToken !== null) { + if (!is_object($this->authzToken)) { + throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); + } + $xfer += $output->writeFieldBegin('authzToken', TType::STRUCT, 1); + $xfer += $this->authzToken->write($output); + $xfer += $output->writeFieldEnd(); + } + if ($this->airavataExperimentId !== null) { + $xfer += $output->writeFieldBegin('airavataExperimentId', TType::STRING, 2); + $xfer += $output->writeString($this->airavataExperimentId); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + +class Airavata_getDetailedExperimentTree_result { + static $_TSPEC; + + /** + * @var \Airavata\Model\Experiment\ExperimentModel + */ + public $success = null; + /** + * @var \Airavata\API\Error\InvalidRequestException + */ + public $ire = null; + /** + * @var \Airavata\API\Error\ExperimentNotFoundException + */ + public $enf = null; + /** + * @var \Airavata\API\Error\AiravataClientException + */ + public $ace = null; + /** + * @var \Airavata\API\Error\AiravataSystemException + */ + public $ase = null; + /** + * @var \Airavata\API\Error\AuthorizationException + */ + public $ae = null; + + public function __construct($vals=null) { + if (!isset(self::$_TSPEC)) { + self::$_TSPEC = array( + 0 => array( + 'var' => 'success', + 'type' => TType::STRUCT, + 'class' => '\Airavata\Model\Experiment\ExperimentModel', + ), + 1 => array( + 'var' => 'ire', + 'type' => TType::STRUCT, + 'class' => '\Airavata\API\Error\InvalidRequestException', + ), + 2 => array( + 'var' => 'enf', + 'type' => TType::STRUCT, + 'class' => '\Airavata\API\Error\ExperimentNotFoundException', + ), + 3 => array( + 'var' => 'ace', + 'type' => TType::STRUCT, + 'class' => '\Airavata\API\Error\AiravataClientException', + ), + 4 => array( + 'var' => 'ase', + 'type' => TType::STRUCT, + 'class' => '\Airavata\API\Error\AiravataSystemException', + ), + 5 => array( + 'var' => 'ae', + 'type' => TType::STRUCT, + 'class' => '\Airavata\API\Error\AuthorizationException', + ), + ); + } + if (is_array($vals)) { + if (isset($vals['success'])) { + $this->success = $vals['success']; + } + if (isset($vals['ire'])) { + $this->ire = $vals['ire']; + } + if (isset($vals['enf'])) { + $this->enf = $vals['enf']; + } + if (isset($vals['ace'])) { + $this->ace = $vals['ace']; + } + if (isset($vals['ase'])) { + $this->ase = $vals['ase']; + } + if (isset($vals['ae'])) { + $this->ae = $vals['ae']; + } + } + } + + public function getName() { + return 'Airavata_getDetailedExperimentTree_result'; + } + + 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 0: + if ($ftype == TType::STRUCT) { + $this->success = new \Airavata\Model\Experiment\ExperimentModel(); + $xfer += $this->success->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; + case 1: + if ($ftype == TType::STRUCT) { + $this->ire = new \Airavata\API\Error\InvalidRequestException(); + $xfer += $this->ire->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; + case 2: + if ($ftype == TType::STRUCT) { + $this->enf = new \Airavata\API\Error\ExperimentNotFoundException(); + $xfer += $this->enf->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; + case 3: + if ($ftype == TType::STRUCT) { + $this->ace = new \Airavata\API\Error\AiravataClientException(); + $xfer += $this->ace->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; + case 4: + if ($ftype == TType::STRUCT) { + $this->ase = new \Airavata\API\Error\AiravataSystemException(); + $xfer += $this->ase->read($input); + } else { + $xfer += $input->skip($ftype); + } + break; + case 5: + if ($ftype == TType::STRUCT) { + $this->ae = new \Airavata\API\Error\AuthorizationException(); + $xfer += $this->ae->read($input); + } 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('Airavata_getDetailedExperimentTree_result'); + if ($this->success !== null) { + if (!is_object($this->success)) { + throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); + } + $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0); + $xfer += $this->success->write($output); + $xfer += $output->writeFieldEnd(); + } + if ($this->ire !== null) { + $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1); + $xfer += $this->ire->write($output); + $xfer += $output->writeFieldEnd(); + } + if ($this->enf !== null) { + $xfer += $output->writeFieldBegin('enf', TType::STRUCT, 2); + $xfer += $this->enf->write($output); + $xfer += $output->writeFieldEnd(); + } + if ($this->ace !== null) { + $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 3); + $xfer += $this->ace->write($output); + $xfer += $output->writeFieldEnd(); + } + if ($this->ase !== null) { + $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 4); + $xfer += $this->ase->write($output); + $xfer += $output->writeFieldEnd(); + } + if ($this->ae !== null) { + $xfer += $output->writeFieldBegin('ae', TType::STRUCT, 5); + $xfer += $this->ae->write($output); + $xfer += $output->writeFieldEnd(); + } + $xfer += $output->writeFieldStop(); + $xfer += $output->writeStructEnd(); + return $xfer; + } + +} + class Airavata_updateExperiment_args { static $_TSPEC; @@ -45580,7 +46013,7 @@ class Airavata_addGatewayComputeResourcePreference_result { } -class Airavata_addGatewayDataStoragePreference_args { +class Airavata_addGatewayStoragePreference_args { static $_TSPEC; /** @@ -45596,9 +46029,9 @@ class Airavata_addGatewayDataStoragePreference_args { */ public $dataMoveId = null; /** - * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference + * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference */ - public $dataStoragePreference = null; + public $storagePreference = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -45617,9 +46050,9 @@ class Airavata_addGatewayDataStoragePreference_args { 'type' => TType::STRING, ), 4 => array( - 'var' => 'dataStoragePreference', + 'var' => 'storagePreference', 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference', + 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), ); } @@ -45633,14 +46066,14 @@ class Airavata_addGatewayDataStoragePreference_args { if (isset($vals['dataMoveId'])) { $this->dataMoveId = $vals['dataMoveId']; } - if (isset($vals['dataStoragePreference'])) { - $this->dataStoragePreference = $vals['dataStoragePreference']; + if (isset($vals['storagePreference'])) { + $this->storagePreference = $vals['storagePreference']; } } } public function getName() { - return 'Airavata_addGatewayDataStoragePreference_args'; + return 'Airavata_addGatewayStoragePreference_args'; } public function read($input) @@ -45682,8 +46115,8 @@ class Airavata_addGatewayDataStoragePreference_args { break; case 4: if ($ftype == TType::STRUCT) { - $this->dataStoragePreference = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference(); - $xfer += $this->dataStoragePreference->read($input); + $this->storagePreference = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference(); + $xfer += $this->storagePreference->read($input); } else { $xfer += $input->skip($ftype); } @@ -45700,7 +46133,7 @@ class Airavata_addGatewayDataStoragePreference_args { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_addGatewayDataStoragePreference_args'); + $xfer += $output->writeStructBegin('Airavata_addGatewayStoragePreference_args'); if ($this->authzToken !== null) { if (!is_object($this->authzToken)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -45719,12 +46152,12 @@ class Airavata_addGatewayDataStoragePreference_args { $xfer += $output->writeString($this->dataMoveId); $xfer += $output->writeFieldEnd(); } - if ($this->dataStoragePreference !== null) { - if (!is_object($this->dataStoragePreference)) { + if ($this->storagePreference !== null) { + if (!is_object($this->storagePreference)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('dataStoragePreference', TType::STRUCT, 4); - $xfer += $this->dataStoragePreference->write($output); + $xfer += $output->writeFieldBegin('storagePreference', TType::STRUCT, 4); + $xfer += $this->storagePreference->write($output); $xfer += $output->writeFieldEnd(); } $xfer += $output->writeFieldStop(); @@ -45734,7 +46167,7 @@ class Airavata_addGatewayDataStoragePreference_args { } -class Airavata_addGatewayDataStoragePreference_result { +class Airavata_addGatewayStoragePreference_result { static $_TSPEC; /** @@ -45807,7 +46240,7 @@ class Airavata_addGatewayDataStoragePreference_result { } public function getName() { - return 'Airavata_addGatewayDataStoragePreference_result'; + return 'Airavata_addGatewayStoragePreference_result'; } public function read($input) @@ -45876,7 +46309,7 @@ class Airavata_addGatewayDataStoragePreference_result { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_addGatewayDataStoragePreference_result'); + $xfer += $output->writeStructBegin('Airavata_addGatewayStoragePreference_result'); if ($this->success !== null) { $xfer += $output->writeFieldBegin('success', TType::BOOL, 0); $xfer += $output->writeBool($this->success); @@ -46215,7 +46648,7 @@ class Airavata_getGatewayComputeResourcePreference_result { } -class Airavata_getGatewayDataStoragePreference_args { +class Airavata_getGatewayStoragePreference_args { static $_TSPEC; /** @@ -46263,7 +46696,7 @@ class Airavata_getGatewayDataStoragePreference_args { } public function getName() { - return 'Airavata_getGatewayDataStoragePreference_args'; + return 'Airavata_getGatewayStoragePreference_args'; } public function read($input) @@ -46315,7 +46748,7 @@ class Airavata_getGatewayDataStoragePreference_args { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getGatewayDataStoragePreference_args'); + $xfer += $output->writeStructBegin('Airavata_getGatewayStoragePreference_args'); if ($this->authzToken !== null) { if (!is_object($this->authzToken)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -46341,11 +46774,11 @@ class Airavata_getGatewayDataStoragePreference_args { } -class Airavata_getGatewayDataStoragePreference_result { +class Airavata_getGatewayStoragePreference_result { static $_TSPEC; /** - * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference + * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference */ public $success = null; /** @@ -46371,7 +46804,7 @@ class Airavata_getGatewayDataStoragePreference_result { 0 => array( 'var' => 'success', 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference', + 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), 1 => array( 'var' => 'ire', @@ -46415,7 +46848,7 @@ class Airavata_getGatewayDataStoragePreference_result { } public function getName() { - return 'Airavata_getGatewayDataStoragePreference_result'; + return 'Airavata_getGatewayStoragePreference_result'; } public function read($input) @@ -46435,7 +46868,7 @@ class Airavata_getGatewayDataStoragePreference_result { { case 0: if ($ftype == TType::STRUCT) { - $this->success = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference(); + $this->success = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference(); $xfer += $this->success->read($input); } else { $xfer += $input->skip($ftype); @@ -46485,7 +46918,7 @@ class Airavata_getGatewayDataStoragePreference_result { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getGatewayDataStoragePreference_result'); + $xfer += $output->writeStructBegin('Airavata_getGatewayStoragePreference_result'); if ($this->success !== null) { if (!is_object($this->success)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -46827,7 +47260,7 @@ class Airavata_getAllGatewayComputeResourcePreferences_result { } -class Airavata_getAllGatewayDataStoragePreferences_args { +class Airavata_getAllGatewayStoragePreferences_args { static $_TSPEC; /** @@ -46864,7 +47297,7 @@ class Airavata_getAllGatewayDataStoragePreferences_args { } public function getName() { - return 'Airavata_getAllGatewayDataStoragePreferences_args'; + return 'Airavata_getAllGatewayStoragePreferences_args'; } public function read($input) @@ -46909,7 +47342,7 @@ class Airavata_getAllGatewayDataStoragePreferences_args { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getAllGatewayDataStoragePreferences_args'); + $xfer += $output->writeStructBegin('Airavata_getAllGatewayStoragePreferences_args'); if ($this->authzToken !== null) { if (!is_object($this->authzToken)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -46930,11 +47363,11 @@ class Airavata_getAllGatewayDataStoragePreferences_args { } -class Airavata_getAllGatewayDataStoragePreferences_result { +class Airavata_getAllGatewayStoragePreferences_result { static $_TSPEC; /** - * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[] + * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[] */ public $success = null; /** @@ -46963,7 +47396,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result { 'etype' => TType::STRUCT, 'elem' => array( 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference', + 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), ), 1 => array( @@ -47008,7 +47441,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result { } public function getName() { - return 'Airavata_getAllGatewayDataStoragePreferences_result'; + return 'Airavata_getAllGatewayStoragePreferences_result'; } public function read($input) @@ -47035,7 +47468,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result { for ($_i239 = 0; $_i239 < $_size235; ++$_i239) { $elem240 = null; - $elem240 = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference(); + $elem240 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference(); $xfer += $elem240->read($input); $this->success []= $elem240; } @@ -47088,7 +47521,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_getAllGatewayDataStoragePreferences_result'); + $xfer += $output->writeStructBegin('Airavata_getAllGatewayStoragePreferences_result'); if ($this->success !== null) { if (!is_array($this->success)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -47745,7 +48178,7 @@ class Airavata_updateGatewayComputeResourcePreference_result { } -class Airavata_updateGatewayDataStoragePreference_args { +class Airavata_updateGatewayStoragePreference_args { static $_TSPEC; /** @@ -47759,11 +48192,11 @@ class Airavata_updateGatewayDataStoragePreference_args { /** * @var string */ - public $dataMoveId = null; + public $storageId = null; /** - * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference + * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference */ - public $dataStoragePreference = null; + public $storagePreference = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -47778,13 +48211,13 @@ class Airavata_updateGatewayDataStoragePreference_args { 'type' => TType::STRING, ), 3 => array( - 'var' => 'dataMoveId', + 'var' => 'storageId', 'type' => TType::STRING, ), 4 => array( - 'var' => 'dataStoragePreference', + 'var' => 'storagePreference', 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference', + 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), ); } @@ -47795,17 +48228,17 @@ class Airavata_updateGatewayDataStoragePreference_args { if (isset($vals['gatewayID'])) { $this->gatewayID = $vals['gatewayID']; } - if (isset($vals['dataMoveId'])) { - $this->dataMoveId = $vals['dataMoveId']; + if (isset($vals['storageId'])) { + $this->storageId = $vals['storageId']; } - if (isset($vals['dataStoragePreference'])) { - $this->dataStoragePreference = $vals['dataStoragePreference']; + if (isset($vals['storagePreference'])) { + $this->storagePreference = $vals['storagePreference']; } } } public function getName() { - return 'Airavata_updateGatewayDataStoragePreference_args'; + return 'Airavata_updateGatewayStoragePreference_args'; } public function read($input) @@ -47840,15 +48273,15 @@ class Airavata_updateGatewayDataStoragePreference_args { break; case 3: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->dataMoveId); + $xfer += $input->readString($this->storageId); } else { $xfer += $input->skip($ftype); } break; case 4: if ($ftype == TType::STRUCT) { - $this->dataStoragePreference = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference(); - $xfer += $this->dataStoragePreference->read($input); + $this->storagePreference = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference(); + $xfer += $this->storagePreference->read($input); } else { $xfer += $input->skip($ftype); } @@ -47865,7 +48298,7 @@ class Airavata_updateGatewayDataStoragePreference_args { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_updateGatewayDataStoragePreference_args'); + $xfer += $output->writeStructBegin('Airavata_updateGatewayStoragePreference_args'); if ($this->authzToken !== null) { if (!is_object($this->authzToken)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -47879,17 +48312,17 @@ class Airavata_updateGatewayDataStoragePreference_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->storageId !== null) { + $xfer += $output->writeFieldBegin('storageId', TType::STRING, 3); + $xfer += $output->writeString($this->storageId); $xfer += $output->writeFieldEnd(); } - if ($this->dataStoragePreference !== null) { - if (!is_object($this->dataStoragePreference)) { + if ($this->storagePreference !== null) { + if (!is_object($this->storagePreference)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('dataStoragePreference', TType::STRUCT, 4); - $xfer += $this->dataStoragePreference->write($output); + $xfer += $output->writeFieldBegin('storagePreference', TType::STRUCT, 4); + $xfer += $this->storagePreference->write($output); $xfer += $output->writeFieldEnd(); } $xfer += $output->writeFieldStop(); @@ -47899,7 +48332,7 @@ class Airavata_updateGatewayDataStoragePreference_args { } -class Airavata_updateGatewayDataStoragePreference_result { +class Airavata_updateGatewayStoragePreference_result { static $_TSPEC; /** @@ -47972,7 +48405,7 @@ class Airavata_updateGatewayDataStoragePreference_result { } public function getName() { - return 'Airavata_updateGatewayDataStoragePreference_result'; + return 'Airavata_updateGatewayStoragePreference_result'; } public function read($input) @@ -48041,7 +48474,7 @@ class Airavata_updateGatewayDataStoragePreference_result { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_updateGatewayDataStoragePreference_result'); + $xfer += $output->writeStructBegin('Airavata_updateGatewayStoragePreference_result'); if ($this->success !== null) { $xfer += $output->writeFieldBegin('success', TType::BOOL, 0); $xfer += $output->writeBool($this->success); @@ -48375,7 +48808,7 @@ class Airavata_deleteGatewayComputeResourcePreference_result { } -class Airavata_deleteGatewayDataStoragePreference_args { +class Airavata_deleteGatewayStoragePreference_args { static $_TSPEC; /** @@ -48389,7 +48822,7 @@ class Airavata_deleteGatewayDataStoragePreference_args { /** * @var string */ - public $dataMoveId = null; + public $storageId = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -48404,7 +48837,7 @@ class Airavata_deleteGatewayDataStoragePreference_args { 'type' => TType::STRING, ), 3 => array( - 'var' => 'dataMoveId', + 'var' => 'storageId', 'type' => TType::STRING, ), ); @@ -48416,14 +48849,14 @@ class Airavata_deleteGatewayDataStoragePreference_args { if (isset($vals['gatewayID'])) { $this->gatewayID = $vals['gatewayID']; } - if (isset($vals['dataMoveId'])) { - $this->dataMoveId = $vals['dataMoveId']; + if (isset($vals['storageId'])) { + $this->storageId = $vals['storageId']; } } } public function getName() { - return 'Airavata_deleteGatewayDataStoragePreference_args'; + return 'Airavata_deleteGatewayStoragePreference_args'; } public function read($input) @@ -48458,7 +48891,7 @@ class Airavata_deleteGatewayDataStoragePreference_args { break; case 3: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->dataMoveId); + $xfer += $input->readString($this->storageId); } else { $xfer += $input->skip($ftype); } @@ -48475,7 +48908,7 @@ class Airavata_deleteGatewayDataStoragePreference_args { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_deleteGatewayDataStoragePreference_args'); + $xfer += $output->writeStructBegin('Airavata_deleteGatewayStoragePreference_args'); if ($this->authzToken !== null) { if (!is_object($this->authzToken)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); @@ -48489,9 +48922,9 @@ class Airavata_deleteGatewayDataStoragePreference_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->storageId !== null) { + $xfer += $output->writeFieldBegin('storageId', TType::STRING, 3); + $xfer += $output->writeString($this->storageId); $xfer += $output->writeFieldEnd(); } $xfer += $output->writeFieldStop(); @@ -48501,7 +48934,7 @@ class Airavata_deleteGatewayDataStoragePreference_args { } -class Airavata_deleteGatewayDataStoragePreference_result { +class Airavata_deleteGatewayStoragePreference_result { static $_TSPEC; /** @@ -48574,7 +49007,7 @@ class Airavata_deleteGatewayDataStoragePreference_result { } public function getName() { - return 'Airavata_deleteGatewayDataStoragePreference_result'; + return 'Airavata_deleteGatewayStoragePreference_result'; } public function read($input) @@ -48643,7 +49076,7 @@ class Airavata_deleteGatewayDataStoragePreference_result { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('Airavata_deleteGatewayDataStoragePreference_result'); + $xfer += $output->writeStructBegin('Airavata_deleteGatewayStoragePreference_result'); if ($this->success !== null) { $xfer += $output->writeFieldBegin('success', TType::BOOL, 0); $xfer += $output->writeBool($this->success); http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e8ff6b16/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php ---------------------------------------------------------------------- diff --git a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php index f63f2f0..9152391 100644 --- a/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php +++ b/app/libraries/Airavata/Model/AppCatalog/GatewayProfile/Types.php @@ -310,13 +310,13 @@ class ComputeResourcePreference { } -class DataStoragePreference { +class StoragePreference { static $_TSPEC; /** * @var string */ - public $dataMovememtResourceId = null; + public $storageResourceId = null; /** * @var string */ @@ -334,7 +334,7 @@ class DataStoragePreference { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( 1 => array( - 'var' => 'dataMovememtResourceId', + 'var' => 'storageResourceId', 'type' => TType::STRING, ), 2 => array( @@ -352,8 +352,8 @@ class DataStoragePreference { ); } if (is_array($vals)) { - if (isset($vals['dataMovememtResourceId'])) { - $this->dataMovememtResourceId = $vals['dataMovememtResourceId']; + if (isset($vals['storageResourceId'])) { + $this->storageResourceId = $vals['storageResourceId']; } if (isset($vals['loginUserName'])) { $this->loginUserName = $vals['loginUserName']; @@ -368,7 +368,7 @@ class DataStoragePreference { } public function getName() { - return 'DataStoragePreference'; + return 'StoragePreference'; } public function read($input) @@ -388,7 +388,7 @@ class DataStoragePreference { { case 1: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->dataMovememtResourceId); + $xfer += $input->readString($this->storageResourceId); } else { $xfer += $input->skip($ftype); } @@ -426,10 +426,10 @@ class DataStoragePreference { public function write($output) { $xfer = 0; - $xfer += $output->writeStructBegin('DataStoragePreference'); - if ($this->dataMovememtResourceId !== null) { - $xfer += $output->writeFieldBegin('dataMovememtResourceId', TType::STRING, 1); - $xfer += $output->writeString($this->dataMovememtResourceId); + $xfer += $output->writeStructBegin('StoragePreference'); + if ($this->storageResourceId !== null) { + $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 1); + $xfer += $output->writeString($this->storageResourceId); $xfer += $output->writeFieldEnd(); } if ($this->loginUserName !== null) { @@ -483,9 +483,9 @@ class GatewayResourceProfile { */ public $computeResourcePreferences = null; /** - * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[] + * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[] */ - public $dataStoragePreferences = null; + public $storagePreferences = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -508,12 +508,12 @@ class GatewayResourceProfile { ), ), 4 => array( - 'var' => 'dataStoragePreferences', + 'var' => 'storagePreferences', 'type' => TType::LST, 'etype' => TType::STRUCT, 'elem' => array( 'type' => TType::STRUCT, - 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference', + 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference', ), ), ); @@ -528,8 +528,8 @@ class GatewayResourceProfile { if (isset($vals['computeResourcePreferences'])) { $this->computeResourcePreferences = $vals['computeResourcePreferences']; } - if (isset($vals['dataStoragePreferences'])) { - $this->dataStoragePreferences = $vals['dataStoragePreferences']; + if (isset($vals['storagePreferences'])) { + $this->storagePreferences = $vals['storagePreferences']; } } } @@ -587,16 +587,16 @@ class GatewayResourceProfile { break; case 4: if ($ftype == TType::LST) { - $this->dataStoragePreferences = array(); + $this->storagePreferences = array(); $_size6 = 0; $_etype9 = 0; $xfer += $input->readListBegin($_etype9, $_size6); for ($_i10 = 0; $_i10 < $_size6; ++$_i10) { $elem11 = null; - $elem11 = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference(); + $elem11 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference(); $xfer += $elem11->read($input); - $this->dataStoragePreferences []= $elem11; + $this->storagePreferences []= $elem11; } $xfer += $input->readListEnd(); } else { @@ -643,15 +643,15 @@ class GatewayResourceProfile { } $xfer += $output->writeFieldEnd(); } - if ($this->dataStoragePreferences !== null) { - if (!is_array($this->dataStoragePreferences)) { + if ($this->storagePreferences !== null) { + if (!is_array($this->storagePreferences)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4); + $xfer += $output->writeFieldBegin('storagePreferences', TType::LST, 4); { - $output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences)); + $output->writeListBegin(TType::STRUCT, count($this->storagePreferences)); { - foreach ($this->dataStoragePreferences as $iter13) + foreach ($this->storagePreferences as $iter13) { $xfer += $iter13->write($output); }
