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 16:58:16 UTC
[3/6] airavata git commit: adding data storage interface
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
index 126dc38..9993894 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
@@ -1673,11 +1673,12 @@ class AiravataHandler : virtual public AiravataIf {
*
*
* @param authzToken
- * @param computeResourceId
+ * @param resourceId
+ * @param dataMoveType
* @param priorityOrder
* @param localDataMovement
*/
- void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
+ void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::appcatalog::computeresource::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
// Your implementation goes here
printf("addLocalDataMovementDetails\n");
}
@@ -1737,11 +1738,12 @@ class AiravataHandler : virtual public AiravataIf {
*
*
* @param authzToken
- * @param computeResourceId
+ * @param resourceId
+ * @param dataMoveType
* @param priorityOrder
* @param scpDataMovement
*/
- void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) {
+ void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::appcatalog::computeresource::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) {
// Your implementation goes here
printf("addSCPDataMovementDetails\n");
}
@@ -1784,7 +1786,7 @@ class AiravataHandler : virtual public AiravataIf {
printf("getSCPDataMovement\n");
}
- void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement) {
+ void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::appcatalog::computeresource::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement) {
// Your implementation goes here
printf("addUnicoreDataMovementDetails\n");
}
@@ -1817,11 +1819,12 @@ class AiravataHandler : virtual public AiravataIf {
*
*
* @param authzToken
- * @param computeResourceId
+ * @param resourceId
+ * @param dataMoveType
* @param priorityOrder
* @param gridFTPDataMovement
*/
- void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
+ void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::appcatalog::computeresource::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
// Your implementation goes here
printf("addGridFTPDataMovementDetails\n");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
index 620e666..23b25fc 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
@@ -134,6 +134,16 @@ const char* _kMonitorModeNames[] = {
};
const std::map<int, const char*> _MonitorMode_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kMonitorModeValues, _kMonitorModeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+int _kDMTypeValues[] = {
+ DMType::COMPUTE_RESOURCE,
+ DMType::STORAGE_RESOURCE
+};
+const char* _kDMTypeNames[] = {
+ "COMPUTE_RESOURCE",
+ "STORAGE_RESOURCE"
+};
+const std::map<int, const char*> _DMType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kDMTypeValues, _kDMTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
int _kDataMovementProtocolValues[] = {
DataMovementProtocol::LOCAL,
DataMovementProtocol::SCP,
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
index cbfec2a..fad78f8 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
@@ -113,6 +113,15 @@ struct MonitorMode {
extern const std::map<int, const char*> _MonitorMode_VALUES_TO_NAMES;
+struct DMType {
+ enum type {
+ COMPUTE_RESOURCE = 0,
+ STORAGE_RESOURCE = 1
+ };
+};
+
+extern const std::map<int, const char*> _DMType_VALUES_TO_NAMES;
+
struct DataMovementProtocol {
enum type {
LOCAL = 0,
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/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 3f55ee1..a63dab4 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
@@ -1971,7 +1971,8 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $computeResourceId
+ * @param string $resourceId
+ * @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement
* @return string
@@ -1980,7 +1981,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
+ public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
/**
* Update the given Local data movement details
*
@@ -2045,7 +2046,8 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $computeResourceId
+ * @param string $resourceId
+ * @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement
* @return string
@@ -2054,7 +2056,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
+ public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
/**
* Update the given scp data movement details
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -2104,7 +2106,8 @@ interface AiravataIf {
public function getSCPDataMovement(\Airavata\Model\Security\AuthzToken $authzToken, $dataMovementId);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $computeResourceId
+ * @param string $resourceId
+ * @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement
* @return string
@@ -2113,7 +2116,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement);
+ public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $dataMovementInterfaceId
@@ -2157,7 +2160,8 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $computeResourceId
+ * @param string $resourceId
+ * @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement
* @return string
@@ -2166,7 +2170,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
+ public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\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.
@@ -8314,17 +8318,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("updateUnicoreJobSubmissionDetails failed: unknown result");
}
- public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+ public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
{
- $this->send_addLocalDataMovementDetails($authzToken, $computeResourceId, $priorityOrder, $localDataMovement);
+ $this->send_addLocalDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $localDataMovement);
return $this->recv_addLocalDataMovementDetails();
}
- public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+ public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
{
$args = new \Airavata\API\Airavata_addLocalDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->computeResourceId = $computeResourceId;
+ $args->resourceId = $resourceId;
+ $args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->localDataMovement = $localDataMovement;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -8509,17 +8514,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getLocalDataMovement failed: unknown result");
}
- public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+ public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
{
- $this->send_addSCPDataMovementDetails($authzToken, $computeResourceId, $priorityOrder, $scpDataMovement);
+ $this->send_addSCPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $scpDataMovement);
return $this->recv_addSCPDataMovementDetails();
}
- public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+ public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
{
$args = new \Airavata\API\Airavata_addSCPDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->computeResourceId = $computeResourceId;
+ $args->resourceId = $resourceId;
+ $args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->scpDataMovement = $scpDataMovement;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -8704,17 +8710,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getSCPDataMovement failed: unknown result");
}
- public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
{
- $this->send_addUnicoreDataMovementDetails($authzToken, $computeResourceId, $priorityOrder, $unicoreDataMovement);
+ $this->send_addUnicoreDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $unicoreDataMovement);
return $this->recv_addUnicoreDataMovementDetails();
}
- public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
{
$args = new \Airavata\API\Airavata_addUnicoreDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->computeResourceId = $computeResourceId;
+ $args->resourceId = $resourceId;
+ $args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->unicoreDataMovement = $unicoreDataMovement;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -8899,17 +8906,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getUnicoreDataMovement failed: unknown result");
}
- public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+ public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
{
- $this->send_addGridFTPDataMovementDetails($authzToken, $computeResourceId, $priorityOrder, $gridFTPDataMovement);
+ $this->send_addGridFTPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $gridFTPDataMovement);
return $this->recv_addGridFTPDataMovementDetails();
}
- public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+ public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
{
$args = new \Airavata\API\Airavata_addGridFTPDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->computeResourceId = $computeResourceId;
+ $args->resourceId = $resourceId;
+ $args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->gridFTPDataMovement = $gridFTPDataMovement;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -37593,7 +37601,11 @@ class Airavata_addLocalDataMovementDetails_args {
/**
* @var string
*/
- public $computeResourceId = null;
+ public $resourceId = null;
+ /**
+ * @var int
+ */
+ public $dataMoveType = null;
/**
* @var int
*/
@@ -37612,14 +37624,18 @@ class Airavata_addLocalDataMovementDetails_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'computeResourceId',
+ 'var' => 'resourceId',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'priorityOrder',
+ 'var' => 'dataMoveType',
'type' => TType::I32,
),
4 => array(
+ 'var' => 'priorityOrder',
+ 'type' => TType::I32,
+ ),
+ 5 => array(
'var' => 'localDataMovement',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
@@ -37630,8 +37646,11 @@ class Airavata_addLocalDataMovementDetails_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['computeResourceId'])) {
- $this->computeResourceId = $vals['computeResourceId'];
+ if (isset($vals['resourceId'])) {
+ $this->resourceId = $vals['resourceId'];
+ }
+ if (isset($vals['dataMoveType'])) {
+ $this->dataMoveType = $vals['dataMoveType'];
}
if (isset($vals['priorityOrder'])) {
$this->priorityOrder = $vals['priorityOrder'];
@@ -37671,19 +37690,26 @@ class Airavata_addLocalDataMovementDetails_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->computeResourceId);
+ $xfer += $input->readString($this->resourceId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->priorityOrder);
+ $xfer += $input->readI32($this->dataMoveType);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->priorityOrder);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
if ($ftype == TType::STRUCT) {
$this->localDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
$xfer += $this->localDataMovement->read($input);
@@ -37712,13 +37738,18 @@ class Airavata_addLocalDataMovementDetails_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->computeResourceId !== null) {
- $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->computeResourceId);
+ if ($this->resourceId !== null) {
+ $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+ $xfer += $output->writeString($this->resourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->dataMoveType !== null) {
+ $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 3);
+ $xfer += $output->writeI32($this->dataMoveType);
$xfer += $output->writeFieldEnd();
}
if ($this->priorityOrder !== null) {
- $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
+ $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 4);
$xfer += $output->writeI32($this->priorityOrder);
$xfer += $output->writeFieldEnd();
}
@@ -37726,7 +37757,7 @@ class Airavata_addLocalDataMovementDetails_args {
if (!is_object($this->localDataMovement)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('localDataMovement', TType::STRUCT, 4);
+ $xfer += $output->writeFieldBegin('localDataMovement', TType::STRUCT, 5);
$xfer += $this->localDataMovement->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -38511,7 +38542,11 @@ class Airavata_addSCPDataMovementDetails_args {
/**
* @var string
*/
- public $computeResourceId = null;
+ public $resourceId = null;
+ /**
+ * @var int
+ */
+ public $dataMoveType = null;
/**
* @var int
*/
@@ -38530,14 +38565,18 @@ class Airavata_addSCPDataMovementDetails_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'computeResourceId',
+ 'var' => 'resourceId',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'priorityOrder',
+ 'var' => 'dataMoveType',
'type' => TType::I32,
),
4 => array(
+ 'var' => 'priorityOrder',
+ 'type' => TType::I32,
+ ),
+ 5 => array(
'var' => 'scpDataMovement',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement',
@@ -38548,8 +38587,11 @@ class Airavata_addSCPDataMovementDetails_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['computeResourceId'])) {
- $this->computeResourceId = $vals['computeResourceId'];
+ if (isset($vals['resourceId'])) {
+ $this->resourceId = $vals['resourceId'];
+ }
+ if (isset($vals['dataMoveType'])) {
+ $this->dataMoveType = $vals['dataMoveType'];
}
if (isset($vals['priorityOrder'])) {
$this->priorityOrder = $vals['priorityOrder'];
@@ -38589,19 +38631,26 @@ class Airavata_addSCPDataMovementDetails_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->computeResourceId);
+ $xfer += $input->readString($this->resourceId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->priorityOrder);
+ $xfer += $input->readI32($this->dataMoveType);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->priorityOrder);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
if ($ftype == TType::STRUCT) {
$this->scpDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement();
$xfer += $this->scpDataMovement->read($input);
@@ -38630,13 +38679,18 @@ class Airavata_addSCPDataMovementDetails_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->computeResourceId !== null) {
- $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->computeResourceId);
+ if ($this->resourceId !== null) {
+ $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+ $xfer += $output->writeString($this->resourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->dataMoveType !== null) {
+ $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 3);
+ $xfer += $output->writeI32($this->dataMoveType);
$xfer += $output->writeFieldEnd();
}
if ($this->priorityOrder !== null) {
- $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
+ $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 4);
$xfer += $output->writeI32($this->priorityOrder);
$xfer += $output->writeFieldEnd();
}
@@ -38644,7 +38698,7 @@ class Airavata_addSCPDataMovementDetails_args {
if (!is_object($this->scpDataMovement)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('scpDataMovement', TType::STRUCT, 4);
+ $xfer += $output->writeFieldBegin('scpDataMovement', TType::STRUCT, 5);
$xfer += $this->scpDataMovement->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -39429,7 +39483,11 @@ class Airavata_addUnicoreDataMovementDetails_args {
/**
* @var string
*/
- public $computeResourceId = null;
+ public $resourceId = null;
+ /**
+ * @var int
+ */
+ public $dataMoveType = null;
/**
* @var int
*/
@@ -39448,14 +39506,18 @@ class Airavata_addUnicoreDataMovementDetails_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'computeResourceId',
+ 'var' => 'resourceId',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'priorityOrder',
+ 'var' => 'dataMoveType',
'type' => TType::I32,
),
4 => array(
+ 'var' => 'priorityOrder',
+ 'type' => TType::I32,
+ ),
+ 5 => array(
'var' => 'unicoreDataMovement',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
@@ -39466,8 +39528,11 @@ class Airavata_addUnicoreDataMovementDetails_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['computeResourceId'])) {
- $this->computeResourceId = $vals['computeResourceId'];
+ if (isset($vals['resourceId'])) {
+ $this->resourceId = $vals['resourceId'];
+ }
+ if (isset($vals['dataMoveType'])) {
+ $this->dataMoveType = $vals['dataMoveType'];
}
if (isset($vals['priorityOrder'])) {
$this->priorityOrder = $vals['priorityOrder'];
@@ -39507,19 +39572,26 @@ class Airavata_addUnicoreDataMovementDetails_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->computeResourceId);
+ $xfer += $input->readString($this->resourceId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->priorityOrder);
+ $xfer += $input->readI32($this->dataMoveType);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->priorityOrder);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
if ($ftype == TType::STRUCT) {
$this->unicoreDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
$xfer += $this->unicoreDataMovement->read($input);
@@ -39548,13 +39620,18 @@ class Airavata_addUnicoreDataMovementDetails_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->computeResourceId !== null) {
- $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->computeResourceId);
+ if ($this->resourceId !== null) {
+ $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+ $xfer += $output->writeString($this->resourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->dataMoveType !== null) {
+ $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 3);
+ $xfer += $output->writeI32($this->dataMoveType);
$xfer += $output->writeFieldEnd();
}
if ($this->priorityOrder !== null) {
- $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
+ $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 4);
$xfer += $output->writeI32($this->priorityOrder);
$xfer += $output->writeFieldEnd();
}
@@ -39562,7 +39639,7 @@ class Airavata_addUnicoreDataMovementDetails_args {
if (!is_object($this->unicoreDataMovement)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('unicoreDataMovement', TType::STRUCT, 4);
+ $xfer += $output->writeFieldBegin('unicoreDataMovement', TType::STRUCT, 5);
$xfer += $this->unicoreDataMovement->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -40347,7 +40424,11 @@ class Airavata_addGridFTPDataMovementDetails_args {
/**
* @var string
*/
- public $computeResourceId = null;
+ public $resourceId = null;
+ /**
+ * @var int
+ */
+ public $dataMoveType = null;
/**
* @var int
*/
@@ -40366,14 +40447,18 @@ class Airavata_addGridFTPDataMovementDetails_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'computeResourceId',
+ 'var' => 'resourceId',
'type' => TType::STRING,
),
3 => array(
- 'var' => 'priorityOrder',
+ 'var' => 'dataMoveType',
'type' => TType::I32,
),
4 => array(
+ 'var' => 'priorityOrder',
+ 'type' => TType::I32,
+ ),
+ 5 => array(
'var' => 'gridFTPDataMovement',
'type' => TType::STRUCT,
'class' => '\Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement',
@@ -40384,8 +40469,11 @@ class Airavata_addGridFTPDataMovementDetails_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['computeResourceId'])) {
- $this->computeResourceId = $vals['computeResourceId'];
+ if (isset($vals['resourceId'])) {
+ $this->resourceId = $vals['resourceId'];
+ }
+ if (isset($vals['dataMoveType'])) {
+ $this->dataMoveType = $vals['dataMoveType'];
}
if (isset($vals['priorityOrder'])) {
$this->priorityOrder = $vals['priorityOrder'];
@@ -40425,19 +40513,26 @@ class Airavata_addGridFTPDataMovementDetails_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->computeResourceId);
+ $xfer += $input->readString($this->resourceId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 3:
if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->priorityOrder);
+ $xfer += $input->readI32($this->dataMoveType);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->priorityOrder);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 5:
if ($ftype == TType::STRUCT) {
$this->gridFTPDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement();
$xfer += $this->gridFTPDataMovement->read($input);
@@ -40466,13 +40561,18 @@ class Airavata_addGridFTPDataMovementDetails_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->computeResourceId !== null) {
- $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->computeResourceId);
+ if ($this->resourceId !== null) {
+ $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
+ $xfer += $output->writeString($this->resourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->dataMoveType !== null) {
+ $xfer += $output->writeFieldBegin('dataMoveType', TType::I32, 3);
+ $xfer += $output->writeI32($this->dataMoveType);
$xfer += $output->writeFieldEnd();
}
if ($this->priorityOrder !== null) {
- $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 3);
+ $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 4);
$xfer += $output->writeI32($this->priorityOrder);
$xfer += $output->writeFieldEnd();
}
@@ -40480,7 +40580,7 @@ class Airavata_addGridFTPDataMovementDetails_args {
if (!is_object($this->gridFTPDataMovement)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('gridFTPDataMovement', TType::STRUCT, 4);
+ $xfer += $output->writeFieldBegin('gridFTPDataMovement', TType::STRUCT, 5);
$xfer += $this->gridFTPDataMovement->write($output);
$xfer += $output->writeFieldEnd();
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/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 e2d2461..12a4ac0 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
@@ -213,6 +213,15 @@ 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
*
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index 42dbfd2..77c1e7e 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -109,16 +109,16 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool updateSSHJobSubmissionDetails(AuthzToken authzToken, string jobSubmissionInterfaceId, SSHJobSubmission sshJobSubmission)')
print(' bool updateCloudJobSubmissionDetails(AuthzToken authzToken, string jobSubmissionInterfaceId, CloudJobSubmission sshJobSubmission)')
print(' bool updateUnicoreJobSubmissionDetails(AuthzToken authzToken, string jobSubmissionInterfaceId, UnicoreJobSubmission unicoreJobSubmission)')
- print(' string addLocalDataMovementDetails(AuthzToken authzToken, string computeResourceId, i32 priorityOrder, LOCALDataMovement localDataMovement)')
+ print(' string addLocalDataMovementDetails(AuthzToken authzToken, string resourceId, DMType dataMoveType, i32 priorityOrder, LOCALDataMovement localDataMovement)')
print(' bool updateLocalDataMovementDetails(AuthzToken authzToken, string dataMovementInterfaceId, LOCALDataMovement localDataMovement)')
print(' LOCALDataMovement getLocalDataMovement(AuthzToken authzToken, string dataMovementId)')
- print(' string addSCPDataMovementDetails(AuthzToken authzToken, string computeResourceId, i32 priorityOrder, SCPDataMovement scpDataMovement)')
+ print(' string addSCPDataMovementDetails(AuthzToken authzToken, string resourceId, DMType dataMoveType, i32 priorityOrder, SCPDataMovement scpDataMovement)')
print(' bool updateSCPDataMovementDetails(AuthzToken authzToken, string dataMovementInterfaceId, SCPDataMovement scpDataMovement)')
print(' SCPDataMovement getSCPDataMovement(AuthzToken authzToken, string dataMovementId)')
- print(' string addUnicoreDataMovementDetails(AuthzToken authzToken, string computeResourceId, i32 priorityOrder, UnicoreDataMovement unicoreDataMovement)')
+ print(' string addUnicoreDataMovementDetails(AuthzToken authzToken, string resourceId, DMType dataMoveType, i32 priorityOrder, UnicoreDataMovement unicoreDataMovement)')
print(' bool updateUnicoreDataMovementDetails(AuthzToken authzToken, string dataMovementInterfaceId, UnicoreDataMovement unicoreDataMovement)')
print(' UnicoreDataMovement getUnicoreDataMovement(AuthzToken authzToken, string dataMovementId)')
- print(' string addGridFTPDataMovementDetails(AuthzToken authzToken, string computeResourceId, i32 priorityOrder, GridFTPDataMovement gridFTPDataMovement)')
+ print(' string addGridFTPDataMovementDetails(AuthzToken authzToken, string resourceId, DMType dataMoveType, i32 priorityOrder, GridFTPDataMovement gridFTPDataMovement)')
print(' bool updateGridFTPDataMovementDetails(AuthzToken authzToken, string dataMovementInterfaceId, GridFTPDataMovement gridFTPDataMovement)')
print(' GridFTPDataMovement getGridFTPDataMovement(AuthzToken authzToken, string dataMovementId)')
print(' bool changeJobSubmissionPriority(AuthzToken authzToken, string jobSubmissionInterfaceId, i32 newPriorityOrder)')
@@ -721,10 +721,10 @@ elif cmd == 'updateUnicoreJobSubmissionDetails':
pp.pprint(client.updateUnicoreJobSubmissionDetails(eval(args[0]),args[1],eval(args[2]),))
elif cmd == 'addLocalDataMovementDetails':
- if len(args) != 4:
- print('addLocalDataMovementDetails requires 4 args')
+ if len(args) != 5:
+ print('addLocalDataMovementDetails requires 5 args')
sys.exit(1)
- pp.pprint(client.addLocalDataMovementDetails(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+ pp.pprint(client.addLocalDataMovementDetails(eval(args[0]),args[1],eval(args[2]),eval(args[3]),eval(args[4]),))
elif cmd == 'updateLocalDataMovementDetails':
if len(args) != 3:
@@ -739,10 +739,10 @@ elif cmd == 'getLocalDataMovement':
pp.pprint(client.getLocalDataMovement(eval(args[0]),args[1],))
elif cmd == 'addSCPDataMovementDetails':
- if len(args) != 4:
- print('addSCPDataMovementDetails requires 4 args')
+ if len(args) != 5:
+ print('addSCPDataMovementDetails requires 5 args')
sys.exit(1)
- pp.pprint(client.addSCPDataMovementDetails(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+ pp.pprint(client.addSCPDataMovementDetails(eval(args[0]),args[1],eval(args[2]),eval(args[3]),eval(args[4]),))
elif cmd == 'updateSCPDataMovementDetails':
if len(args) != 3:
@@ -757,10 +757,10 @@ elif cmd == 'getSCPDataMovement':
pp.pprint(client.getSCPDataMovement(eval(args[0]),args[1],))
elif cmd == 'addUnicoreDataMovementDetails':
- if len(args) != 4:
- print('addUnicoreDataMovementDetails requires 4 args')
+ if len(args) != 5:
+ print('addUnicoreDataMovementDetails requires 5 args')
sys.exit(1)
- pp.pprint(client.addUnicoreDataMovementDetails(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+ pp.pprint(client.addUnicoreDataMovementDetails(eval(args[0]),args[1],eval(args[2]),eval(args[3]),eval(args[4]),))
elif cmd == 'updateUnicoreDataMovementDetails':
if len(args) != 3:
@@ -775,10 +775,10 @@ elif cmd == 'getUnicoreDataMovement':
pp.pprint(client.getUnicoreDataMovement(eval(args[0]),args[1],))
elif cmd == 'addGridFTPDataMovementDetails':
- if len(args) != 4:
- print('addGridFTPDataMovementDetails requires 4 args')
+ if len(args) != 5:
+ print('addGridFTPDataMovementDetails requires 5 args')
sys.exit(1)
- pp.pprint(client.addGridFTPDataMovementDetails(eval(args[0]),args[1],eval(args[2]),eval(args[3]),))
+ pp.pprint(client.addGridFTPDataMovementDetails(eval(args[0]),args[1],eval(args[2]),eval(args[3]),eval(args[4]),))
elif cmd == 'updateGridFTPDataMovementDetails':
if len(args) != 3:
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index 080a6b7..45aaccf 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -1625,7 +1625,7 @@ class Iface:
"""
pass
- def addLocalDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, localDataMovement):
+ def addLocalDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement):
"""
Add a Local data movement details to a compute resource
App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -1645,7 +1645,8 @@ class Iface:
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- localDataMovement
"""
@@ -1686,7 +1687,7 @@ class Iface:
"""
pass
- def addSCPDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, scpDataMovement):
+ def addSCPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement):
"""
Add a SCP data movement details to a compute resource
App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -1706,7 +1707,8 @@ class Iface:
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- scpDataMovement
"""
@@ -1748,11 +1750,12 @@ class Iface:
"""
pass
- def addUnicoreDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, unicoreDataMovement):
+ def addUnicoreDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement):
"""
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- unicoreDataMovement
"""
@@ -1775,7 +1778,7 @@ class Iface:
"""
pass
- def addGridFTPDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, gridFTPDataMovement):
+ def addGridFTPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement):
"""
Add a GridFTP data movement details to a compute resource
App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -1795,7 +1798,8 @@ class Iface:
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- gridFTPDataMovement
"""
@@ -6782,7 +6786,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "updateUnicoreJobSubmissionDetails failed: unknown result");
- def addLocalDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, localDataMovement):
+ def addLocalDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement):
"""
Add a Local data movement details to a compute resource
App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -6802,18 +6806,20 @@ class Client(Iface):
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- localDataMovement
"""
- self.send_addLocalDataMovementDetails(authzToken, computeResourceId, priorityOrder, localDataMovement)
+ self.send_addLocalDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement)
return self.recv_addLocalDataMovementDetails()
- def send_addLocalDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, localDataMovement):
+ def send_addLocalDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement):
self._oprot.writeMessageBegin('addLocalDataMovementDetails', TMessageType.CALL, self._seqid)
args = addLocalDataMovementDetails_args()
args.authzToken = authzToken
- args.computeResourceId = computeResourceId
+ args.resourceId = resourceId
+ args.dataMoveType = dataMoveType
args.priorityOrder = priorityOrder
args.localDataMovement = localDataMovement
args.write(self._oprot)
@@ -6945,7 +6951,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getLocalDataMovement failed: unknown result");
- def addSCPDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, scpDataMovement):
+ def addSCPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement):
"""
Add a SCP data movement details to a compute resource
App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -6965,18 +6971,20 @@ class Client(Iface):
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- scpDataMovement
"""
- self.send_addSCPDataMovementDetails(authzToken, computeResourceId, priorityOrder, scpDataMovement)
+ self.send_addSCPDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement)
return self.recv_addSCPDataMovementDetails()
- def send_addSCPDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, scpDataMovement):
+ def send_addSCPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement):
self._oprot.writeMessageBegin('addSCPDataMovementDetails', TMessageType.CALL, self._seqid)
args = addSCPDataMovementDetails_args()
args.authzToken = authzToken
- args.computeResourceId = computeResourceId
+ args.resourceId = resourceId
+ args.dataMoveType = dataMoveType
args.priorityOrder = priorityOrder
args.scpDataMovement = scpDataMovement
args.write(self._oprot)
@@ -7109,22 +7117,24 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getSCPDataMovement failed: unknown result");
- def addUnicoreDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, unicoreDataMovement):
+ def addUnicoreDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement):
"""
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- unicoreDataMovement
"""
- self.send_addUnicoreDataMovementDetails(authzToken, computeResourceId, priorityOrder, unicoreDataMovement)
+ self.send_addUnicoreDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement)
return self.recv_addUnicoreDataMovementDetails()
- def send_addUnicoreDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, unicoreDataMovement):
+ def send_addUnicoreDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement):
self._oprot.writeMessageBegin('addUnicoreDataMovementDetails', TMessageType.CALL, self._seqid)
args = addUnicoreDataMovementDetails_args()
args.authzToken = authzToken
- args.computeResourceId = computeResourceId
+ args.resourceId = resourceId
+ args.dataMoveType = dataMoveType
args.priorityOrder = priorityOrder
args.unicoreDataMovement = unicoreDataMovement
args.write(self._oprot)
@@ -7238,7 +7248,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getUnicoreDataMovement failed: unknown result");
- def addGridFTPDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, gridFTPDataMovement):
+ def addGridFTPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement):
"""
Add a GridFTP data movement details to a compute resource
App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -7258,18 +7268,20 @@ class Client(Iface):
Parameters:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- gridFTPDataMovement
"""
- self.send_addGridFTPDataMovementDetails(authzToken, computeResourceId, priorityOrder, gridFTPDataMovement)
+ self.send_addGridFTPDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement)
return self.recv_addGridFTPDataMovementDetails()
- def send_addGridFTPDataMovementDetails(self, authzToken, computeResourceId, priorityOrder, gridFTPDataMovement):
+ def send_addGridFTPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement):
self._oprot.writeMessageBegin('addGridFTPDataMovementDetails', TMessageType.CALL, self._seqid)
args = addGridFTPDataMovementDetails_args()
args.authzToken = authzToken
- args.computeResourceId = computeResourceId
+ args.resourceId = resourceId
+ args.dataMoveType = dataMoveType
args.priorityOrder = priorityOrder
args.gridFTPDataMovement = gridFTPDataMovement
args.write(self._oprot)
@@ -10830,7 +10842,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = addLocalDataMovementDetails_result()
try:
- result.success = self._handler.addLocalDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.localDataMovement)
+ result.success = self._handler.addLocalDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.localDataMovement)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -10890,7 +10902,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = addSCPDataMovementDetails_result()
try:
- result.success = self._handler.addSCPDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.scpDataMovement)
+ result.success = self._handler.addSCPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.scpDataMovement)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -10950,7 +10962,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = addUnicoreDataMovementDetails_result()
try:
- result.success = self._handler.addUnicoreDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.unicoreDataMovement)
+ result.success = self._handler.addUnicoreDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11010,7 +11022,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = addGridFTPDataMovementDetails_result()
try:
- result.success = self._handler.addGridFTPDataMovementDetails(args.authzToken, args.computeResourceId, args.priorityOrder, args.gridFTPDataMovement)
+ result.success = self._handler.addGridFTPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -30386,7 +30398,8 @@ class addLocalDataMovementDetails_args:
"""
Attributes:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- localDataMovement
"""
@@ -30394,14 +30407,16 @@ class addLocalDataMovementDetails_args:
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'computeResourceId', None, None, ), # 2
- (3, TType.I32, 'priorityOrder', None, None, ), # 3
- (4, TType.STRUCT, 'localDataMovement', (apache.airavata.model.appcatalog.computeresource.ttypes.LOCALDataMovement, apache.airavata.model.appcatalog.computeresource.ttypes.LOCALDataMovement.thrift_spec), None, ), # 4
+ (2, TType.STRING, 'resourceId', None, None, ), # 2
+ (3, TType.I32, 'dataMoveType', None, None, ), # 3
+ (4, TType.I32, 'priorityOrder', None, None, ), # 4
+ (5, TType.STRUCT, 'localDataMovement', (apache.airavata.model.appcatalog.computeresource.ttypes.LOCALDataMovement, apache.airavata.model.appcatalog.computeresource.ttypes.LOCALDataMovement.thrift_spec), None, ), # 5
)
- def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, localDataMovement=None,):
+ def __init__(self, authzToken=None, resourceId=None, dataMoveType=None, priorityOrder=None, localDataMovement=None,):
self.authzToken = authzToken
- self.computeResourceId = computeResourceId
+ self.resourceId = resourceId
+ self.dataMoveType = dataMoveType
self.priorityOrder = priorityOrder
self.localDataMovement = localDataMovement
@@ -30422,15 +30437,20 @@ class addLocalDataMovementDetails_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.computeResourceId = iprot.readString();
+ self.resourceId = iprot.readString();
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.I32:
- self.priorityOrder = iprot.readI32();
+ self.dataMoveType = iprot.readI32();
else:
iprot.skip(ftype)
elif fid == 4:
+ if ftype == TType.I32:
+ self.priorityOrder = iprot.readI32();
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
if ftype == TType.STRUCT:
self.localDataMovement = apache.airavata.model.appcatalog.computeresource.ttypes.LOCALDataMovement()
self.localDataMovement.read(iprot)
@@ -30450,16 +30470,20 @@ class addLocalDataMovementDetails_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.computeResourceId is not None:
- oprot.writeFieldBegin('computeResourceId', TType.STRING, 2)
- oprot.writeString(self.computeResourceId)
+ if self.resourceId is not None:
+ oprot.writeFieldBegin('resourceId', TType.STRING, 2)
+ oprot.writeString(self.resourceId)
+ oprot.writeFieldEnd()
+ if self.dataMoveType is not None:
+ oprot.writeFieldBegin('dataMoveType', TType.I32, 3)
+ oprot.writeI32(self.dataMoveType)
oprot.writeFieldEnd()
if self.priorityOrder is not None:
- oprot.writeFieldBegin('priorityOrder', TType.I32, 3)
+ oprot.writeFieldBegin('priorityOrder', TType.I32, 4)
oprot.writeI32(self.priorityOrder)
oprot.writeFieldEnd()
if self.localDataMovement is not None:
- oprot.writeFieldBegin('localDataMovement', TType.STRUCT, 4)
+ oprot.writeFieldBegin('localDataMovement', TType.STRUCT, 5)
self.localDataMovement.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -30468,8 +30492,10 @@ class addLocalDataMovementDetails_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.computeResourceId is None:
- raise TProtocol.TProtocolException(message='Required field computeResourceId is unset!')
+ if self.resourceId is None:
+ raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.dataMoveType is None:
+ raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
if self.priorityOrder is None:
raise TProtocol.TProtocolException(message='Required field priorityOrder is unset!')
if self.localDataMovement is None:
@@ -30480,7 +30506,8 @@ class addLocalDataMovementDetails_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.computeResourceId)
+ value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.dataMoveType)
value = (value * 31) ^ hash(self.priorityOrder)
value = (value * 31) ^ hash(self.localDataMovement)
return value
@@ -31043,7 +31070,8 @@ class addSCPDataMovementDetails_args:
"""
Attributes:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- scpDataMovement
"""
@@ -31051,14 +31079,16 @@ class addSCPDataMovementDetails_args:
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'computeResourceId', None, None, ), # 2
- (3, TType.I32, 'priorityOrder', None, None, ), # 3
- (4, TType.STRUCT, 'scpDataMovement', (apache.airavata.model.appcatalog.computeresource.ttypes.SCPDataMovement, apache.airavata.model.appcatalog.computeresource.ttypes.SCPDataMovement.thrift_spec), None, ), # 4
+ (2, TType.STRING, 'resourceId', None, None, ), # 2
+ (3, TType.I32, 'dataMoveType', None, None, ), # 3
+ (4, TType.I32, 'priorityOrder', None, None, ), # 4
+ (5, TType.STRUCT, 'scpDataMovement', (apache.airavata.model.appcatalog.computeresource.ttypes.SCPDataMovement, apache.airavata.model.appcatalog.computeresource.ttypes.SCPDataMovement.thrift_spec), None, ), # 5
)
- def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, scpDataMovement=None,):
+ def __init__(self, authzToken=None, resourceId=None, dataMoveType=None, priorityOrder=None, scpDataMovement=None,):
self.authzToken = authzToken
- self.computeResourceId = computeResourceId
+ self.resourceId = resourceId
+ self.dataMoveType = dataMoveType
self.priorityOrder = priorityOrder
self.scpDataMovement = scpDataMovement
@@ -31079,15 +31109,20 @@ class addSCPDataMovementDetails_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.computeResourceId = iprot.readString();
+ self.resourceId = iprot.readString();
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.I32:
- self.priorityOrder = iprot.readI32();
+ self.dataMoveType = iprot.readI32();
else:
iprot.skip(ftype)
elif fid == 4:
+ if ftype == TType.I32:
+ self.priorityOrder = iprot.readI32();
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
if ftype == TType.STRUCT:
self.scpDataMovement = apache.airavata.model.appcatalog.computeresource.ttypes.SCPDataMovement()
self.scpDataMovement.read(iprot)
@@ -31107,16 +31142,20 @@ class addSCPDataMovementDetails_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.computeResourceId is not None:
- oprot.writeFieldBegin('computeResourceId', TType.STRING, 2)
- oprot.writeString(self.computeResourceId)
+ if self.resourceId is not None:
+ oprot.writeFieldBegin('resourceId', TType.STRING, 2)
+ oprot.writeString(self.resourceId)
+ oprot.writeFieldEnd()
+ if self.dataMoveType is not None:
+ oprot.writeFieldBegin('dataMoveType', TType.I32, 3)
+ oprot.writeI32(self.dataMoveType)
oprot.writeFieldEnd()
if self.priorityOrder is not None:
- oprot.writeFieldBegin('priorityOrder', TType.I32, 3)
+ oprot.writeFieldBegin('priorityOrder', TType.I32, 4)
oprot.writeI32(self.priorityOrder)
oprot.writeFieldEnd()
if self.scpDataMovement is not None:
- oprot.writeFieldBegin('scpDataMovement', TType.STRUCT, 4)
+ oprot.writeFieldBegin('scpDataMovement', TType.STRUCT, 5)
self.scpDataMovement.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -31125,8 +31164,10 @@ class addSCPDataMovementDetails_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.computeResourceId is None:
- raise TProtocol.TProtocolException(message='Required field computeResourceId is unset!')
+ if self.resourceId is None:
+ raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.dataMoveType is None:
+ raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
if self.priorityOrder is None:
raise TProtocol.TProtocolException(message='Required field priorityOrder is unset!')
if self.scpDataMovement is None:
@@ -31137,7 +31178,8 @@ class addSCPDataMovementDetails_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.computeResourceId)
+ value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.dataMoveType)
value = (value * 31) ^ hash(self.priorityOrder)
value = (value * 31) ^ hash(self.scpDataMovement)
return value
@@ -31700,7 +31742,8 @@ class addUnicoreDataMovementDetails_args:
"""
Attributes:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- unicoreDataMovement
"""
@@ -31708,14 +31751,16 @@ class addUnicoreDataMovementDetails_args:
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'computeResourceId', None, None, ), # 2
- (3, TType.I32, 'priorityOrder', None, None, ), # 3
- (4, TType.STRUCT, 'unicoreDataMovement', (apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreDataMovement, apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreDataMovement.thrift_spec), None, ), # 4
+ (2, TType.STRING, 'resourceId', None, None, ), # 2
+ (3, TType.I32, 'dataMoveType', None, None, ), # 3
+ (4, TType.I32, 'priorityOrder', None, None, ), # 4
+ (5, TType.STRUCT, 'unicoreDataMovement', (apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreDataMovement, apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreDataMovement.thrift_spec), None, ), # 5
)
- def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, unicoreDataMovement=None,):
+ def __init__(self, authzToken=None, resourceId=None, dataMoveType=None, priorityOrder=None, unicoreDataMovement=None,):
self.authzToken = authzToken
- self.computeResourceId = computeResourceId
+ self.resourceId = resourceId
+ self.dataMoveType = dataMoveType
self.priorityOrder = priorityOrder
self.unicoreDataMovement = unicoreDataMovement
@@ -31736,15 +31781,20 @@ class addUnicoreDataMovementDetails_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.computeResourceId = iprot.readString();
+ self.resourceId = iprot.readString();
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.I32:
- self.priorityOrder = iprot.readI32();
+ self.dataMoveType = iprot.readI32();
else:
iprot.skip(ftype)
elif fid == 4:
+ if ftype == TType.I32:
+ self.priorityOrder = iprot.readI32();
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
if ftype == TType.STRUCT:
self.unicoreDataMovement = apache.airavata.model.appcatalog.computeresource.ttypes.UnicoreDataMovement()
self.unicoreDataMovement.read(iprot)
@@ -31764,16 +31814,20 @@ class addUnicoreDataMovementDetails_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.computeResourceId is not None:
- oprot.writeFieldBegin('computeResourceId', TType.STRING, 2)
- oprot.writeString(self.computeResourceId)
+ if self.resourceId is not None:
+ oprot.writeFieldBegin('resourceId', TType.STRING, 2)
+ oprot.writeString(self.resourceId)
+ oprot.writeFieldEnd()
+ if self.dataMoveType is not None:
+ oprot.writeFieldBegin('dataMoveType', TType.I32, 3)
+ oprot.writeI32(self.dataMoveType)
oprot.writeFieldEnd()
if self.priorityOrder is not None:
- oprot.writeFieldBegin('priorityOrder', TType.I32, 3)
+ oprot.writeFieldBegin('priorityOrder', TType.I32, 4)
oprot.writeI32(self.priorityOrder)
oprot.writeFieldEnd()
if self.unicoreDataMovement is not None:
- oprot.writeFieldBegin('unicoreDataMovement', TType.STRUCT, 4)
+ oprot.writeFieldBegin('unicoreDataMovement', TType.STRUCT, 5)
self.unicoreDataMovement.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -31782,8 +31836,10 @@ class addUnicoreDataMovementDetails_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.computeResourceId is None:
- raise TProtocol.TProtocolException(message='Required field computeResourceId is unset!')
+ if self.resourceId is None:
+ raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.dataMoveType is None:
+ raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
if self.priorityOrder is None:
raise TProtocol.TProtocolException(message='Required field priorityOrder is unset!')
if self.unicoreDataMovement is None:
@@ -31794,7 +31850,8 @@ class addUnicoreDataMovementDetails_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.computeResourceId)
+ value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.dataMoveType)
value = (value * 31) ^ hash(self.priorityOrder)
value = (value * 31) ^ hash(self.unicoreDataMovement)
return value
@@ -32357,7 +32414,8 @@ class addGridFTPDataMovementDetails_args:
"""
Attributes:
- authzToken
- - computeResourceId
+ - resourceId
+ - dataMoveType
- priorityOrder
- gridFTPDataMovement
"""
@@ -32365,14 +32423,16 @@ class addGridFTPDataMovementDetails_args:
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
- (2, TType.STRING, 'computeResourceId', None, None, ), # 2
- (3, TType.I32, 'priorityOrder', None, None, ), # 3
- (4, TType.STRUCT, 'gridFTPDataMovement', (apache.airavata.model.appcatalog.computeresource.ttypes.GridFTPDataMovement, apache.airavata.model.appcatalog.computeresource.ttypes.GridFTPDataMovement.thrift_spec), None, ), # 4
+ (2, TType.STRING, 'resourceId', None, None, ), # 2
+ (3, TType.I32, 'dataMoveType', None, None, ), # 3
+ (4, TType.I32, 'priorityOrder', None, None, ), # 4
+ (5, TType.STRUCT, 'gridFTPDataMovement', (apache.airavata.model.appcatalog.computeresource.ttypes.GridFTPDataMovement, apache.airavata.model.appcatalog.computeresource.ttypes.GridFTPDataMovement.thrift_spec), None, ), # 5
)
- def __init__(self, authzToken=None, computeResourceId=None, priorityOrder=None, gridFTPDataMovement=None,):
+ def __init__(self, authzToken=None, resourceId=None, dataMoveType=None, priorityOrder=None, gridFTPDataMovement=None,):
self.authzToken = authzToken
- self.computeResourceId = computeResourceId
+ self.resourceId = resourceId
+ self.dataMoveType = dataMoveType
self.priorityOrder = priorityOrder
self.gridFTPDataMovement = gridFTPDataMovement
@@ -32393,15 +32453,20 @@ class addGridFTPDataMovementDetails_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.computeResourceId = iprot.readString();
+ self.resourceId = iprot.readString();
else:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.I32:
- self.priorityOrder = iprot.readI32();
+ self.dataMoveType = iprot.readI32();
else:
iprot.skip(ftype)
elif fid == 4:
+ if ftype == TType.I32:
+ self.priorityOrder = iprot.readI32();
+ else:
+ iprot.skip(ftype)
+ elif fid == 5:
if ftype == TType.STRUCT:
self.gridFTPDataMovement = apache.airavata.model.appcatalog.computeresource.ttypes.GridFTPDataMovement()
self.gridFTPDataMovement.read(iprot)
@@ -32421,16 +32486,20 @@ class addGridFTPDataMovementDetails_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.computeResourceId is not None:
- oprot.writeFieldBegin('computeResourceId', TType.STRING, 2)
- oprot.writeString(self.computeResourceId)
+ if self.resourceId is not None:
+ oprot.writeFieldBegin('resourceId', TType.STRING, 2)
+ oprot.writeString(self.resourceId)
+ oprot.writeFieldEnd()
+ if self.dataMoveType is not None:
+ oprot.writeFieldBegin('dataMoveType', TType.I32, 3)
+ oprot.writeI32(self.dataMoveType)
oprot.writeFieldEnd()
if self.priorityOrder is not None:
- oprot.writeFieldBegin('priorityOrder', TType.I32, 3)
+ oprot.writeFieldBegin('priorityOrder', TType.I32, 4)
oprot.writeI32(self.priorityOrder)
oprot.writeFieldEnd()
if self.gridFTPDataMovement is not None:
- oprot.writeFieldBegin('gridFTPDataMovement', TType.STRUCT, 4)
+ oprot.writeFieldBegin('gridFTPDataMovement', TType.STRUCT, 5)
self.gridFTPDataMovement.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -32439,8 +32508,10 @@ class addGridFTPDataMovementDetails_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.computeResourceId is None:
- raise TProtocol.TProtocolException(message='Required field computeResourceId is unset!')
+ if self.resourceId is None:
+ raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.dataMoveType is None:
+ raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
if self.priorityOrder is None:
raise TProtocol.TProtocolException(message='Required field priorityOrder is unset!')
if self.gridFTPDataMovement is None:
@@ -32451,7 +32522,8 @@ class addGridFTPDataMovementDetails_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.computeResourceId)
+ value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.dataMoveType)
value = (value * 31) ^ hash(self.priorityOrder)
value = (value * 31) ^ hash(self.gridFTPDataMovement)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
index 2842f36..a7019fd 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
@@ -266,6 +266,20 @@ class MonitorMode:
"FORK": 3,
}
+class DMType:
+ COMPUTE_RESOURCE = 0
+ STORAGE_RESOURCE = 1
+
+ _VALUES_TO_NAMES = {
+ 0: "COMPUTE_RESOURCE",
+ 1: "STORAGE_RESOURCE",
+ }
+
+ _NAMES_TO_VALUES = {
+ "COMPUTE_RESOURCE": 0,
+ "STORAGE_RESOURCE": 1,
+ }
+
class DataMovementProtocol:
"""
Enumeration of data movement supported by Airavata
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
index 280f2f3..f0cf0d5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterOGCEUS3Application.java
@@ -284,7 +284,7 @@ public class RegisterOGCEUS3Application {
SCPDataMovement scpDataMovement = new SCPDataMovement();
scpDataMovement.setSecurityProtocol(securityProtocol);
scpDataMovement.setSshPort(portNumber);
- airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, 1, scpDataMovement);
+ airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, DMType.COMPUTE_RESOURCE, 1, scpDataMovement);
return computeResourceId;
}
@@ -313,7 +313,7 @@ public class RegisterOGCEUS3Application {
SCPDataMovement scpDataMovement = new SCPDataMovement();
scpDataMovement.setSecurityProtocol(securityProtocol);
scpDataMovement.setSshPort(portNumber);
- airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, 1, scpDataMovement);
+ airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, DMType.COMPUTE_RESOURCE, 1, scpDataMovement);
return computeResourceId;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index 604f74f..0e22c85 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -1401,7 +1401,7 @@ public class RegisterSampleApplications {
SCPDataMovement scpDataMovement = new SCPDataMovement();
scpDataMovement.setSecurityProtocol(securityProtocol);
scpDataMovement.setSshPort(portNumber);
- airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, 1, scpDataMovement);
+ airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, DMType.COMPUTE_RESOURCE, 1, scpDataMovement);
return computeResourceId;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
index 0bddd58..92dc544 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterUS3Application.java
@@ -282,7 +282,7 @@ public class RegisterUS3Application {
SCPDataMovement scpDataMovement = new SCPDataMovement();
scpDataMovement.setSecurityProtocol(securityProtocol);
scpDataMovement.setSshPort(portNumber);
- airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, 1, scpDataMovement);
+ airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, DMType.COMPUTE_RESOURCE, 1, scpDataMovement);
return computeResourceId;
}
@@ -310,7 +310,7 @@ public class RegisterUS3Application {
SCPDataMovement scpDataMovement = new SCPDataMovement();
scpDataMovement.setSecurityProtocol(securityProtocol);
scpDataMovement.setSshPort(portNumber);
- airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, 1, scpDataMovement);
+ airavataClient.addSCPDataMovementDetails(new AuthzToken(""), computeResourceId, DMType.COMPUTE_RESOURCE, 1, scpDataMovement);
return computeResourceId;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
index f9903b8..fa30e48 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
public class Workflow implements org.apache.thrift.TBase<Workflow, Workflow._Fields>, java.io.Serializable, Cloneable, Comparable<Workflow> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Workflow");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
index 9b9fbc7..85c32a1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
public class ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
index 90720b2..715f32f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
public class ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index c471c3b..370bf6b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/4c0978b6/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
index 6f72b11..fd245c1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-23")
public class SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths");