http://git-wip-us.apache.org/repos/asf/airavata/blob/03afa2da/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h index b67d8f1..a91f277 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h @@ -1910,7 +1910,7 @@ class 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 @@ -1928,12 +1928,12 @@ class AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param localDataMovement */ - virtual void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement) = 0; + virtual void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement) = 0; /** * @@ -1977,7 +1977,7 @@ class 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 @@ -1991,12 +1991,12 @@ class AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param scpDataMovement */ - virtual void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement) = 0; + virtual void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement) = 0; /** * @@ -2039,7 +2039,7 @@ class 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 @@ -2053,12 +2053,12 @@ class AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param unicoreDataMovement */ - virtual void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement) = 0; + virtual void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement) = 0; /** * @@ -2103,7 +2103,7 @@ class 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 @@ -2121,12 +2121,12 @@ class AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param gridFTPDataMovement */ - virtual void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement) = 0; + virtual void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement) = 0; /** * Update the given GridFTP data movement details to a compute resource @@ -2264,11 +2264,11 @@ class AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMovementInterfaceId * @param dataMoveType */ - virtual bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) = 0; + virtual bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) = 0; virtual void registerResourceJobManager(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager) = 0; virtual bool updateResourceJobManager(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceJobManagerId, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& updatedResourceJobManager) = 0; virtual void getResourceJobManager( ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceJobManagerId) = 0; @@ -2925,7 +2925,7 @@ class AiravataNull : virtual public AiravataIf { bool _return = false; return _return; } - void addLocalDataMovementDetails(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */, const int32_t /* priorityOrder */, const ::apache::airavata::model::data::movement::LOCALDataMovement& /* localDataMovement */) { + void addLocalDataMovementDetails(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* productId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */, const int32_t /* priorityOrder */, const ::apache::airavata::model::data::movement::LOCALDataMovement& /* localDataMovement */) { return; } bool updateLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataMovementInterfaceId */, const ::apache::airavata::model::data::movement::LOCALDataMovement& /* localDataMovement */) { @@ -2935,7 +2935,7 @@ class AiravataNull : virtual public AiravataIf { void getLocalDataMovement( ::apache::airavata::model::data::movement::LOCALDataMovement& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataMovementId */) { return; } - void addSCPDataMovementDetails(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */, const int32_t /* priorityOrder */, const ::apache::airavata::model::data::movement::SCPDataMovement& /* scpDataMovement */) { + void addSCPDataMovementDetails(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* productId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */, const int32_t /* priorityOrder */, const ::apache::airavata::model::data::movement::SCPDataMovement& /* scpDataMovement */) { return; } bool updateSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataMovementInterfaceId */, const ::apache::airavata::model::data::movement::SCPDataMovement& /* scpDataMovement */) { @@ -2945,7 +2945,7 @@ class AiravataNull : virtual public AiravataIf { void getSCPDataMovement( ::apache::airavata::model::data::movement::SCPDataMovement& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataMovementId */) { return; } - void addUnicoreDataMovementDetails(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */, const int32_t /* priorityOrder */, const ::apache::airavata::model::data::movement::UnicoreDataMovement& /* unicoreDataMovement */) { + void addUnicoreDataMovementDetails(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* productId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */, const int32_t /* priorityOrder */, const ::apache::airavata::model::data::movement::UnicoreDataMovement& /* unicoreDataMovement */) { return; } bool updateUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataMovementInterfaceId */, const ::apache::airavata::model::data::movement::UnicoreDataMovement& /* unicoreDataMovement */) { @@ -2955,7 +2955,7 @@ class AiravataNull : virtual public AiravataIf { void getUnicoreDataMovement( ::apache::airavata::model::data::movement::UnicoreDataMovement& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataMovementId */) { return; } - void addGridFTPDataMovementDetails(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */, const int32_t /* priorityOrder */, const ::apache::airavata::model::data::movement::GridFTPDataMovement& /* gridFTPDataMovement */) { + void addGridFTPDataMovementDetails(std::string& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* productId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */, const int32_t /* priorityOrder */, const ::apache::airavata::model::data::movement::GridFTPDataMovement& /* gridFTPDataMovement */) { return; } bool updateGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* dataMovementInterfaceId */, const ::apache::airavata::model::data::movement::GridFTPDataMovement& /* gridFTPDataMovement */) { @@ -2985,7 +2985,7 @@ class AiravataNull : virtual public AiravataIf { bool _return = false; return _return; } - bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* resourceId */, const std::string& /* dataMovementInterfaceId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */) { + bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* productId */, const std::string& /* dataMovementInterfaceId */, const ::apache::airavata::model::data::movement::DMType::type /* dataMoveType */) { bool _return = false; return _return; } @@ -15668,19 +15668,19 @@ class Airavata_addLocalDataMovementDetails_args { Airavata_addLocalDataMovementDetails_args(const Airavata_addLocalDataMovementDetails_args&); Airavata_addLocalDataMovementDetails_args& operator=(const Airavata_addLocalDataMovementDetails_args&); - Airavata_addLocalDataMovementDetails_args() : resourceId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0), priorityOrder(0) { + Airavata_addLocalDataMovementDetails_args() : productId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0), priorityOrder(0) { } virtual ~Airavata_addLocalDataMovementDetails_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; - std::string resourceId; + std::string productId; ::apache::airavata::model::data::movement::DMType::type dataMoveType; int32_t priorityOrder; ::apache::airavata::model::data::movement::LOCALDataMovement localDataMovement; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - void __set_resourceId(const std::string& val); + void __set_productId(const std::string& val); void __set_dataMoveType(const ::apache::airavata::model::data::movement::DMType::type val); @@ -15692,7 +15692,7 @@ class Airavata_addLocalDataMovementDetails_args { { if (!(authzToken == rhs.authzToken)) return false; - if (!(resourceId == rhs.resourceId)) + if (!(productId == rhs.productId)) return false; if (!(dataMoveType == rhs.dataMoveType)) return false; @@ -15720,7 +15720,7 @@ class Airavata_addLocalDataMovementDetails_pargs { virtual ~Airavata_addLocalDataMovementDetails_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; - const std::string* resourceId; + const std::string* productId; const ::apache::airavata::model::data::movement::DMType::type* dataMoveType; const int32_t* priorityOrder; const ::apache::airavata::model::data::movement::LOCALDataMovement* localDataMovement; @@ -16100,19 +16100,19 @@ class Airavata_addSCPDataMovementDetails_args { Airavata_addSCPDataMovementDetails_args(const Airavata_addSCPDataMovementDetails_args&); Airavata_addSCPDataMovementDetails_args& operator=(const Airavata_addSCPDataMovementDetails_args&); - Airavata_addSCPDataMovementDetails_args() : resourceId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0), priorityOrder(0) { + Airavata_addSCPDataMovementDetails_args() : productId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0), priorityOrder(0) { } virtual ~Airavata_addSCPDataMovementDetails_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; - std::string resourceId; + std::string productId; ::apache::airavata::model::data::movement::DMType::type dataMoveType; int32_t priorityOrder; ::apache::airavata::model::data::movement::SCPDataMovement scpDataMovement; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - void __set_resourceId(const std::string& val); + void __set_productId(const std::string& val); void __set_dataMoveType(const ::apache::airavata::model::data::movement::DMType::type val); @@ -16124,7 +16124,7 @@ class Airavata_addSCPDataMovementDetails_args { { if (!(authzToken == rhs.authzToken)) return false; - if (!(resourceId == rhs.resourceId)) + if (!(productId == rhs.productId)) return false; if (!(dataMoveType == rhs.dataMoveType)) return false; @@ -16152,7 +16152,7 @@ class Airavata_addSCPDataMovementDetails_pargs { virtual ~Airavata_addSCPDataMovementDetails_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; - const std::string* resourceId; + const std::string* productId; const ::apache::airavata::model::data::movement::DMType::type* dataMoveType; const int32_t* priorityOrder; const ::apache::airavata::model::data::movement::SCPDataMovement* scpDataMovement; @@ -16532,19 +16532,19 @@ class Airavata_addUnicoreDataMovementDetails_args { Airavata_addUnicoreDataMovementDetails_args(const Airavata_addUnicoreDataMovementDetails_args&); Airavata_addUnicoreDataMovementDetails_args& operator=(const Airavata_addUnicoreDataMovementDetails_args&); - Airavata_addUnicoreDataMovementDetails_args() : resourceId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0), priorityOrder(0) { + Airavata_addUnicoreDataMovementDetails_args() : productId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0), priorityOrder(0) { } virtual ~Airavata_addUnicoreDataMovementDetails_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; - std::string resourceId; + std::string productId; ::apache::airavata::model::data::movement::DMType::type dataMoveType; int32_t priorityOrder; ::apache::airavata::model::data::movement::UnicoreDataMovement unicoreDataMovement; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - void __set_resourceId(const std::string& val); + void __set_productId(const std::string& val); void __set_dataMoveType(const ::apache::airavata::model::data::movement::DMType::type val); @@ -16556,7 +16556,7 @@ class Airavata_addUnicoreDataMovementDetails_args { { if (!(authzToken == rhs.authzToken)) return false; - if (!(resourceId == rhs.resourceId)) + if (!(productId == rhs.productId)) return false; if (!(dataMoveType == rhs.dataMoveType)) return false; @@ -16584,7 +16584,7 @@ class Airavata_addUnicoreDataMovementDetails_pargs { virtual ~Airavata_addUnicoreDataMovementDetails_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; - const std::string* resourceId; + const std::string* productId; const ::apache::airavata::model::data::movement::DMType::type* dataMoveType; const int32_t* priorityOrder; const ::apache::airavata::model::data::movement::UnicoreDataMovement* unicoreDataMovement; @@ -16964,19 +16964,19 @@ class Airavata_addGridFTPDataMovementDetails_args { Airavata_addGridFTPDataMovementDetails_args(const Airavata_addGridFTPDataMovementDetails_args&); Airavata_addGridFTPDataMovementDetails_args& operator=(const Airavata_addGridFTPDataMovementDetails_args&); - Airavata_addGridFTPDataMovementDetails_args() : resourceId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0), priorityOrder(0) { + Airavata_addGridFTPDataMovementDetails_args() : productId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0), priorityOrder(0) { } virtual ~Airavata_addGridFTPDataMovementDetails_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; - std::string resourceId; + std::string productId; ::apache::airavata::model::data::movement::DMType::type dataMoveType; int32_t priorityOrder; ::apache::airavata::model::data::movement::GridFTPDataMovement gridFTPDataMovement; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - void __set_resourceId(const std::string& val); + void __set_productId(const std::string& val); void __set_dataMoveType(const ::apache::airavata::model::data::movement::DMType::type val); @@ -16988,7 +16988,7 @@ class Airavata_addGridFTPDataMovementDetails_args { { if (!(authzToken == rhs.authzToken)) return false; - if (!(resourceId == rhs.resourceId)) + if (!(productId == rhs.productId)) return false; if (!(dataMoveType == rhs.dataMoveType)) return false; @@ -17016,7 +17016,7 @@ class Airavata_addGridFTPDataMovementDetails_pargs { virtual ~Airavata_addGridFTPDataMovementDetails_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; - const std::string* resourceId; + const std::string* productId; const ::apache::airavata::model::data::movement::DMType::type* dataMoveType; const int32_t* priorityOrder; const ::apache::airavata::model::data::movement::GridFTPDataMovement* gridFTPDataMovement; @@ -18094,18 +18094,18 @@ class Airavata_deleteDataMovementInterface_args { Airavata_deleteDataMovementInterface_args(const Airavata_deleteDataMovementInterface_args&); Airavata_deleteDataMovementInterface_args& operator=(const Airavata_deleteDataMovementInterface_args&); - Airavata_deleteDataMovementInterface_args() : resourceId(), dataMovementInterfaceId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0) { + Airavata_deleteDataMovementInterface_args() : productId(), dataMovementInterfaceId(), dataMoveType(( ::apache::airavata::model::data::movement::DMType::type)0) { } virtual ~Airavata_deleteDataMovementInterface_args() throw(); ::apache::airavata::model::security::AuthzToken authzToken; - std::string resourceId; + std::string productId; std::string dataMovementInterfaceId; ::apache::airavata::model::data::movement::DMType::type dataMoveType; void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val); - void __set_resourceId(const std::string& val); + void __set_productId(const std::string& val); void __set_dataMovementInterfaceId(const std::string& val); @@ -18115,7 +18115,7 @@ class Airavata_deleteDataMovementInterface_args { { if (!(authzToken == rhs.authzToken)) return false; - if (!(resourceId == rhs.resourceId)) + if (!(productId == rhs.productId)) return false; if (!(dataMovementInterfaceId == rhs.dataMovementInterfaceId)) return false; @@ -18141,7 +18141,7 @@ class Airavata_deleteDataMovementInterface_pargs { virtual ~Airavata_deleteDataMovementInterface_pargs() throw(); const ::apache::airavata::model::security::AuthzToken* authzToken; - const std::string* resourceId; + const std::string* productId; const std::string* dataMovementInterfaceId; const ::apache::airavata::model::data::movement::DMType::type* dataMoveType; @@ -22280,8 +22280,8 @@ class AiravataClient : virtual public AiravataIf { bool updateUnicoreJobSubmissionDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission); void send_updateUnicoreJobSubmissionDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission); bool recv_updateUnicoreJobSubmissionDetails(); - void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); - void send_addLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); + void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); + void send_addLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); void recv_addLocalDataMovementDetails(std::string& _return); bool updateLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); void send_updateLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); @@ -22289,8 +22289,8 @@ class AiravataClient : virtual public AiravataIf { void getLocalDataMovement( ::apache::airavata::model::data::movement::LOCALDataMovement& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void send_getLocalDataMovement(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void recv_getLocalDataMovement( ::apache::airavata::model::data::movement::LOCALDataMovement& _return); - void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); - void send_addSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); + void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); + void send_addSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); void recv_addSCPDataMovementDetails(std::string& _return); bool updateSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); void send_updateSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); @@ -22298,8 +22298,8 @@ class AiravataClient : virtual public AiravataIf { void getSCPDataMovement( ::apache::airavata::model::data::movement::SCPDataMovement& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void send_getSCPDataMovement(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void recv_getSCPDataMovement( ::apache::airavata::model::data::movement::SCPDataMovement& _return); - void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); - void send_addUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); + void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); + void send_addUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); void recv_addUnicoreDataMovementDetails(std::string& _return); bool updateUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); void send_updateUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); @@ -22307,8 +22307,8 @@ class AiravataClient : virtual public AiravataIf { void getUnicoreDataMovement( ::apache::airavata::model::data::movement::UnicoreDataMovement& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void send_getUnicoreDataMovement(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void recv_getUnicoreDataMovement( ::apache::airavata::model::data::movement::UnicoreDataMovement& _return); - void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); - void send_addGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); + void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); + void send_addGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); void recv_addGridFTPDataMovementDetails(std::string& _return); bool updateGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); void send_updateGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); @@ -22331,8 +22331,8 @@ class AiravataClient : virtual public AiravataIf { bool deleteJobSubmissionInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId); void send_deleteJobSubmissionInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId); bool recv_deleteJobSubmissionInterface(); - bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType); - void send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType); + bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType); + void send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType); bool recv_deleteDataMovementInterface(); void registerResourceJobManager(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager); void send_registerResourceJobManager(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager); @@ -23591,13 +23591,13 @@ class AiravataMultiface : virtual public AiravataIf { return ifaces_[i]->updateUnicoreJobSubmissionDetails(authzToken, jobSubmissionInterfaceId, unicoreJobSubmission); } - void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement) { + void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->addLocalDataMovementDetails(_return, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement); + ifaces_[i]->addLocalDataMovementDetails(_return, authzToken, productId, dataMoveType, priorityOrder, localDataMovement); } - ifaces_[i]->addLocalDataMovementDetails(_return, authzToken, resourceId, dataMoveType, priorityOrder, localDataMovement); + ifaces_[i]->addLocalDataMovementDetails(_return, authzToken, productId, dataMoveType, priorityOrder, localDataMovement); return; } @@ -23620,13 +23620,13 @@ class AiravataMultiface : virtual public AiravataIf { return; } - void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement) { + void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->addSCPDataMovementDetails(_return, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement); + ifaces_[i]->addSCPDataMovementDetails(_return, authzToken, productId, dataMoveType, priorityOrder, scpDataMovement); } - ifaces_[i]->addSCPDataMovementDetails(_return, authzToken, resourceId, dataMoveType, priorityOrder, scpDataMovement); + ifaces_[i]->addSCPDataMovementDetails(_return, authzToken, productId, dataMoveType, priorityOrder, scpDataMovement); return; } @@ -23649,13 +23649,13 @@ class AiravataMultiface : virtual public AiravataIf { return; } - void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement) { + void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->addUnicoreDataMovementDetails(_return, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement); + ifaces_[i]->addUnicoreDataMovementDetails(_return, authzToken, productId, dataMoveType, priorityOrder, unicoreDataMovement); } - ifaces_[i]->addUnicoreDataMovementDetails(_return, authzToken, resourceId, dataMoveType, priorityOrder, unicoreDataMovement); + ifaces_[i]->addUnicoreDataMovementDetails(_return, authzToken, productId, dataMoveType, priorityOrder, unicoreDataMovement); return; } @@ -23678,13 +23678,13 @@ class AiravataMultiface : virtual public AiravataIf { return; } - void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement) { + void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->addGridFTPDataMovementDetails(_return, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement); + ifaces_[i]->addGridFTPDataMovementDetails(_return, authzToken, productId, dataMoveType, priorityOrder, gridFTPDataMovement); } - ifaces_[i]->addGridFTPDataMovementDetails(_return, authzToken, resourceId, dataMoveType, priorityOrder, gridFTPDataMovement); + ifaces_[i]->addGridFTPDataMovementDetails(_return, authzToken, productId, dataMoveType, priorityOrder, gridFTPDataMovement); return; } @@ -23752,13 +23752,13 @@ class AiravataMultiface : virtual public AiravataIf { return ifaces_[i]->deleteJobSubmissionInterface(authzToken, computeResourceId, jobSubmissionInterfaceId); } - bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) { + bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) { size_t sz = ifaces_.size(); size_t i = 0; for (; i < (sz - 1); ++i) { - ifaces_[i]->deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType); + ifaces_[i]->deleteDataMovementInterface(authzToken, productId, dataMovementInterfaceId, dataMoveType); } - return ifaces_[i]->deleteDataMovementInterface(authzToken, resourceId, dataMovementInterfaceId, dataMoveType); + return ifaces_[i]->deleteDataMovementInterface(authzToken, productId, dataMovementInterfaceId, dataMoveType); } void registerResourceJobManager(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager) { @@ -24314,8 +24314,8 @@ class AiravataConcurrentClient : virtual public AiravataIf { bool updateUnicoreJobSubmissionDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission); int32_t send_updateUnicoreJobSubmissionDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission); bool recv_updateUnicoreJobSubmissionDetails(const int32_t seqid); - void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); - int32_t send_addLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); + void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); + int32_t send_addLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); void recv_addLocalDataMovementDetails(std::string& _return, const int32_t seqid); bool updateLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); int32_t send_updateLocalDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement); @@ -24323,8 +24323,8 @@ class AiravataConcurrentClient : virtual public AiravataIf { void getLocalDataMovement( ::apache::airavata::model::data::movement::LOCALDataMovement& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); int32_t send_getLocalDataMovement(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void recv_getLocalDataMovement( ::apache::airavata::model::data::movement::LOCALDataMovement& _return, const int32_t seqid); - void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); - int32_t send_addSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); + void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); + int32_t send_addSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); void recv_addSCPDataMovementDetails(std::string& _return, const int32_t seqid); bool updateSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); int32_t send_updateSCPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement); @@ -24332,8 +24332,8 @@ class AiravataConcurrentClient : virtual public AiravataIf { void getSCPDataMovement( ::apache::airavata::model::data::movement::SCPDataMovement& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); int32_t send_getSCPDataMovement(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void recv_getSCPDataMovement( ::apache::airavata::model::data::movement::SCPDataMovement& _return, const int32_t seqid); - void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); - int32_t send_addUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); + void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); + int32_t send_addUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); void recv_addUnicoreDataMovementDetails(std::string& _return, const int32_t seqid); bool updateUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); int32_t send_updateUnicoreDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement); @@ -24341,8 +24341,8 @@ class AiravataConcurrentClient : virtual public AiravataIf { void getUnicoreDataMovement( ::apache::airavata::model::data::movement::UnicoreDataMovement& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); int32_t send_getUnicoreDataMovement(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementId); void recv_getUnicoreDataMovement( ::apache::airavata::model::data::movement::UnicoreDataMovement& _return, const int32_t seqid); - void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); - int32_t send_addGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); + void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); + int32_t send_addGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); void recv_addGridFTPDataMovementDetails(std::string& _return, const int32_t seqid); bool updateGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); int32_t send_updateGridFTPDataMovementDetails(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement); @@ -24365,8 +24365,8 @@ class AiravataConcurrentClient : virtual public AiravataIf { bool deleteJobSubmissionInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId); int32_t send_deleteJobSubmissionInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId); bool recv_deleteJobSubmissionInterface(const int32_t seqid); - bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType); - int32_t send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType); + bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType); + int32_t send_deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType); bool recv_deleteDataMovementInterface(const int32_t seqid); void registerResourceJobManager(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager); int32_t send_registerResourceJobManager(const ::apache::airavata::model::security::AuthzToken& authzToken, const ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager);
http://git-wip-us.apache.org/repos/asf/airavata/blob/03afa2da/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 148db2d..c0d29ec 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 @@ -2179,7 +2179,7 @@ class AiravataHandler : virtual public 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 @@ -2197,12 +2197,12 @@ class AiravataHandler : virtual public AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param localDataMovement */ - void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement) { + void addLocalDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::LOCALDataMovement& localDataMovement) { // Your implementation goes here printf("addLocalDataMovementDetails\n"); } @@ -2255,7 +2255,7 @@ class AiravataHandler : virtual public 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 @@ -2269,12 +2269,12 @@ class AiravataHandler : virtual public AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param scpDataMovement */ - void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement) { + void addSCPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::SCPDataMovement& scpDataMovement) { // Your implementation goes here printf("addSCPDataMovementDetails\n"); } @@ -2326,7 +2326,7 @@ class AiravataHandler : virtual public 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 @@ -2340,12 +2340,12 @@ class AiravataHandler : virtual public AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param unicoreDataMovement */ - void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement) { + void addUnicoreDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::UnicoreDataMovement& unicoreDataMovement) { // Your implementation goes here printf("addUnicoreDataMovementDetails\n"); } @@ -2399,7 +2399,7 @@ class AiravataHandler : virtual public 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 @@ -2417,12 +2417,12 @@ class AiravataHandler : virtual public AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMoveType * @param priorityOrder * @param gridFTPDataMovement */ - void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement) { + void addGridFTPDataMovementDetails(std::string& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType, const int32_t priorityOrder, const ::apache::airavata::model::data::movement::GridFTPDataMovement& gridFTPDataMovement) { // Your implementation goes here printf("addGridFTPDataMovementDetails\n"); } @@ -2584,11 +2584,11 @@ class AiravataHandler : virtual public AiravataIf { * * * @param authzToken - * @param resourceId + * @param productId * @param dataMovementInterfaceId * @param dataMoveType */ - bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& resourceId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) { + bool deleteDataMovementInterface(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& productId, const std::string& dataMovementInterfaceId, const ::apache::airavata::model::data::movement::DMType::type dataMoveType) { // Your implementation goes here printf("deleteDataMovementInterface\n"); } 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.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.cpp index c7150cd..d72043d 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/data_catalog_models_types.cpp @@ -71,9 +71,9 @@ DataProductModel::~DataProductModel() throw() { } -void DataProductModel::__set_productId(const std::string& val) { - this->productId = val; -__isset.productId = true; +void DataProductModel::__set_productUri(const std::string& val) { + this->productUri = val; +__isset.productUri = true; } void DataProductModel::__set_gatewayId(const std::string& val) { @@ -81,9 +81,14 @@ void DataProductModel::__set_gatewayId(const std::string& val) { __isset.gatewayId = true; } -void DataProductModel::__set_parentProductId(const std::string& val) { - this->parentProductId = val; -__isset.parentProductId = true; +void DataProductModel::__set_parentProductUri(const std::string& val) { + this->parentProductUri = val; +__isset.parentProductUri = true; +} + +void DataProductModel::__set_logicalPath(const std::string& val) { + this->logicalPath = val; +__isset.logicalPath = true; } void DataProductModel::__set_productName(const std::string& val) { @@ -159,8 +164,8 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { { case 1: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->productId); - this->__isset.productId = true; + xfer += iprot->readString(this->productUri); + this->__isset.productUri = true; } else { xfer += iprot->skip(ftype); } @@ -175,21 +180,29 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { break; case 3: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->parentProductId); - this->__isset.parentProductId = true; + xfer += iprot->readString(this->parentProductUri); + this->__isset.parentProductUri = true; } else { xfer += iprot->skip(ftype); } break; case 4: if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->logicalPath); + this->__isset.logicalPath = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 5: + if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->productName); this->__isset.productName = true; } else { xfer += iprot->skip(ftype); } break; - case 5: + case 6: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->productDescription); this->__isset.productDescription = true; @@ -197,7 +210,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 6: + case 7: if (ftype == ::apache::thrift::protocol::T_STRING) { xfer += iprot->readString(this->ownerName); this->__isset.ownerName = true; @@ -205,7 +218,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 7: + case 8: if (ftype == ::apache::thrift::protocol::T_I32) { int32_t ecast0; xfer += iprot->readI32(ecast0); @@ -215,7 +228,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 8: + case 9: if (ftype == ::apache::thrift::protocol::T_I32) { xfer += iprot->readI32(this->productSize); this->__isset.productSize = true; @@ -223,7 +236,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 9: + case 10: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->creationTime); this->__isset.creationTime = true; @@ -231,7 +244,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 10: + case 11: if (ftype == ::apache::thrift::protocol::T_I64) { xfer += iprot->readI64(this->lastModifiedTime); this->__isset.lastModifiedTime = true; @@ -239,7 +252,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 11: + case 12: if (ftype == ::apache::thrift::protocol::T_MAP) { { this->productMetadata.clear(); @@ -262,7 +275,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 12: + case 13: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->replicaLocations.clear(); @@ -282,7 +295,7 @@ uint32_t DataProductModel::read(::apache::thrift::protocol::TProtocol* iprot) { xfer += iprot->skip(ftype); } break; - case 13: + case 14: if (ftype == ::apache::thrift::protocol::T_LIST) { { this->childProducts.clear(); @@ -319,9 +332,9 @@ uint32_t DataProductModel::write(::apache::thrift::protocol::TProtocol* oprot) c apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("DataProductModel"); - if (this->__isset.productId) { - xfer += oprot->writeFieldBegin("productId", ::apache::thrift::protocol::T_STRING, 1); - xfer += oprot->writeString(this->productId); + if (this->__isset.productUri) { + xfer += oprot->writeFieldBegin("productUri", ::apache::thrift::protocol::T_STRING, 1); + xfer += oprot->writeString(this->productUri); xfer += oprot->writeFieldEnd(); } if (this->__isset.gatewayId) { @@ -329,48 +342,53 @@ uint32_t DataProductModel::write(::apache::thrift::protocol::TProtocol* oprot) c xfer += oprot->writeString(this->gatewayId); xfer += oprot->writeFieldEnd(); } - if (this->__isset.parentProductId) { - xfer += oprot->writeFieldBegin("parentProductId", ::apache::thrift::protocol::T_STRING, 3); - xfer += oprot->writeString(this->parentProductId); + if (this->__isset.parentProductUri) { + xfer += oprot->writeFieldBegin("parentProductUri", ::apache::thrift::protocol::T_STRING, 3); + xfer += oprot->writeString(this->parentProductUri); + xfer += oprot->writeFieldEnd(); + } + if (this->__isset.logicalPath) { + xfer += oprot->writeFieldBegin("logicalPath", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeString(this->logicalPath); xfer += oprot->writeFieldEnd(); } if (this->__isset.productName) { - xfer += oprot->writeFieldBegin("productName", ::apache::thrift::protocol::T_STRING, 4); + xfer += oprot->writeFieldBegin("productName", ::apache::thrift::protocol::T_STRING, 5); xfer += oprot->writeString(this->productName); xfer += oprot->writeFieldEnd(); } if (this->__isset.productDescription) { - xfer += oprot->writeFieldBegin("productDescription", ::apache::thrift::protocol::T_STRING, 5); + xfer += oprot->writeFieldBegin("productDescription", ::apache::thrift::protocol::T_STRING, 6); xfer += oprot->writeString(this->productDescription); xfer += oprot->writeFieldEnd(); } if (this->__isset.ownerName) { - xfer += oprot->writeFieldBegin("ownerName", ::apache::thrift::protocol::T_STRING, 6); + xfer += oprot->writeFieldBegin("ownerName", ::apache::thrift::protocol::T_STRING, 7); xfer += oprot->writeString(this->ownerName); xfer += oprot->writeFieldEnd(); } if (this->__isset.dataProductType) { - xfer += oprot->writeFieldBegin("dataProductType", ::apache::thrift::protocol::T_I32, 7); + xfer += oprot->writeFieldBegin("dataProductType", ::apache::thrift::protocol::T_I32, 8); xfer += oprot->writeI32((int32_t)this->dataProductType); xfer += oprot->writeFieldEnd(); } if (this->__isset.productSize) { - xfer += oprot->writeFieldBegin("productSize", ::apache::thrift::protocol::T_I32, 8); + xfer += oprot->writeFieldBegin("productSize", ::apache::thrift::protocol::T_I32, 9); xfer += oprot->writeI32(this->productSize); xfer += oprot->writeFieldEnd(); } if (this->__isset.creationTime) { - xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 9); + xfer += oprot->writeFieldBegin("creationTime", ::apache::thrift::protocol::T_I64, 10); xfer += oprot->writeI64(this->creationTime); xfer += oprot->writeFieldEnd(); } if (this->__isset.lastModifiedTime) { - xfer += oprot->writeFieldBegin("lastModifiedTime", ::apache::thrift::protocol::T_I64, 10); + xfer += oprot->writeFieldBegin("lastModifiedTime", ::apache::thrift::protocol::T_I64, 11); xfer += oprot->writeI64(this->lastModifiedTime); xfer += oprot->writeFieldEnd(); } if (this->__isset.productMetadata) { - xfer += oprot->writeFieldBegin("productMetadata", ::apache::thrift::protocol::T_MAP, 11); + xfer += oprot->writeFieldBegin("productMetadata", ::apache::thrift::protocol::T_MAP, 12); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->productMetadata.size())); std::map<std::string, std::string> ::const_iterator _iter18; @@ -384,7 +402,7 @@ uint32_t DataProductModel::write(::apache::thrift::protocol::TProtocol* oprot) c xfer += oprot->writeFieldEnd(); } if (this->__isset.replicaLocations) { - xfer += oprot->writeFieldBegin("replicaLocations", ::apache::thrift::protocol::T_LIST, 12); + xfer += oprot->writeFieldBegin("replicaLocations", ::apache::thrift::protocol::T_LIST, 13); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->replicaLocations.size())); std::vector<DataReplicaLocationModel> ::const_iterator _iter19; @@ -397,7 +415,7 @@ uint32_t DataProductModel::write(::apache::thrift::protocol::TProtocol* oprot) c xfer += oprot->writeFieldEnd(); } if (this->__isset.childProducts) { - xfer += oprot->writeFieldBegin("childProducts", ::apache::thrift::protocol::T_LIST, 13); + xfer += oprot->writeFieldBegin("childProducts", ::apache::thrift::protocol::T_LIST, 14); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->childProducts.size())); std::vector<DataProductModel> ::const_iterator _iter20; @@ -416,9 +434,10 @@ uint32_t DataProductModel::write(::apache::thrift::protocol::TProtocol* oprot) c void swap(DataProductModel &a, DataProductModel &b) { using ::std::swap; - swap(a.productId, b.productId); + swap(a.productUri, b.productUri); swap(a.gatewayId, b.gatewayId); - swap(a.parentProductId, b.parentProductId); + swap(a.parentProductUri, b.parentProductUri); + swap(a.logicalPath, b.logicalPath); swap(a.productName, b.productName); swap(a.productDescription, b.productDescription); swap(a.ownerName, b.ownerName); @@ -433,9 +452,10 @@ void swap(DataProductModel &a, DataProductModel &b) { } DataProductModel::DataProductModel(const DataProductModel& other21) { - productId = other21.productId; + productUri = other21.productUri; gatewayId = other21.gatewayId; - parentProductId = other21.parentProductId; + parentProductUri = other21.parentProductUri; + logicalPath = other21.logicalPath; productName = other21.productName; productDescription = other21.productDescription; ownerName = other21.ownerName; @@ -449,9 +469,10 @@ DataProductModel::DataProductModel(const DataProductModel& other21) { __isset = other21.__isset; } DataProductModel& DataProductModel::operator=(const DataProductModel& other22) { - productId = other22.productId; + productUri = other22.productUri; gatewayId = other22.gatewayId; - parentProductId = other22.parentProductId; + parentProductUri = other22.parentProductUri; + logicalPath = other22.logicalPath; productName = other22.productName; productDescription = other22.productDescription; ownerName = other22.ownerName; @@ -468,9 +489,10 @@ DataProductModel& DataProductModel::operator=(const DataProductModel& other22) { void DataProductModel::printTo(std::ostream& out) const { using ::apache::thrift::to_string; out << "DataProductModel("; - out << "productId="; (__isset.productId ? (out << to_string(productId)) : (out << "<null>")); + out << "productUri="; (__isset.productUri ? (out << to_string(productUri)) : (out << "<null>")); out << ", " << "gatewayId="; (__isset.gatewayId ? (out << to_string(gatewayId)) : (out << "<null>")); - out << ", " << "parentProductId="; (__isset.parentProductId ? (out << to_string(parentProductId)) : (out << "<null>")); + out << ", " << "parentProductUri="; (__isset.parentProductUri ? (out << to_string(parentProductUri)) : (out << "<null>")); + out << ", " << "logicalPath="; (__isset.logicalPath ? (out << to_string(logicalPath)) : (out << "<null>")); out << ", " << "productName="; (__isset.productName ? (out << to_string(productName)) : (out << "<null>")); out << ", " << "productDescription="; (__isset.productDescription ? (out << to_string(productDescription)) : (out << "<null>")); out << ", " << "ownerName="; (__isset.ownerName ? (out << to_string(ownerName)) : (out << "<null>")); @@ -494,9 +516,9 @@ void DataReplicaLocationModel::__set_replicaId(const std::string& val) { __isset.replicaId = true; } -void DataReplicaLocationModel::__set_productId(const std::string& val) { - this->productId = val; -__isset.productId = true; +void DataReplicaLocationModel::__set_productUri(const std::string& val) { + this->productUri = val; +__isset.productUri = true; } void DataReplicaLocationModel::__set_replicaName(const std::string& val) { @@ -539,9 +561,9 @@ void DataReplicaLocationModel::__set_storageResourceId(const std::string& val) { __isset.storageResourceId = true; } -void DataReplicaLocationModel::__set_fileAbsolutePath(const std::string& val) { - this->fileAbsolutePath = val; -__isset.fileAbsolutePath = true; +void DataReplicaLocationModel::__set_filePath(const std::string& val) { + this->filePath = val; +__isset.filePath = true; } void DataReplicaLocationModel::__set_replicaMetadata(const std::map<std::string, std::string> & val) { @@ -580,8 +602,8 @@ uint32_t DataReplicaLocationModel::read(::apache::thrift::protocol::TProtocol* i break; case 2: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->productId); - this->__isset.productId = true; + xfer += iprot->readString(this->productUri); + this->__isset.productUri = true; } else { xfer += iprot->skip(ftype); } @@ -656,8 +678,8 @@ uint32_t DataReplicaLocationModel::read(::apache::thrift::protocol::TProtocol* i break; case 11: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->fileAbsolutePath); - this->__isset.fileAbsolutePath = true; + xfer += iprot->readString(this->filePath); + this->__isset.filePath = true; } else { xfer += iprot->skip(ftype); } @@ -707,9 +729,9 @@ uint32_t DataReplicaLocationModel::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeString(this->replicaId); xfer += oprot->writeFieldEnd(); } - if (this->__isset.productId) { - xfer += oprot->writeFieldBegin("productId", ::apache::thrift::protocol::T_STRING, 2); - xfer += oprot->writeString(this->productId); + if (this->__isset.productUri) { + xfer += oprot->writeFieldBegin("productUri", ::apache::thrift::protocol::T_STRING, 2); + xfer += oprot->writeString(this->productUri); xfer += oprot->writeFieldEnd(); } if (this->__isset.replicaName) { @@ -752,9 +774,9 @@ uint32_t DataReplicaLocationModel::write(::apache::thrift::protocol::TProtocol* xfer += oprot->writeString(this->storageResourceId); xfer += oprot->writeFieldEnd(); } - if (this->__isset.fileAbsolutePath) { - xfer += oprot->writeFieldBegin("fileAbsolutePath", ::apache::thrift::protocol::T_STRING, 11); - xfer += oprot->writeString(this->fileAbsolutePath); + if (this->__isset.filePath) { + xfer += oprot->writeFieldBegin("filePath", ::apache::thrift::protocol::T_STRING, 11); + xfer += oprot->writeString(this->filePath); xfer += oprot->writeFieldEnd(); } if (this->__isset.replicaMetadata) { @@ -779,7 +801,7 @@ uint32_t DataReplicaLocationModel::write(::apache::thrift::protocol::TProtocol* void swap(DataReplicaLocationModel &a, DataReplicaLocationModel &b) { using ::std::swap; swap(a.replicaId, b.replicaId); - swap(a.productId, b.productId); + swap(a.productUri, b.productUri); swap(a.replicaName, b.replicaName); swap(a.replicaDescription, b.replicaDescription); swap(a.creationTime, b.creationTime); @@ -788,14 +810,14 @@ void swap(DataReplicaLocationModel &a, DataReplicaLocationModel &b) { swap(a.replicaLocationCategory, b.replicaLocationCategory); swap(a.replicaPersistentType, b.replicaPersistentType); swap(a.storageResourceId, b.storageResourceId); - swap(a.fileAbsolutePath, b.fileAbsolutePath); + swap(a.filePath, b.filePath); swap(a.replicaMetadata, b.replicaMetadata); swap(a.__isset, b.__isset); } DataReplicaLocationModel::DataReplicaLocationModel(const DataReplicaLocationModel& other33) { replicaId = other33.replicaId; - productId = other33.productId; + productUri = other33.productUri; replicaName = other33.replicaName; replicaDescription = other33.replicaDescription; creationTime = other33.creationTime; @@ -804,13 +826,13 @@ DataReplicaLocationModel::DataReplicaLocationModel(const DataReplicaLocationMode replicaLocationCategory = other33.replicaLocationCategory; replicaPersistentType = other33.replicaPersistentType; storageResourceId = other33.storageResourceId; - fileAbsolutePath = other33.fileAbsolutePath; + filePath = other33.filePath; replicaMetadata = other33.replicaMetadata; __isset = other33.__isset; } DataReplicaLocationModel& DataReplicaLocationModel::operator=(const DataReplicaLocationModel& other34) { replicaId = other34.replicaId; - productId = other34.productId; + productUri = other34.productUri; replicaName = other34.replicaName; replicaDescription = other34.replicaDescription; creationTime = other34.creationTime; @@ -819,7 +841,7 @@ DataReplicaLocationModel& DataReplicaLocationModel::operator=(const DataReplicaL replicaLocationCategory = other34.replicaLocationCategory; replicaPersistentType = other34.replicaPersistentType; storageResourceId = other34.storageResourceId; - fileAbsolutePath = other34.fileAbsolutePath; + filePath = other34.filePath; replicaMetadata = other34.replicaMetadata; __isset = other34.__isset; return *this; @@ -828,7 +850,7 @@ void DataReplicaLocationModel::printTo(std::ostream& out) const { using ::apache::thrift::to_string; out << "DataReplicaLocationModel("; out << "replicaId="; (__isset.replicaId ? (out << to_string(replicaId)) : (out << "<null>")); - out << ", " << "productId="; (__isset.productId ? (out << to_string(productId)) : (out << "<null>")); + out << ", " << "productUri="; (__isset.productUri ? (out << to_string(productUri)) : (out << "<null>")); out << ", " << "replicaName="; (__isset.replicaName ? (out << to_string(replicaName)) : (out << "<null>")); out << ", " << "replicaDescription="; (__isset.replicaDescription ? (out << to_string(replicaDescription)) : (out << "<null>")); out << ", " << "creationTime="; (__isset.creationTime ? (out << to_string(creationTime)) : (out << "<null>")); @@ -837,7 +859,7 @@ void DataReplicaLocationModel::printTo(std::ostream& out) const { out << ", " << "replicaLocationCategory="; (__isset.replicaLocationCategory ? (out << to_string(replicaLocationCategory)) : (out << "<null>")); out << ", " << "replicaPersistentType="; (__isset.replicaPersistentType ? (out << to_string(replicaPersistentType)) : (out << "<null>")); out << ", " << "storageResourceId="; (__isset.storageResourceId ? (out << to_string(storageResourceId)) : (out << "<null>")); - out << ", " << "fileAbsolutePath="; (__isset.fileAbsolutePath ? (out << to_string(fileAbsolutePath)) : (out << "<null>")); + out << ", " << "filePath="; (__isset.filePath ? (out << to_string(filePath)) : (out << "<null>")); out << ", " << "replicaMetadata="; (__isset.replicaMetadata ? (out << to_string(replicaMetadata)) : (out << "<null>")); out << ")"; }
