You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/03/22 19:16:19 UTC
[3/8] airavata git commit: adding logical path to data product
http://git-wip-us.apache.org/repos/asf/airavata/blob/03afa2da/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.h
index 395ceef..4a4c9df 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.h
@@ -71,10 +71,11 @@ class DataProductModel;
class DataReplicaLocationModel;
typedef struct _DataProductModel__isset {
- _DataProductModel__isset() : productId(false), gatewayId(false), parentProductId(false), productName(false), productDescription(false), ownerName(false), dataProductType(false), productSize(false), creationTime(false), lastModifiedTime(false), productMetadata(false), replicaLocations(false), childProducts(false) {}
- bool productId :1;
+ _DataProductModel__isset() : productUri(false), gatewayId(false), parentProductUri(false), logicalPath(false), productName(false), productDescription(false), ownerName(false), dataProductType(false), productSize(false), creationTime(false), lastModifiedTime(false), productMetadata(false), replicaLocations(false), childProducts(false) {}
+ bool productUri :1;
bool gatewayId :1;
- bool parentProductId :1;
+ bool parentProductUri :1;
+ bool logicalPath :1;
bool productName :1;
bool productDescription :1;
bool ownerName :1;
@@ -92,13 +93,14 @@ class DataProductModel {
DataProductModel(const DataProductModel&);
DataProductModel& operator=(const DataProductModel&);
- DataProductModel() : productId(), gatewayId(), parentProductId(), productName(), productDescription(), ownerName(), dataProductType((DataProductType::type)0), productSize(0), creationTime(0), lastModifiedTime(0) {
+ DataProductModel() : productUri(), gatewayId(), parentProductUri(), logicalPath(), productName(), productDescription(), ownerName(), dataProductType((DataProductType::type)0), productSize(0), creationTime(0), lastModifiedTime(0) {
}
virtual ~DataProductModel() throw();
- std::string productId;
+ std::string productUri;
std::string gatewayId;
- std::string parentProductId;
+ std::string parentProductUri;
+ std::string logicalPath;
std::string productName;
std::string productDescription;
std::string ownerName;
@@ -112,11 +114,13 @@ class DataProductModel {
_DataProductModel__isset __isset;
- void __set_productId(const std::string& val);
+ void __set_productUri(const std::string& val);
void __set_gatewayId(const std::string& val);
- void __set_parentProductId(const std::string& val);
+ void __set_parentProductUri(const std::string& val);
+
+ void __set_logicalPath(const std::string& val);
void __set_productName(const std::string& val);
@@ -140,17 +144,21 @@ class DataProductModel {
bool operator == (const DataProductModel & rhs) const
{
- if (__isset.productId != rhs.__isset.productId)
+ if (__isset.productUri != rhs.__isset.productUri)
return false;
- else if (__isset.productId && !(productId == rhs.productId))
+ else if (__isset.productUri && !(productUri == rhs.productUri))
return false;
if (__isset.gatewayId != rhs.__isset.gatewayId)
return false;
else if (__isset.gatewayId && !(gatewayId == rhs.gatewayId))
return false;
- if (__isset.parentProductId != rhs.__isset.parentProductId)
+ if (__isset.parentProductUri != rhs.__isset.parentProductUri)
+ return false;
+ else if (__isset.parentProductUri && !(parentProductUri == rhs.parentProductUri))
+ return false;
+ if (__isset.logicalPath != rhs.__isset.logicalPath)
return false;
- else if (__isset.parentProductId && !(parentProductId == rhs.parentProductId))
+ else if (__isset.logicalPath && !(logicalPath == rhs.logicalPath))
return false;
if (__isset.productName != rhs.__isset.productName)
return false;
@@ -215,9 +223,9 @@ inline std::ostream& operator<<(std::ostream& out, const DataProductModel& obj)
}
typedef struct _DataReplicaLocationModel__isset {
- _DataReplicaLocationModel__isset() : replicaId(false), productId(false), replicaName(false), replicaDescription(false), creationTime(false), lastModifiedTime(false), validUntilTime(false), replicaLocationCategory(false), replicaPersistentType(false), storageResourceId(false), fileAbsolutePath(false), replicaMetadata(false) {}
+ _DataReplicaLocationModel__isset() : replicaId(false), productUri(false), replicaName(false), replicaDescription(false), creationTime(false), lastModifiedTime(false), validUntilTime(false), replicaLocationCategory(false), replicaPersistentType(false), storageResourceId(false), filePath(false), replicaMetadata(false) {}
bool replicaId :1;
- bool productId :1;
+ bool productUri :1;
bool replicaName :1;
bool replicaDescription :1;
bool creationTime :1;
@@ -226,7 +234,7 @@ typedef struct _DataReplicaLocationModel__isset {
bool replicaLocationCategory :1;
bool replicaPersistentType :1;
bool storageResourceId :1;
- bool fileAbsolutePath :1;
+ bool filePath :1;
bool replicaMetadata :1;
} _DataReplicaLocationModel__isset;
@@ -235,12 +243,12 @@ class DataReplicaLocationModel {
DataReplicaLocationModel(const DataReplicaLocationModel&);
DataReplicaLocationModel& operator=(const DataReplicaLocationModel&);
- DataReplicaLocationModel() : replicaId(), productId(), replicaName(), replicaDescription(), creationTime(0), lastModifiedTime(0), validUntilTime(0), replicaLocationCategory((ReplicaLocationCategory::type)0), replicaPersistentType((ReplicaPersistentType::type)0), storageResourceId(), fileAbsolutePath() {
+ DataReplicaLocationModel() : replicaId(), productUri(), replicaName(), replicaDescription(), creationTime(0), lastModifiedTime(0), validUntilTime(0), replicaLocationCategory((ReplicaLocationCategory::type)0), replicaPersistentType((ReplicaPersistentType::type)0), storageResourceId(), filePath() {
}
virtual ~DataReplicaLocationModel() throw();
std::string replicaId;
- std::string productId;
+ std::string productUri;
std::string replicaName;
std::string replicaDescription;
int64_t creationTime;
@@ -249,14 +257,14 @@ class DataReplicaLocationModel {
ReplicaLocationCategory::type replicaLocationCategory;
ReplicaPersistentType::type replicaPersistentType;
std::string storageResourceId;
- std::string fileAbsolutePath;
+ std::string filePath;
std::map<std::string, std::string> replicaMetadata;
_DataReplicaLocationModel__isset __isset;
void __set_replicaId(const std::string& val);
- void __set_productId(const std::string& val);
+ void __set_productUri(const std::string& val);
void __set_replicaName(const std::string& val);
@@ -274,7 +282,7 @@ class DataReplicaLocationModel {
void __set_storageResourceId(const std::string& val);
- void __set_fileAbsolutePath(const std::string& val);
+ void __set_filePath(const std::string& val);
void __set_replicaMetadata(const std::map<std::string, std::string> & val);
@@ -284,9 +292,9 @@ class DataReplicaLocationModel {
return false;
else if (__isset.replicaId && !(replicaId == rhs.replicaId))
return false;
- if (__isset.productId != rhs.__isset.productId)
+ if (__isset.productUri != rhs.__isset.productUri)
return false;
- else if (__isset.productId && !(productId == rhs.productId))
+ else if (__isset.productUri && !(productUri == rhs.productUri))
return false;
if (__isset.replicaName != rhs.__isset.replicaName)
return false;
@@ -320,9 +328,9 @@ class DataReplicaLocationModel {
return false;
else if (__isset.storageResourceId && !(storageResourceId == rhs.storageResourceId))
return false;
- if (__isset.fileAbsolutePath != rhs.__isset.fileAbsolutePath)
+ if (__isset.filePath != rhs.__isset.filePath)
return false;
- else if (__isset.fileAbsolutePath && !(fileAbsolutePath == rhs.fileAbsolutePath))
+ else if (__isset.filePath && !(filePath == rhs.filePath))
return false;
if (__isset.replicaMetadata != rhs.__isset.replicaMetadata)
return false;
http://git-wip-us.apache.org/repos/asf/airavata/blob/03afa2da/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 a834980..b450fa1 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
@@ -2413,7 +2413,7 @@ interface AiravataIf {
* Add a Local data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
*
- * @param resourceId
+ * @param productId
* The identifier of the compute resource to which JobSubmission protocol to be added
*
* @param DMType
@@ -2431,7 +2431,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productId
* @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement
@@ -2441,7 +2441,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
+ public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement);
/**
*
* Update the given Local data movement details
@@ -2499,7 +2499,7 @@ interface AiravataIf {
* Add a SCP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
*
- * @param resourceId
+ * @param productId
* The identifier of the compute resource to which JobSubmission protocol to be added
*
* @param priorityOrder
@@ -2513,7 +2513,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productId
* @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement
@@ -2523,7 +2523,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
+ public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement);
/**
*
* Update the given scp data movement details
@@ -2580,7 +2580,7 @@ interface AiravataIf {
* Add a UNICORE data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
*
- * @param resourceId
+ * @param productId
* The identifier of the compute resource to which data movement protocol to be added
*
* @param priorityOrder
@@ -2594,7 +2594,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productId
* @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement
@@ -2604,7 +2604,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
+ public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement);
/**
*
* Update a selected UNICORE data movement details
@@ -2660,7 +2660,7 @@ interface AiravataIf {
* Add a GridFTP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
*
- * @param resourceId
+ * @param productId
* The identifier of the compute resource to which dataMovement protocol to be added
*
* @param DMType
@@ -2678,7 +2678,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productId
* @param int $dataMoveType
* @param int $priorityOrder
* @param \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement
@@ -2688,7 +2688,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
+ public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement);
/**
* Update the given GridFTP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -2860,7 +2860,7 @@ interface AiravataIf {
*
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
- * @param string $resourceId
+ * @param string $productId
* @param string $dataMovementInterfaceId
* @param int $dataMoveType
* @return bool
@@ -2869,7 +2869,7 @@ interface AiravataIf {
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType);
+ public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMovementInterfaceId, $dataMoveType);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager $resourceJobManager
@@ -9201,17 +9201,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("updateUnicoreJobSubmissionDetails failed: unknown result");
}
- public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
+ public function addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
{
- $this->send_addLocalDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $localDataMovement);
+ $this->send_addLocalDataMovementDetails($authzToken, $productId, $dataMoveType, $priorityOrder, $localDataMovement);
return $this->recv_addLocalDataMovementDetails();
}
- public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
+ public function send_addLocalDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\LOCALDataMovement $localDataMovement)
{
$args = new \Airavata\API\Airavata_addLocalDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productId = $productId;
$args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->localDataMovement = $localDataMovement;
@@ -9397,17 +9397,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getLocalDataMovement failed: unknown result");
}
- public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
+ public function addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
{
- $this->send_addSCPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $scpDataMovement);
+ $this->send_addSCPDataMovementDetails($authzToken, $productId, $dataMoveType, $priorityOrder, $scpDataMovement);
return $this->recv_addSCPDataMovementDetails();
}
- public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
+ public function send_addSCPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\SCPDataMovement $scpDataMovement)
{
$args = new \Airavata\API\Airavata_addSCPDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productId = $productId;
$args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->scpDataMovement = $scpDataMovement;
@@ -9593,17 +9593,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getSCPDataMovement failed: unknown result");
}
- public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
+ public function addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
{
- $this->send_addUnicoreDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $unicoreDataMovement);
+ $this->send_addUnicoreDataMovementDetails($authzToken, $productId, $dataMoveType, $priorityOrder, $unicoreDataMovement);
return $this->recv_addUnicoreDataMovementDetails();
}
- public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
+ public function send_addUnicoreDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\UnicoreDataMovement $unicoreDataMovement)
{
$args = new \Airavata\API\Airavata_addUnicoreDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productId = $productId;
$args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->unicoreDataMovement = $unicoreDataMovement;
@@ -9789,17 +9789,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getUnicoreDataMovement failed: unknown result");
}
- public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
+ public function addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
{
- $this->send_addGridFTPDataMovementDetails($authzToken, $resourceId, $dataMoveType, $priorityOrder, $gridFTPDataMovement);
+ $this->send_addGridFTPDataMovementDetails($authzToken, $productId, $dataMoveType, $priorityOrder, $gridFTPDataMovement);
return $this->recv_addGridFTPDataMovementDetails();
}
- public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
+ public function send_addGridFTPDataMovementDetails(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMoveType, $priorityOrder, \Airavata\Model\Data\Movement\GridFTPDataMovement $gridFTPDataMovement)
{
$args = new \Airavata\API\Airavata_addGridFTPDataMovementDetails_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productId = $productId;
$args->dataMoveType = $dataMoveType;
$args->priorityOrder = $priorityOrder;
$args->gridFTPDataMovement = $gridFTPDataMovement;
@@ -10308,17 +10308,17 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("deleteJobSubmissionInterface failed: unknown result");
}
- public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType)
+ public function deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMovementInterfaceId, $dataMoveType)
{
- $this->send_deleteDataMovementInterface($authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType);
+ $this->send_deleteDataMovementInterface($authzToken, $productId, $dataMovementInterfaceId, $dataMoveType);
return $this->recv_deleteDataMovementInterface();
}
- public function send_deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $resourceId, $dataMovementInterfaceId, $dataMoveType)
+ public function send_deleteDataMovementInterface(\Airavata\Model\Security\AuthzToken $authzToken, $productId, $dataMovementInterfaceId, $dataMoveType)
{
$args = new \Airavata\API\Airavata_deleteDataMovementInterface_args();
$args->authzToken = $authzToken;
- $args->resourceId = $resourceId;
+ $args->productId = $productId;
$args->dataMovementInterfaceId = $dataMovementInterfaceId;
$args->dataMoveType = $dataMoveType;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
@@ -39673,7 +39673,7 @@ class Airavata_addLocalDataMovementDetails_args {
/**
* @var string
*/
- public $resourceId = null;
+ public $productId = null;
/**
* @var int
*/
@@ -39696,7 +39696,7 @@ class Airavata_addLocalDataMovementDetails_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'resourceId',
+ 'var' => 'productId',
'type' => TType::STRING,
),
3 => array(
@@ -39718,8 +39718,8 @@ class Airavata_addLocalDataMovementDetails_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['resourceId'])) {
- $this->resourceId = $vals['resourceId'];
+ if (isset($vals['productId'])) {
+ $this->productId = $vals['productId'];
}
if (isset($vals['dataMoveType'])) {
$this->dataMoveType = $vals['dataMoveType'];
@@ -39762,7 +39762,7 @@ class Airavata_addLocalDataMovementDetails_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceId);
+ $xfer += $input->readString($this->productId);
} else {
$xfer += $input->skip($ftype);
}
@@ -39810,9 +39810,9 @@ class Airavata_addLocalDataMovementDetails_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->resourceId !== null) {
- $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->resourceId);
+ if ($this->productId !== null) {
+ $xfer += $output->writeFieldBegin('productId', TType::STRING, 2);
+ $xfer += $output->writeString($this->productId);
$xfer += $output->writeFieldEnd();
}
if ($this->dataMoveType !== null) {
@@ -40614,7 +40614,7 @@ class Airavata_addSCPDataMovementDetails_args {
/**
* @var string
*/
- public $resourceId = null;
+ public $productId = null;
/**
* @var int
*/
@@ -40637,7 +40637,7 @@ class Airavata_addSCPDataMovementDetails_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'resourceId',
+ 'var' => 'productId',
'type' => TType::STRING,
),
3 => array(
@@ -40659,8 +40659,8 @@ class Airavata_addSCPDataMovementDetails_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['resourceId'])) {
- $this->resourceId = $vals['resourceId'];
+ if (isset($vals['productId'])) {
+ $this->productId = $vals['productId'];
}
if (isset($vals['dataMoveType'])) {
$this->dataMoveType = $vals['dataMoveType'];
@@ -40703,7 +40703,7 @@ class Airavata_addSCPDataMovementDetails_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceId);
+ $xfer += $input->readString($this->productId);
} else {
$xfer += $input->skip($ftype);
}
@@ -40751,9 +40751,9 @@ class Airavata_addSCPDataMovementDetails_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->resourceId !== null) {
- $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->resourceId);
+ if ($this->productId !== null) {
+ $xfer += $output->writeFieldBegin('productId', TType::STRING, 2);
+ $xfer += $output->writeString($this->productId);
$xfer += $output->writeFieldEnd();
}
if ($this->dataMoveType !== null) {
@@ -41555,7 +41555,7 @@ class Airavata_addUnicoreDataMovementDetails_args {
/**
* @var string
*/
- public $resourceId = null;
+ public $productId = null;
/**
* @var int
*/
@@ -41578,7 +41578,7 @@ class Airavata_addUnicoreDataMovementDetails_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'resourceId',
+ 'var' => 'productId',
'type' => TType::STRING,
),
3 => array(
@@ -41600,8 +41600,8 @@ class Airavata_addUnicoreDataMovementDetails_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['resourceId'])) {
- $this->resourceId = $vals['resourceId'];
+ if (isset($vals['productId'])) {
+ $this->productId = $vals['productId'];
}
if (isset($vals['dataMoveType'])) {
$this->dataMoveType = $vals['dataMoveType'];
@@ -41644,7 +41644,7 @@ class Airavata_addUnicoreDataMovementDetails_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceId);
+ $xfer += $input->readString($this->productId);
} else {
$xfer += $input->skip($ftype);
}
@@ -41692,9 +41692,9 @@ class Airavata_addUnicoreDataMovementDetails_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->resourceId !== null) {
- $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->resourceId);
+ if ($this->productId !== null) {
+ $xfer += $output->writeFieldBegin('productId', TType::STRING, 2);
+ $xfer += $output->writeString($this->productId);
$xfer += $output->writeFieldEnd();
}
if ($this->dataMoveType !== null) {
@@ -42496,7 +42496,7 @@ class Airavata_addGridFTPDataMovementDetails_args {
/**
* @var string
*/
- public $resourceId = null;
+ public $productId = null;
/**
* @var int
*/
@@ -42519,7 +42519,7 @@ class Airavata_addGridFTPDataMovementDetails_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'resourceId',
+ 'var' => 'productId',
'type' => TType::STRING,
),
3 => array(
@@ -42541,8 +42541,8 @@ class Airavata_addGridFTPDataMovementDetails_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['resourceId'])) {
- $this->resourceId = $vals['resourceId'];
+ if (isset($vals['productId'])) {
+ $this->productId = $vals['productId'];
}
if (isset($vals['dataMoveType'])) {
$this->dataMoveType = $vals['dataMoveType'];
@@ -42585,7 +42585,7 @@ class Airavata_addGridFTPDataMovementDetails_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceId);
+ $xfer += $input->readString($this->productId);
} else {
$xfer += $input->skip($ftype);
}
@@ -42633,9 +42633,9 @@ class Airavata_addGridFTPDataMovementDetails_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->resourceId !== null) {
- $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->resourceId);
+ if ($this->productId !== null) {
+ $xfer += $output->writeFieldBegin('productId', TType::STRING, 2);
+ $xfer += $output->writeString($this->productId);
$xfer += $output->writeFieldEnd();
}
if ($this->dataMoveType !== null) {
@@ -44964,7 +44964,7 @@ class Airavata_deleteDataMovementInterface_args {
/**
* @var string
*/
- public $resourceId = null;
+ public $productId = null;
/**
* @var string
*/
@@ -44983,7 +44983,7 @@ class Airavata_deleteDataMovementInterface_args {
'class' => '\Airavata\Model\Security\AuthzToken',
),
2 => array(
- 'var' => 'resourceId',
+ 'var' => 'productId',
'type' => TType::STRING,
),
3 => array(
@@ -45000,8 +45000,8 @@ class Airavata_deleteDataMovementInterface_args {
if (isset($vals['authzToken'])) {
$this->authzToken = $vals['authzToken'];
}
- if (isset($vals['resourceId'])) {
- $this->resourceId = $vals['resourceId'];
+ if (isset($vals['productId'])) {
+ $this->productId = $vals['productId'];
}
if (isset($vals['dataMovementInterfaceId'])) {
$this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
@@ -45041,7 +45041,7 @@ class Airavata_deleteDataMovementInterface_args {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->resourceId);
+ $xfer += $input->readString($this->productId);
} else {
$xfer += $input->skip($ftype);
}
@@ -45081,9 +45081,9 @@ class Airavata_deleteDataMovementInterface_args {
$xfer += $this->authzToken->write($output);
$xfer += $output->writeFieldEnd();
}
- if ($this->resourceId !== null) {
- $xfer += $output->writeFieldBegin('resourceId', TType::STRING, 2);
- $xfer += $output->writeString($this->resourceId);
+ if ($this->productId !== null) {
+ $xfer += $output->writeFieldBegin('productId', TType::STRING, 2);
+ $xfer += $output->writeString($this->productId);
$xfer += $output->writeFieldEnd();
}
if ($this->dataMovementInterfaceId !== null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/03afa2da/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Product/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Product/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Product/Types.php
index 8e4ace9..aa26196 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Product/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Data/Product/Types.php
@@ -56,7 +56,7 @@ class DataProductModel {
/**
* @var string
*/
- public $productId = null;
+ public $productUri = null;
/**
* @var string
*/
@@ -64,7 +64,11 @@ class DataProductModel {
/**
* @var string
*/
- public $parentProductId = null;
+ public $parentProductUri = null;
+ /**
+ * @var string
+ */
+ public $logicalPath = null;
/**
* @var string
*/
@@ -110,7 +114,7 @@ class DataProductModel {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'productId',
+ 'var' => 'productUri',
'type' => TType::STRING,
),
2 => array(
@@ -118,38 +122,42 @@ class DataProductModel {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'parentProductId',
+ 'var' => 'parentProductUri',
'type' => TType::STRING,
),
4 => array(
- 'var' => 'productName',
+ 'var' => 'logicalPath',
'type' => TType::STRING,
),
5 => array(
- 'var' => 'productDescription',
+ 'var' => 'productName',
'type' => TType::STRING,
),
6 => array(
- 'var' => 'ownerName',
+ 'var' => 'productDescription',
'type' => TType::STRING,
),
7 => array(
+ 'var' => 'ownerName',
+ 'type' => TType::STRING,
+ ),
+ 8 => array(
'var' => 'dataProductType',
'type' => TType::I32,
),
- 8 => array(
+ 9 => array(
'var' => 'productSize',
'type' => TType::I32,
),
- 9 => array(
+ 10 => array(
'var' => 'creationTime',
'type' => TType::I64,
),
- 10 => array(
+ 11 => array(
'var' => 'lastModifiedTime',
'type' => TType::I64,
),
- 11 => array(
+ 12 => array(
'var' => 'productMetadata',
'type' => TType::MAP,
'ktype' => TType::STRING,
@@ -161,7 +169,7 @@ class DataProductModel {
'type' => TType::STRING,
),
),
- 12 => array(
+ 13 => array(
'var' => 'replicaLocations',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -170,7 +178,7 @@ class DataProductModel {
'class' => '\Airavata\Model\Data\Product\DataReplicaLocationModel',
),
),
- 13 => array(
+ 14 => array(
'var' => 'childProducts',
'type' => TType::LST,
'etype' => TType::STRUCT,
@@ -182,14 +190,17 @@ class DataProductModel {
);
}
if (is_array($vals)) {
- if (isset($vals['productId'])) {
- $this->productId = $vals['productId'];
+ if (isset($vals['productUri'])) {
+ $this->productUri = $vals['productUri'];
}
if (isset($vals['gatewayId'])) {
$this->gatewayId = $vals['gatewayId'];
}
- if (isset($vals['parentProductId'])) {
- $this->parentProductId = $vals['parentProductId'];
+ if (isset($vals['parentProductUri'])) {
+ $this->parentProductUri = $vals['parentProductUri'];
+ }
+ if (isset($vals['logicalPath'])) {
+ $this->logicalPath = $vals['logicalPath'];
}
if (isset($vals['productName'])) {
$this->productName = $vals['productName'];
@@ -245,7 +256,7 @@ class DataProductModel {
{
case 1:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->productId);
+ $xfer += $input->readString($this->productUri);
} else {
$xfer += $input->skip($ftype);
}
@@ -259,61 +270,68 @@ class DataProductModel {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->parentProductId);
+ $xfer += $input->readString($this->parentProductUri);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->productName);
+ $xfer += $input->readString($this->logicalPath);
} else {
$xfer += $input->skip($ftype);
}
break;
case 5:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->productDescription);
+ $xfer += $input->readString($this->productName);
} else {
$xfer += $input->skip($ftype);
}
break;
case 6:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->ownerName);
+ $xfer += $input->readString($this->productDescription);
} else {
$xfer += $input->skip($ftype);
}
break;
case 7:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->ownerName);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 8:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->dataProductType);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 8:
+ case 9:
if ($ftype == TType::I32) {
$xfer += $input->readI32($this->productSize);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 9:
+ case 10:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->creationTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 10:
+ case 11:
if ($ftype == TType::I64) {
$xfer += $input->readI64($this->lastModifiedTime);
} else {
$xfer += $input->skip($ftype);
}
break;
- case 11:
+ case 12:
if ($ftype == TType::MAP) {
$this->productMetadata = array();
$_size0 = 0;
@@ -333,7 +351,7 @@ class DataProductModel {
$xfer += $input->skip($ftype);
}
break;
- case 12:
+ case 13:
if ($ftype == TType::LST) {
$this->replicaLocations = array();
$_size7 = 0;
@@ -351,7 +369,7 @@ class DataProductModel {
$xfer += $input->skip($ftype);
}
break;
- case 13:
+ case 14:
if ($ftype == TType::LST) {
$this->childProducts = array();
$_size13 = 0;
@@ -382,9 +400,9 @@ class DataProductModel {
public function write($output) {
$xfer = 0;
$xfer += $output->writeStructBegin('DataProductModel');
- if ($this->productId !== null) {
- $xfer += $output->writeFieldBegin('productId', TType::STRING, 1);
- $xfer += $output->writeString($this->productId);
+ if ($this->productUri !== null) {
+ $xfer += $output->writeFieldBegin('productUri', TType::STRING, 1);
+ $xfer += $output->writeString($this->productUri);
$xfer += $output->writeFieldEnd();
}
if ($this->gatewayId !== null) {
@@ -392,43 +410,48 @@ class DataProductModel {
$xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
- if ($this->parentProductId !== null) {
- $xfer += $output->writeFieldBegin('parentProductId', TType::STRING, 3);
- $xfer += $output->writeString($this->parentProductId);
+ if ($this->parentProductUri !== null) {
+ $xfer += $output->writeFieldBegin('parentProductUri', TType::STRING, 3);
+ $xfer += $output->writeString($this->parentProductUri);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->logicalPath !== null) {
+ $xfer += $output->writeFieldBegin('logicalPath', TType::STRING, 4);
+ $xfer += $output->writeString($this->logicalPath);
$xfer += $output->writeFieldEnd();
}
if ($this->productName !== null) {
- $xfer += $output->writeFieldBegin('productName', TType::STRING, 4);
+ $xfer += $output->writeFieldBegin('productName', TType::STRING, 5);
$xfer += $output->writeString($this->productName);
$xfer += $output->writeFieldEnd();
}
if ($this->productDescription !== null) {
- $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 5);
+ $xfer += $output->writeFieldBegin('productDescription', TType::STRING, 6);
$xfer += $output->writeString($this->productDescription);
$xfer += $output->writeFieldEnd();
}
if ($this->ownerName !== null) {
- $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 6);
+ $xfer += $output->writeFieldBegin('ownerName', TType::STRING, 7);
$xfer += $output->writeString($this->ownerName);
$xfer += $output->writeFieldEnd();
}
if ($this->dataProductType !== null) {
- $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 7);
+ $xfer += $output->writeFieldBegin('dataProductType', TType::I32, 8);
$xfer += $output->writeI32($this->dataProductType);
$xfer += $output->writeFieldEnd();
}
if ($this->productSize !== null) {
- $xfer += $output->writeFieldBegin('productSize', TType::I32, 8);
+ $xfer += $output->writeFieldBegin('productSize', TType::I32, 9);
$xfer += $output->writeI32($this->productSize);
$xfer += $output->writeFieldEnd();
}
if ($this->creationTime !== null) {
- $xfer += $output->writeFieldBegin('creationTime', TType::I64, 9);
+ $xfer += $output->writeFieldBegin('creationTime', TType::I64, 10);
$xfer += $output->writeI64($this->creationTime);
$xfer += $output->writeFieldEnd();
}
if ($this->lastModifiedTime !== null) {
- $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 10);
+ $xfer += $output->writeFieldBegin('lastModifiedTime', TType::I64, 11);
$xfer += $output->writeI64($this->lastModifiedTime);
$xfer += $output->writeFieldEnd();
}
@@ -436,7 +459,7 @@ class DataProductModel {
if (!is_array($this->productMetadata)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 11);
+ $xfer += $output->writeFieldBegin('productMetadata', TType::MAP, 12);
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->productMetadata));
{
@@ -454,7 +477,7 @@ class DataProductModel {
if (!is_array($this->replicaLocations)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 12);
+ $xfer += $output->writeFieldBegin('replicaLocations', TType::LST, 13);
{
$output->writeListBegin(TType::STRUCT, count($this->replicaLocations));
{
@@ -471,7 +494,7 @@ class DataProductModel {
if (!is_array($this->childProducts)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('childProducts', TType::LST, 13);
+ $xfer += $output->writeFieldBegin('childProducts', TType::LST, 14);
{
$output->writeListBegin(TType::STRUCT, count($this->childProducts));
{
@@ -501,7 +524,7 @@ class DataReplicaLocationModel {
/**
* @var string
*/
- public $productId = null;
+ public $productUri = null;
/**
* @var string
*/
@@ -537,7 +560,7 @@ class DataReplicaLocationModel {
/**
* @var string
*/
- public $fileAbsolutePath = null;
+ public $filePath = null;
/**
* @var array
*/
@@ -551,7 +574,7 @@ class DataReplicaLocationModel {
'type' => TType::STRING,
),
2 => array(
- 'var' => 'productId',
+ 'var' => 'productUri',
'type' => TType::STRING,
),
3 => array(
@@ -587,7 +610,7 @@ class DataReplicaLocationModel {
'type' => TType::STRING,
),
11 => array(
- 'var' => 'fileAbsolutePath',
+ 'var' => 'filePath',
'type' => TType::STRING,
),
12 => array(
@@ -608,8 +631,8 @@ class DataReplicaLocationModel {
if (isset($vals['replicaId'])) {
$this->replicaId = $vals['replicaId'];
}
- if (isset($vals['productId'])) {
- $this->productId = $vals['productId'];
+ if (isset($vals['productUri'])) {
+ $this->productUri = $vals['productUri'];
}
if (isset($vals['replicaName'])) {
$this->replicaName = $vals['replicaName'];
@@ -635,8 +658,8 @@ class DataReplicaLocationModel {
if (isset($vals['storageResourceId'])) {
$this->storageResourceId = $vals['storageResourceId'];
}
- if (isset($vals['fileAbsolutePath'])) {
- $this->fileAbsolutePath = $vals['fileAbsolutePath'];
+ if (isset($vals['filePath'])) {
+ $this->filePath = $vals['filePath'];
}
if (isset($vals['replicaMetadata'])) {
$this->replicaMetadata = $vals['replicaMetadata'];
@@ -672,7 +695,7 @@ class DataReplicaLocationModel {
break;
case 2:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->productId);
+ $xfer += $input->readString($this->productUri);
} else {
$xfer += $input->skip($ftype);
}
@@ -735,7 +758,7 @@ class DataReplicaLocationModel {
break;
case 11:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->fileAbsolutePath);
+ $xfer += $input->readString($this->filePath);
} else {
$xfer += $input->skip($ftype);
}
@@ -778,9 +801,9 @@ class DataReplicaLocationModel {
$xfer += $output->writeString($this->replicaId);
$xfer += $output->writeFieldEnd();
}
- if ($this->productId !== null) {
- $xfer += $output->writeFieldBegin('productId', TType::STRING, 2);
- $xfer += $output->writeString($this->productId);
+ if ($this->productUri !== null) {
+ $xfer += $output->writeFieldBegin('productUri', TType::STRING, 2);
+ $xfer += $output->writeString($this->productUri);
$xfer += $output->writeFieldEnd();
}
if ($this->replicaName !== null) {
@@ -823,9 +846,9 @@ class DataReplicaLocationModel {
$xfer += $output->writeString($this->storageResourceId);
$xfer += $output->writeFieldEnd();
}
- if ($this->fileAbsolutePath !== null) {
- $xfer += $output->writeFieldBegin('fileAbsolutePath', TType::STRING, 11);
- $xfer += $output->writeString($this->fileAbsolutePath);
+ if ($this->filePath !== null) {
+ $xfer += $output->writeFieldBegin('filePath', TType::STRING, 11);
+ $xfer += $output->writeString($this->filePath);
$xfer += $output->writeFieldEnd();
}
if ($this->replicaMetadata !== null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/03afa2da/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 b2abc19..20d9399 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
@@ -113,16 +113,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 productId, DMType dataMoveType, i32 priorityOrder, LOCALDataMovement localDataMovement)')
+ print(' string addLocalDataMovementDetails(AuthzToken authzToken, string productUri, 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 productId, DMType dataMoveType, i32 priorityOrder, SCPDataMovement scpDataMovement)')
+ print(' string addSCPDataMovementDetails(AuthzToken authzToken, string productUri, 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 productId, DMType dataMoveType, i32 priorityOrder, UnicoreDataMovement unicoreDataMovement)')
+ print(' string addUnicoreDataMovementDetails(AuthzToken authzToken, string productUri, 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 productId, DMType dataMoveType, i32 priorityOrder, GridFTPDataMovement gridFTPDataMovement)')
+ print(' string addGridFTPDataMovementDetails(AuthzToken authzToken, string productUri, 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)')
@@ -130,7 +130,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool changeJobSubmissionPriorities(AuthzToken authzToken, jobSubmissionPriorityMap)')
print(' bool changeDataMovementPriorities(AuthzToken authzToken, dataMovementPriorityMap)')
print(' bool deleteJobSubmissionInterface(AuthzToken authzToken, string computeResourceId, string jobSubmissionInterfaceId)')
- print(' bool deleteDataMovementInterface(AuthzToken authzToken, string productId, string dataMovementInterfaceId, DMType dataMoveType)')
+ print(' bool deleteDataMovementInterface(AuthzToken authzToken, string productUri, string dataMovementInterfaceId, DMType dataMoveType)')
print(' string registerResourceJobManager(AuthzToken authzToken, ResourceJobManager resourceJobManager)')
print(' bool updateResourceJobManager(AuthzToken authzToken, string resourceJobManagerId, ResourceJobManager updatedResourceJobManager)')
print(' ResourceJobManager getResourceJobManager(AuthzToken authzToken, string resourceJobManagerId)')
http://git-wip-us.apache.org/repos/asf/airavata/blob/03afa2da/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 245ac46..97146d3 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
@@ -2075,13 +2075,13 @@ class Iface:
"""
pass
- def addLocalDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement):
+ def addLocalDataMovementDetails(self, authzToken, productId, 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.
- @param resourceId
+ @param productId
The identifier of the compute resource to which JobSubmission protocol to be added
@param DMType
@@ -2100,7 +2100,7 @@ class Iface:
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- localDataMovement
@@ -2148,13 +2148,13 @@ class Iface:
"""
pass
- def addSCPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement):
+ def addSCPDataMovementDetails(self, authzToken, productId, 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.
- @param resourceId
+ @param productId
The identifier of the compute resource to which JobSubmission protocol to be added
@param priorityOrder
@@ -2169,7 +2169,7 @@ class Iface:
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- scpDataMovement
@@ -2216,13 +2216,13 @@ class Iface:
"""
pass
- def addUnicoreDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement):
+ def addUnicoreDataMovementDetails(self, authzToken, productId, dataMoveType, priorityOrder, unicoreDataMovement):
"""
Add a UNICORE data movement details to a compute resource
App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
- @param resourceId
+ @param productId
The identifier of the compute resource to which data movement protocol to be added
@param priorityOrder
@@ -2237,7 +2237,7 @@ class Iface:
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- unicoreDataMovement
@@ -2286,13 +2286,13 @@ class Iface:
"""
pass
- def addGridFTPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement):
+ def addGridFTPDataMovementDetails(self, authzToken, productId, 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.
- @param resourceId
+ @param productId
The identifier of the compute resource to which dataMovement protocol to be added
@param DMType
@@ -2311,7 +2311,7 @@ class Iface:
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- gridFTPDataMovement
@@ -2456,7 +2456,7 @@ class Iface:
"""
pass
- def deleteDataMovementInterface(self, authzToken, resourceId, dataMovementInterfaceId, dataMoveType):
+ def deleteDataMovementInterface(self, authzToken, productId, dataMovementInterfaceId, dataMoveType):
"""
Delete a given data movement interface
@@ -2470,7 +2470,7 @@ class Iface:
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMovementInterfaceId
- dataMoveType
"""
@@ -7991,13 +7991,13 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "updateUnicoreJobSubmissionDetails failed: unknown result")
- def addLocalDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement):
+ def addLocalDataMovementDetails(self, authzToken, productId, 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.
- @param resourceId
+ @param productId
The identifier of the compute resource to which JobSubmission protocol to be added
@param DMType
@@ -8016,19 +8016,19 @@ class Client(Iface):
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- localDataMovement
"""
- self.send_addLocalDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement)
+ self.send_addLocalDataMovementDetails(authzToken, productId, dataMoveType, priorityOrder, localDataMovement)
return self.recv_addLocalDataMovementDetails()
- def send_addLocalDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement):
+ def send_addLocalDataMovementDetails(self, authzToken, productId, dataMoveType, priorityOrder, localDataMovement):
self._oprot.writeMessageBegin('addLocalDataMovementDetails', TMessageType.CALL, self._seqid)
args = addLocalDataMovementDetails_args()
args.authzToken = authzToken
- args.resourceId = resourceId
+ args.productId = productId
args.dataMoveType = dataMoveType
args.priorityOrder = priorityOrder
args.localDataMovement = localDataMovement
@@ -8167,13 +8167,13 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getLocalDataMovement failed: unknown result")
- def addSCPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement):
+ def addSCPDataMovementDetails(self, authzToken, productId, 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.
- @param resourceId
+ @param productId
The identifier of the compute resource to which JobSubmission protocol to be added
@param priorityOrder
@@ -8188,19 +8188,19 @@ class Client(Iface):
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- scpDataMovement
"""
- self.send_addSCPDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement)
+ self.send_addSCPDataMovementDetails(authzToken, productId, dataMoveType, priorityOrder, scpDataMovement)
return self.recv_addSCPDataMovementDetails()
- def send_addSCPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement):
+ def send_addSCPDataMovementDetails(self, authzToken, productId, dataMoveType, priorityOrder, scpDataMovement):
self._oprot.writeMessageBegin('addSCPDataMovementDetails', TMessageType.CALL, self._seqid)
args = addSCPDataMovementDetails_args()
args.authzToken = authzToken
- args.resourceId = resourceId
+ args.productId = productId
args.dataMoveType = dataMoveType
args.priorityOrder = priorityOrder
args.scpDataMovement = scpDataMovement
@@ -8338,13 +8338,13 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getSCPDataMovement failed: unknown result")
- def addUnicoreDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement):
+ def addUnicoreDataMovementDetails(self, authzToken, productId, dataMoveType, priorityOrder, unicoreDataMovement):
"""
Add a UNICORE data movement details to a compute resource
App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
- @param resourceId
+ @param productId
The identifier of the compute resource to which data movement protocol to be added
@param priorityOrder
@@ -8359,19 +8359,19 @@ class Client(Iface):
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- unicoreDataMovement
"""
- self.send_addUnicoreDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement)
+ self.send_addUnicoreDataMovementDetails(authzToken, productId, dataMoveType, priorityOrder, unicoreDataMovement)
return self.recv_addUnicoreDataMovementDetails()
- def send_addUnicoreDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement):
+ def send_addUnicoreDataMovementDetails(self, authzToken, productId, dataMoveType, priorityOrder, unicoreDataMovement):
self._oprot.writeMessageBegin('addUnicoreDataMovementDetails', TMessageType.CALL, self._seqid)
args = addUnicoreDataMovementDetails_args()
args.authzToken = authzToken
- args.resourceId = resourceId
+ args.productId = productId
args.dataMoveType = dataMoveType
args.priorityOrder = priorityOrder
args.unicoreDataMovement = unicoreDataMovement
@@ -8511,13 +8511,13 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getUnicoreDataMovement failed: unknown result")
- def addGridFTPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement):
+ def addGridFTPDataMovementDetails(self, authzToken, productId, 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.
- @param resourceId
+ @param productId
The identifier of the compute resource to which dataMovement protocol to be added
@param DMType
@@ -8536,19 +8536,19 @@ class Client(Iface):
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- gridFTPDataMovement
"""
- self.send_addGridFTPDataMovementDetails(authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement)
+ self.send_addGridFTPDataMovementDetails(authzToken, productId, dataMoveType, priorityOrder, gridFTPDataMovement)
return self.recv_addGridFTPDataMovementDetails()
- def send_addGridFTPDataMovementDetails(self, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement):
+ def send_addGridFTPDataMovementDetails(self, authzToken, productId, dataMoveType, priorityOrder, gridFTPDataMovement):
self._oprot.writeMessageBegin('addGridFTPDataMovementDetails', TMessageType.CALL, self._seqid)
args = addGridFTPDataMovementDetails_args()
args.authzToken = authzToken
- args.resourceId = resourceId
+ args.productId = productId
args.dataMoveType = dataMoveType
args.priorityOrder = priorityOrder
args.gridFTPDataMovement = gridFTPDataMovement
@@ -8952,7 +8952,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteJobSubmissionInterface failed: unknown result")
- def deleteDataMovementInterface(self, authzToken, resourceId, dataMovementInterfaceId, dataMoveType):
+ def deleteDataMovementInterface(self, authzToken, productId, dataMovementInterfaceId, dataMoveType):
"""
Delete a given data movement interface
@@ -8966,18 +8966,18 @@ class Client(Iface):
Parameters:
- authzToken
- - resourceId
+ - productId
- dataMovementInterfaceId
- dataMoveType
"""
- self.send_deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType)
+ self.send_deleteDataMovementInterface(authzToken, productId, dataMovementInterfaceId, dataMoveType)
return self.recv_deleteDataMovementInterface()
- def send_deleteDataMovementInterface(self, authzToken, resourceId, dataMovementInterfaceId, dataMoveType):
+ def send_deleteDataMovementInterface(self, authzToken, productId, dataMovementInterfaceId, dataMoveType):
self._oprot.writeMessageBegin('deleteDataMovementInterface', TMessageType.CALL, self._seqid)
args = deleteDataMovementInterface_args()
args.authzToken = authzToken
- args.resourceId = resourceId
+ args.productId = productId
args.dataMovementInterfaceId = dataMovementInterfaceId
args.dataMoveType = dataMoveType
args.write(self._oprot)
@@ -13286,7 +13286,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = addLocalDataMovementDetails_result()
try:
- result.success = self._handler.addLocalDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.localDataMovement)
+ result.success = self._handler.addLocalDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.localDataMovement)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -13379,7 +13379,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = addSCPDataMovementDetails_result()
try:
- result.success = self._handler.addSCPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.scpDataMovement)
+ result.success = self._handler.addSCPDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.scpDataMovement)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -13472,7 +13472,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = addUnicoreDataMovementDetails_result()
try:
- result.success = self._handler.addUnicoreDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement)
+ result.success = self._handler.addUnicoreDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.unicoreDataMovement)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -13565,7 +13565,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = addGridFTPDataMovementDetails_result()
try:
- result.success = self._handler.addGridFTPDataMovementDetails(args.authzToken, args.resourceId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement)
+ result.success = self._handler.addGridFTPDataMovementDetails(args.authzToken, args.productId, args.dataMoveType, args.priorityOrder, args.gridFTPDataMovement)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -13813,7 +13813,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = deleteDataMovementInterface_result()
try:
- result.success = self._handler.deleteDataMovementInterface(args.authzToken, args.resourceId, args.dataMovementInterfaceId, args.dataMoveType)
+ result.success = self._handler.deleteDataMovementInterface(args.authzToken, args.productId, args.dataMovementInterfaceId, args.dataMoveType)
msg_type = TMessageType.REPLY
except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
raise
@@ -34185,7 +34185,7 @@ class addLocalDataMovementDetails_args:
"""
Attributes:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- localDataMovement
@@ -34194,15 +34194,15 @@ 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, 'resourceId', None, None, ), # 2
+ (2, TType.STRING, 'productId', None, None, ), # 2
(3, TType.I32, 'dataMoveType', None, None, ), # 3
(4, TType.I32, 'priorityOrder', None, None, ), # 4
(5, TType.STRUCT, 'localDataMovement', (apache.airavata.model.data.movement.ttypes.LOCALDataMovement, apache.airavata.model.data.movement.ttypes.LOCALDataMovement.thrift_spec), None, ), # 5
)
- def __init__(self, authzToken=None, resourceId=None, dataMoveType=None, priorityOrder=None, localDataMovement=None,):
+ def __init__(self, authzToken=None, productId=None, dataMoveType=None, priorityOrder=None, localDataMovement=None,):
self.authzToken = authzToken
- self.resourceId = resourceId
+ self.productId = productId
self.dataMoveType = dataMoveType
self.priorityOrder = priorityOrder
self.localDataMovement = localDataMovement
@@ -34224,7 +34224,7 @@ class addLocalDataMovementDetails_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.resourceId = iprot.readString()
+ self.productId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
@@ -34257,9 +34257,9 @@ class addLocalDataMovementDetails_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.resourceId is not None:
- oprot.writeFieldBegin('resourceId', TType.STRING, 2)
- oprot.writeString(self.resourceId)
+ if self.productId is not None:
+ oprot.writeFieldBegin('productId', TType.STRING, 2)
+ oprot.writeString(self.productId)
oprot.writeFieldEnd()
if self.dataMoveType is not None:
oprot.writeFieldBegin('dataMoveType', TType.I32, 3)
@@ -34279,8 +34279,8 @@ class addLocalDataMovementDetails_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.resourceId is None:
- raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.productId is None:
+ raise TProtocol.TProtocolException(message='Required field productId is unset!')
if self.dataMoveType is None:
raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
if self.priorityOrder is None:
@@ -34293,7 +34293,7 @@ class addLocalDataMovementDetails_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.productId)
value = (value * 31) ^ hash(self.dataMoveType)
value = (value * 31) ^ hash(self.priorityOrder)
value = (value * 31) ^ hash(self.localDataMovement)
@@ -34857,7 +34857,7 @@ class addSCPDataMovementDetails_args:
"""
Attributes:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- scpDataMovement
@@ -34866,15 +34866,15 @@ 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, 'resourceId', None, None, ), # 2
+ (2, TType.STRING, 'productId', None, None, ), # 2
(3, TType.I32, 'dataMoveType', None, None, ), # 3
(4, TType.I32, 'priorityOrder', None, None, ), # 4
(5, TType.STRUCT, 'scpDataMovement', (apache.airavata.model.data.movement.ttypes.SCPDataMovement, apache.airavata.model.data.movement.ttypes.SCPDataMovement.thrift_spec), None, ), # 5
)
- def __init__(self, authzToken=None, resourceId=None, dataMoveType=None, priorityOrder=None, scpDataMovement=None,):
+ def __init__(self, authzToken=None, productId=None, dataMoveType=None, priorityOrder=None, scpDataMovement=None,):
self.authzToken = authzToken
- self.resourceId = resourceId
+ self.productId = productId
self.dataMoveType = dataMoveType
self.priorityOrder = priorityOrder
self.scpDataMovement = scpDataMovement
@@ -34896,7 +34896,7 @@ class addSCPDataMovementDetails_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.resourceId = iprot.readString()
+ self.productId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
@@ -34929,9 +34929,9 @@ class addSCPDataMovementDetails_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.resourceId is not None:
- oprot.writeFieldBegin('resourceId', TType.STRING, 2)
- oprot.writeString(self.resourceId)
+ if self.productId is not None:
+ oprot.writeFieldBegin('productId', TType.STRING, 2)
+ oprot.writeString(self.productId)
oprot.writeFieldEnd()
if self.dataMoveType is not None:
oprot.writeFieldBegin('dataMoveType', TType.I32, 3)
@@ -34951,8 +34951,8 @@ class addSCPDataMovementDetails_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.resourceId is None:
- raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.productId is None:
+ raise TProtocol.TProtocolException(message='Required field productId is unset!')
if self.dataMoveType is None:
raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
if self.priorityOrder is None:
@@ -34965,7 +34965,7 @@ class addSCPDataMovementDetails_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.productId)
value = (value * 31) ^ hash(self.dataMoveType)
value = (value * 31) ^ hash(self.priorityOrder)
value = (value * 31) ^ hash(self.scpDataMovement)
@@ -35529,7 +35529,7 @@ class addUnicoreDataMovementDetails_args:
"""
Attributes:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- unicoreDataMovement
@@ -35538,15 +35538,15 @@ 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, 'resourceId', None, None, ), # 2
+ (2, TType.STRING, 'productId', None, None, ), # 2
(3, TType.I32, 'dataMoveType', None, None, ), # 3
(4, TType.I32, 'priorityOrder', None, None, ), # 4
(5, TType.STRUCT, 'unicoreDataMovement', (apache.airavata.model.data.movement.ttypes.UnicoreDataMovement, apache.airavata.model.data.movement.ttypes.UnicoreDataMovement.thrift_spec), None, ), # 5
)
- def __init__(self, authzToken=None, resourceId=None, dataMoveType=None, priorityOrder=None, unicoreDataMovement=None,):
+ def __init__(self, authzToken=None, productId=None, dataMoveType=None, priorityOrder=None, unicoreDataMovement=None,):
self.authzToken = authzToken
- self.resourceId = resourceId
+ self.productId = productId
self.dataMoveType = dataMoveType
self.priorityOrder = priorityOrder
self.unicoreDataMovement = unicoreDataMovement
@@ -35568,7 +35568,7 @@ class addUnicoreDataMovementDetails_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.resourceId = iprot.readString()
+ self.productId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
@@ -35601,9 +35601,9 @@ class addUnicoreDataMovementDetails_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.resourceId is not None:
- oprot.writeFieldBegin('resourceId', TType.STRING, 2)
- oprot.writeString(self.resourceId)
+ if self.productId is not None:
+ oprot.writeFieldBegin('productId', TType.STRING, 2)
+ oprot.writeString(self.productId)
oprot.writeFieldEnd()
if self.dataMoveType is not None:
oprot.writeFieldBegin('dataMoveType', TType.I32, 3)
@@ -35623,8 +35623,8 @@ class addUnicoreDataMovementDetails_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.resourceId is None:
- raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.productId is None:
+ raise TProtocol.TProtocolException(message='Required field productId is unset!')
if self.dataMoveType is None:
raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
if self.priorityOrder is None:
@@ -35637,7 +35637,7 @@ class addUnicoreDataMovementDetails_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.productId)
value = (value * 31) ^ hash(self.dataMoveType)
value = (value * 31) ^ hash(self.priorityOrder)
value = (value * 31) ^ hash(self.unicoreDataMovement)
@@ -36201,7 +36201,7 @@ class addGridFTPDataMovementDetails_args:
"""
Attributes:
- authzToken
- - resourceId
+ - productId
- dataMoveType
- priorityOrder
- gridFTPDataMovement
@@ -36210,15 +36210,15 @@ 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, 'resourceId', None, None, ), # 2
+ (2, TType.STRING, 'productId', None, None, ), # 2
(3, TType.I32, 'dataMoveType', None, None, ), # 3
(4, TType.I32, 'priorityOrder', None, None, ), # 4
(5, TType.STRUCT, 'gridFTPDataMovement', (apache.airavata.model.data.movement.ttypes.GridFTPDataMovement, apache.airavata.model.data.movement.ttypes.GridFTPDataMovement.thrift_spec), None, ), # 5
)
- def __init__(self, authzToken=None, resourceId=None, dataMoveType=None, priorityOrder=None, gridFTPDataMovement=None,):
+ def __init__(self, authzToken=None, productId=None, dataMoveType=None, priorityOrder=None, gridFTPDataMovement=None,):
self.authzToken = authzToken
- self.resourceId = resourceId
+ self.productId = productId
self.dataMoveType = dataMoveType
self.priorityOrder = priorityOrder
self.gridFTPDataMovement = gridFTPDataMovement
@@ -36240,7 +36240,7 @@ class addGridFTPDataMovementDetails_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.resourceId = iprot.readString()
+ self.productId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
@@ -36273,9 +36273,9 @@ class addGridFTPDataMovementDetails_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.resourceId is not None:
- oprot.writeFieldBegin('resourceId', TType.STRING, 2)
- oprot.writeString(self.resourceId)
+ if self.productId is not None:
+ oprot.writeFieldBegin('productId', TType.STRING, 2)
+ oprot.writeString(self.productId)
oprot.writeFieldEnd()
if self.dataMoveType is not None:
oprot.writeFieldBegin('dataMoveType', TType.I32, 3)
@@ -36295,8 +36295,8 @@ class addGridFTPDataMovementDetails_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.resourceId is None:
- raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.productId is None:
+ raise TProtocol.TProtocolException(message='Required field productId is unset!')
if self.dataMoveType is None:
raise TProtocol.TProtocolException(message='Required field dataMoveType is unset!')
if self.priorityOrder is None:
@@ -36309,7 +36309,7 @@ class addGridFTPDataMovementDetails_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.productId)
value = (value * 31) ^ hash(self.dataMoveType)
value = (value * 31) ^ hash(self.priorityOrder)
value = (value * 31) ^ hash(self.gridFTPDataMovement)
@@ -37953,7 +37953,7 @@ class deleteDataMovementInterface_args:
"""
Attributes:
- authzToken
- - resourceId
+ - productId
- dataMovementInterfaceId
- dataMoveType
"""
@@ -37961,14 +37961,14 @@ class deleteDataMovementInterface_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, 'resourceId', None, None, ), # 2
+ (2, TType.STRING, 'productId', None, None, ), # 2
(3, TType.STRING, 'dataMovementInterfaceId', None, None, ), # 3
(4, TType.I32, 'dataMoveType', None, None, ), # 4
)
- def __init__(self, authzToken=None, resourceId=None, dataMovementInterfaceId=None, dataMoveType=None,):
+ def __init__(self, authzToken=None, productId=None, dataMovementInterfaceId=None, dataMoveType=None,):
self.authzToken = authzToken
- self.resourceId = resourceId
+ self.productId = productId
self.dataMovementInterfaceId = dataMovementInterfaceId
self.dataMoveType = dataMoveType
@@ -37989,7 +37989,7 @@ class deleteDataMovementInterface_args:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.STRING:
- self.resourceId = iprot.readString()
+ self.productId = iprot.readString()
else:
iprot.skip(ftype)
elif fid == 3:
@@ -38016,9 +38016,9 @@ class deleteDataMovementInterface_args:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
oprot.writeFieldEnd()
- if self.resourceId is not None:
- oprot.writeFieldBegin('resourceId', TType.STRING, 2)
- oprot.writeString(self.resourceId)
+ if self.productId is not None:
+ oprot.writeFieldBegin('productId', TType.STRING, 2)
+ oprot.writeString(self.productId)
oprot.writeFieldEnd()
if self.dataMovementInterfaceId is not None:
oprot.writeFieldBegin('dataMovementInterfaceId', TType.STRING, 3)
@@ -38034,8 +38034,8 @@ class deleteDataMovementInterface_args:
def validate(self):
if self.authzToken is None:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
- if self.resourceId is None:
- raise TProtocol.TProtocolException(message='Required field resourceId is unset!')
+ if self.productId is None:
+ raise TProtocol.TProtocolException(message='Required field productId is unset!')
if self.dataMovementInterfaceId is None:
raise TProtocol.TProtocolException(message='Required field dataMovementInterfaceId is unset!')
if self.dataMoveType is None:
@@ -38046,7 +38046,7 @@ class deleteDataMovementInterface_args:
def __hash__(self):
value = 17
value = (value * 31) ^ hash(self.authzToken)
- value = (value * 31) ^ hash(self.resourceId)
+ value = (value * 31) ^ hash(self.productId)
value = (value * 31) ^ hash(self.dataMovementInterfaceId)
value = (value * 31) ^ hash(self.dataMoveType)
return value