airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [10/44] fixing typos in Airavata API and generate code for AIRAVATA-1471
Date Wed, 05 Nov 2014 18:29:58 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index 7f5e807..ca5ead1 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -15435,7 +15435,7 @@ uint32_t Airavata_updateLocalDataMovementDetails_args::read(::apache::thrift::pr
 
   using ::apache::thrift::protocol::TProtocolException;
 
-  bool isset_jobSubmissionInterfaceId = false;
+  bool isset_dataMovementInterfaceId = false;
   bool isset_localDataMovement = false;
 
   while (true)
@@ -15448,8 +15448,8 @@ uint32_t Airavata_updateLocalDataMovementDetails_args::read(::apache::thrift::pr
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->jobSubmissionInterfaceId);
-          isset_jobSubmissionInterfaceId = true;
+          xfer += iprot->readString(this->dataMovementInterfaceId);
+          isset_dataMovementInterfaceId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -15471,7 +15471,7 @@ uint32_t Airavata_updateLocalDataMovementDetails_args::read(::apache::thrift::pr
 
   xfer += iprot->readStructEnd();
 
-  if (!isset_jobSubmissionInterfaceId)
+  if (!isset_dataMovementInterfaceId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_localDataMovement)
     throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -15482,8 +15482,8 @@ uint32_t Airavata_updateLocalDataMovementDetails_args::write(::apache::thrift::p
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_updateLocalDataMovementDetails_args");
 
-  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->jobSubmissionInterfaceId);
+  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->dataMovementInterfaceId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldBegin("localDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
@@ -15499,8 +15499,8 @@ uint32_t Airavata_updateLocalDataMovementDetails_pargs::write(::apache::thrift::
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_updateLocalDataMovementDetails_pargs");
 
-  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
+  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->dataMovementInterfaceId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldBegin("localDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
@@ -16167,7 +16167,7 @@ uint32_t Airavata_updateSCPDataMovementDetails_args::read(::apache::thrift::prot
 
   using ::apache::thrift::protocol::TProtocolException;
 
-  bool isset_jobSubmissionInterfaceId = false;
+  bool isset_dataMovementInterfaceId = false;
   bool isset_scpDataMovement = false;
 
   while (true)
@@ -16180,8 +16180,8 @@ uint32_t Airavata_updateSCPDataMovementDetails_args::read(::apache::thrift::prot
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->jobSubmissionInterfaceId);
-          isset_jobSubmissionInterfaceId = true;
+          xfer += iprot->readString(this->dataMovementInterfaceId);
+          isset_dataMovementInterfaceId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -16203,7 +16203,7 @@ uint32_t Airavata_updateSCPDataMovementDetails_args::read(::apache::thrift::prot
 
   xfer += iprot->readStructEnd();
 
-  if (!isset_jobSubmissionInterfaceId)
+  if (!isset_dataMovementInterfaceId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_scpDataMovement)
     throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -16214,8 +16214,8 @@ uint32_t Airavata_updateSCPDataMovementDetails_args::write(::apache::thrift::pro
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_updateSCPDataMovementDetails_args");
 
-  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->jobSubmissionInterfaceId);
+  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->dataMovementInterfaceId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldBegin("scpDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
@@ -16231,8 +16231,8 @@ uint32_t Airavata_updateSCPDataMovementDetails_pargs::write(::apache::thrift::pr
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_updateSCPDataMovementDetails_pargs");
 
-  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
+  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->dataMovementInterfaceId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldBegin("scpDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
@@ -16899,7 +16899,7 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_args::read(::apache::thrift::
 
   using ::apache::thrift::protocol::TProtocolException;
 
-  bool isset_jobSubmissionInterfaceId = false;
+  bool isset_dataMovementInterfaceId = false;
   bool isset_gridFTPDataMovement = false;
 
   while (true)
@@ -16912,8 +16912,8 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_args::read(::apache::thrift::
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->jobSubmissionInterfaceId);
-          isset_jobSubmissionInterfaceId = true;
+          xfer += iprot->readString(this->dataMovementInterfaceId);
+          isset_dataMovementInterfaceId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -16935,7 +16935,7 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_args::read(::apache::thrift::
 
   xfer += iprot->readStructEnd();
 
-  if (!isset_jobSubmissionInterfaceId)
+  if (!isset_dataMovementInterfaceId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_gridFTPDataMovement)
     throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -16946,8 +16946,8 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_args::write(::apache::thrift:
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_updateGridFTPDataMovementDetails_args");
 
-  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->jobSubmissionInterfaceId);
+  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->dataMovementInterfaceId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldBegin("gridFTPDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
@@ -16963,8 +16963,8 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_pargs::write(::apache::thrift
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_updateGridFTPDataMovementDetails_pargs");
 
-  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
+  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->dataMovementInterfaceId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldBegin("gridFTPDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
@@ -18372,6 +18372,7 @@ uint32_t Airavata_deleteJobSubmissionInterface_args::read(::apache::thrift::prot
 
   using ::apache::thrift::protocol::TProtocolException;
 
+  bool isset_computeResourceId = false;
   bool isset_jobSubmissionInterfaceId = false;
 
   while (true)
@@ -18384,6 +18385,14 @@ uint32_t Airavata_deleteJobSubmissionInterface_args::read(::apache::thrift::prot
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->computeResourceId);
+          isset_computeResourceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->jobSubmissionInterfaceId);
           isset_jobSubmissionInterfaceId = true;
         } else {
@@ -18399,6 +18408,8 @@ uint32_t Airavata_deleteJobSubmissionInterface_args::read(::apache::thrift::prot
 
   xfer += iprot->readStructEnd();
 
+  if (!isset_computeResourceId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_jobSubmissionInterfaceId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
@@ -18408,7 +18419,11 @@ uint32_t Airavata_deleteJobSubmissionInterface_args::write(::apache::thrift::pro
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_deleteJobSubmissionInterface_args");
 
-  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->computeResourceId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString(this->jobSubmissionInterfaceId);
   xfer += oprot->writeFieldEnd();
 
@@ -18421,7 +18436,11 @@ uint32_t Airavata_deleteJobSubmissionInterface_pargs::write(::apache::thrift::pr
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_deleteJobSubmissionInterface_pargs");
 
-  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->computeResourceId)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
   xfer += oprot->writeFieldEnd();
 
@@ -18597,6 +18616,7 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
 
   using ::apache::thrift::protocol::TProtocolException;
 
+  bool isset_computeResourceId = false;
   bool isset_dataMovementInterfaceId = false;
 
   while (true)
@@ -18609,6 +18629,14 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->computeResourceId);
+          isset_computeResourceId = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->dataMovementInterfaceId);
           isset_dataMovementInterfaceId = true;
         } else {
@@ -18624,6 +18652,8 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
 
   xfer += iprot->readStructEnd();
 
+  if (!isset_computeResourceId)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_dataMovementInterfaceId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
@@ -18633,7 +18663,11 @@ uint32_t Airavata_deleteDataMovementInterface_args::write(::apache::thrift::prot
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_deleteDataMovementInterface_args");
 
-  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->computeResourceId);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString(this->dataMovementInterfaceId);
   xfer += oprot->writeFieldEnd();
 
@@ -18646,7 +18680,11 @@ uint32_t Airavata_deleteDataMovementInterface_pargs::write(::apache::thrift::pro
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("Airavata_deleteDataMovementInterface_pargs");
 
-  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->computeResourceId)));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString((*(this->dataMovementInterfaceId)));
   xfer += oprot->writeFieldEnd();
 
@@ -26165,19 +26203,19 @@ void AiravataClient::recv_addLocalDataMovementDetails(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addLocalDataMovementDetails failed: unknown result");
 }
 
-bool AiravataClient::updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement)
+bool AiravataClient::updateLocalDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement)
 {
-  send_updateLocalDataMovementDetails(jobSubmissionInterfaceId, localDataMovement);
+  send_updateLocalDataMovementDetails(dataMovementInterfaceId, localDataMovement);
   return recv_updateLocalDataMovementDetails();
 }
 
-void AiravataClient::send_updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement)
+void AiravataClient::send_updateLocalDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateLocalDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
 
   Airavata_updateLocalDataMovementDetails_pargs args;
-  args.jobSubmissionInterfaceId = &jobSubmissionInterfaceId;
+  args.dataMovementInterfaceId = &dataMovementInterfaceId;
   args.localDataMovement = &localDataMovement;
   args.write(oprot_);
 
@@ -26369,19 +26407,19 @@ void AiravataClient::recv_addSCPDataMovementDetails(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addSCPDataMovementDetails failed: unknown result");
 }
 
-bool AiravataClient::updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement)
+bool AiravataClient::updateSCPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement)
 {
-  send_updateSCPDataMovementDetails(jobSubmissionInterfaceId, scpDataMovement);
+  send_updateSCPDataMovementDetails(dataMovementInterfaceId, scpDataMovement);
   return recv_updateSCPDataMovementDetails();
 }
 
-void AiravataClient::send_updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement)
+void AiravataClient::send_updateSCPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateSCPDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
 
   Airavata_updateSCPDataMovementDetails_pargs args;
-  args.jobSubmissionInterfaceId = &jobSubmissionInterfaceId;
+  args.dataMovementInterfaceId = &dataMovementInterfaceId;
   args.scpDataMovement = &scpDataMovement;
   args.write(oprot_);
 
@@ -26573,19 +26611,19 @@ void AiravataClient::recv_addGridFTPDataMovementDetails(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGridFTPDataMovementDetails failed: unknown result");
 }
 
-bool AiravataClient::updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement)
+bool AiravataClient::updateGridFTPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement)
 {
-  send_updateGridFTPDataMovementDetails(jobSubmissionInterfaceId, gridFTPDataMovement);
+  send_updateGridFTPDataMovementDetails(dataMovementInterfaceId, gridFTPDataMovement);
   return recv_updateGridFTPDataMovementDetails();
 }
 
-void AiravataClient::send_updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement)
+void AiravataClient::send_updateGridFTPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("updateGridFTPDataMovementDetails", ::apache::thrift::protocol::T_CALL, cseqid);
 
   Airavata_updateGridFTPDataMovementDetails_pargs args;
-  args.jobSubmissionInterfaceId = &jobSubmissionInterfaceId;
+  args.dataMovementInterfaceId = &dataMovementInterfaceId;
   args.gridFTPDataMovement = &gridFTPDataMovement;
   args.write(oprot_);
 
@@ -26978,18 +27016,19 @@ bool AiravataClient::recv_changeDataMovementPriorities()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "changeDataMovementPriorities failed: unknown result");
 }
 
-bool AiravataClient::deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId)
+bool AiravataClient::deleteJobSubmissionInterface(const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId)
 {
-  send_deleteJobSubmissionInterface(jobSubmissionInterfaceId);
+  send_deleteJobSubmissionInterface(computeResourceId, jobSubmissionInterfaceId);
   return recv_deleteJobSubmissionInterface();
 }
 
-void AiravataClient::send_deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId)
+void AiravataClient::send_deleteJobSubmissionInterface(const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("deleteJobSubmissionInterface", ::apache::thrift::protocol::T_CALL, cseqid);
 
   Airavata_deleteJobSubmissionInterface_pargs args;
+  args.computeResourceId = &computeResourceId;
   args.jobSubmissionInterfaceId = &jobSubmissionInterfaceId;
   args.write(oprot_);
 
@@ -27045,18 +27084,19 @@ bool AiravataClient::recv_deleteJobSubmissionInterface()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteJobSubmissionInterface failed: unknown result");
 }
 
-bool AiravataClient::deleteDataMovementInterface(const std::string& dataMovementInterfaceId)
+bool AiravataClient::deleteDataMovementInterface(const std::string& computeResourceId, const std::string& dataMovementInterfaceId)
 {
-  send_deleteDataMovementInterface(dataMovementInterfaceId);
+  send_deleteDataMovementInterface(computeResourceId, dataMovementInterfaceId);
   return recv_deleteDataMovementInterface();
 }
 
-void AiravataClient::send_deleteDataMovementInterface(const std::string& dataMovementInterfaceId)
+void AiravataClient::send_deleteDataMovementInterface(const std::string& computeResourceId, const std::string& dataMovementInterfaceId)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("deleteDataMovementInterface", ::apache::thrift::protocol::T_CALL, cseqid);
 
   Airavata_deleteDataMovementInterface_pargs args;
+  args.computeResourceId = &computeResourceId;
   args.dataMovementInterfaceId = &dataMovementInterfaceId;
   args.write(oprot_);
 
@@ -32023,7 +32063,7 @@ void AiravataProcessor::process_updateLocalDataMovementDetails(int32_t seqid, ::
 
   Airavata_updateLocalDataMovementDetails_result result;
   try {
-    result.success = iface_->updateLocalDataMovementDetails(args.jobSubmissionInterfaceId, args.localDataMovement);
+    result.success = iface_->updateLocalDataMovementDetails(args.dataMovementInterfaceId, args.localDataMovement);
     result.__isset.success = true;
   } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
@@ -32212,7 +32252,7 @@ void AiravataProcessor::process_updateSCPDataMovementDetails(int32_t seqid, ::ap
 
   Airavata_updateSCPDataMovementDetails_result result;
   try {
-    result.success = iface_->updateSCPDataMovementDetails(args.jobSubmissionInterfaceId, args.scpDataMovement);
+    result.success = iface_->updateSCPDataMovementDetails(args.dataMovementInterfaceId, args.scpDataMovement);
     result.__isset.success = true;
   } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
@@ -32401,7 +32441,7 @@ void AiravataProcessor::process_updateGridFTPDataMovementDetails(int32_t seqid,
 
   Airavata_updateGridFTPDataMovementDetails_result result;
   try {
-    result.success = iface_->updateGridFTPDataMovementDetails(args.jobSubmissionInterfaceId, args.gridFTPDataMovement);
+    result.success = iface_->updateGridFTPDataMovementDetails(args.dataMovementInterfaceId, args.gridFTPDataMovement);
     result.__isset.success = true;
   } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
@@ -32779,7 +32819,7 @@ void AiravataProcessor::process_deleteJobSubmissionInterface(int32_t seqid, ::ap
 
   Airavata_deleteJobSubmissionInterface_result result;
   try {
-    result.success = iface_->deleteJobSubmissionInterface(args.jobSubmissionInterfaceId);
+    result.success = iface_->deleteJobSubmissionInterface(args.computeResourceId, args.jobSubmissionInterfaceId);
     result.__isset.success = true;
   } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
@@ -32842,7 +32882,7 @@ void AiravataProcessor::process_deleteDataMovementInterface(int32_t seqid, ::apa
 
   Airavata_deleteDataMovementInterface_result result;
   try {
-    result.success = iface_->deleteDataMovementInterface(args.dataMovementInterfaceId);
+    result.success = iface_->deleteDataMovementInterface(args.computeResourceId, args.dataMovementInterfaceId);
     result.__isset.success = true;
   } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;

http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/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 d5eb326..a6168dd 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
@@ -95,20 +95,20 @@ class AiravataIf {
   virtual bool updateSSHJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SSHJobSubmission& sshJobSubmission) = 0;
   virtual bool updateCloudJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::CloudJobSubmission& sshJobSubmission) = 0;
   virtual void addLocalDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) = 0;
-  virtual bool updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) = 0;
+  virtual bool updateLocalDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) = 0;
   virtual void getLocalDataMovement( ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& _return, const std::string& dataMovementId) = 0;
   virtual void addSCPDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) = 0;
-  virtual bool updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) = 0;
+  virtual bool updateSCPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) = 0;
   virtual void getSCPDataMovement( ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& _return, const std::string& dataMovementId) = 0;
   virtual void addGridFTPDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) = 0;
-  virtual bool updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) = 0;
+  virtual bool updateGridFTPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) = 0;
   virtual void getGridFTPDataMovement( ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& _return, const std::string& dataMovementId) = 0;
   virtual bool changeJobSubmissionPriority(const std::string& jobSubmissionInterfaceId, const int32_t newPriorityOrder) = 0;
   virtual bool changeDataMovementPriority(const std::string& dataMovementInterfaceId, const int32_t newPriorityOrder) = 0;
   virtual bool changeJobSubmissionPriorities(const std::map<std::string, int32_t> & jobSubmissionPriorityMap) = 0;
   virtual bool changeDataMovementPriorities(const std::map<std::string, int32_t> & dataMovementPriorityMap) = 0;
-  virtual bool deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId) = 0;
-  virtual bool deleteDataMovementInterface(const std::string& dataMovementInterfaceId) = 0;
+  virtual bool deleteJobSubmissionInterface(const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId) = 0;
+  virtual bool deleteDataMovementInterface(const std::string& computeResourceId, const std::string& dataMovementInterfaceId) = 0;
   virtual void registerResourceJobManager(std::string& _return, const  ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager) = 0;
   virtual bool updateResourceJobManager(const std::string& resourceJobManagerId, const  ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& updatedResourceJobManager) = 0;
   virtual void getResourceJobManager( ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& _return, const std::string& resourceJobManagerId) = 0;
@@ -352,7 +352,7 @@ class AiravataNull : virtual public AiravataIf {
   void addLocalDataMovementDetails(std::string& /* _return */, const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& /* localDataMovement */) {
     return;
   }
-  bool updateLocalDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& /* localDataMovement */) {
+  bool updateLocalDataMovementDetails(const std::string& /* dataMovementInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& /* localDataMovement */) {
     bool _return = false;
     return _return;
   }
@@ -362,7 +362,7 @@ class AiravataNull : virtual public AiravataIf {
   void addSCPDataMovementDetails(std::string& /* _return */, const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& /* scpDataMovement */) {
     return;
   }
-  bool updateSCPDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& /* scpDataMovement */) {
+  bool updateSCPDataMovementDetails(const std::string& /* dataMovementInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& /* scpDataMovement */) {
     bool _return = false;
     return _return;
   }
@@ -372,7 +372,7 @@ class AiravataNull : virtual public AiravataIf {
   void addGridFTPDataMovementDetails(std::string& /* _return */, const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& /* gridFTPDataMovement */) {
     return;
   }
-  bool updateGridFTPDataMovementDetails(const std::string& /* jobSubmissionInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& /* gridFTPDataMovement */) {
+  bool updateGridFTPDataMovementDetails(const std::string& /* dataMovementInterfaceId */, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& /* gridFTPDataMovement */) {
     bool _return = false;
     return _return;
   }
@@ -395,11 +395,11 @@ class AiravataNull : virtual public AiravataIf {
     bool _return = false;
     return _return;
   }
-  bool deleteJobSubmissionInterface(const std::string& /* jobSubmissionInterfaceId */) {
+  bool deleteJobSubmissionInterface(const std::string& /* computeResourceId */, const std::string& /* jobSubmissionInterfaceId */) {
     bool _return = false;
     return _return;
   }
-  bool deleteDataMovementInterface(const std::string& /* dataMovementInterfaceId */) {
+  bool deleteDataMovementInterface(const std::string& /* computeResourceId */, const std::string& /* dataMovementInterfaceId */) {
     bool _return = false;
     return _return;
   }
@@ -9010,16 +9010,16 @@ class Airavata_addLocalDataMovementDetails_presult {
 class Airavata_updateLocalDataMovementDetails_args {
  public:
 
-  Airavata_updateLocalDataMovementDetails_args() : jobSubmissionInterfaceId() {
+  Airavata_updateLocalDataMovementDetails_args() : dataMovementInterfaceId() {
   }
 
   virtual ~Airavata_updateLocalDataMovementDetails_args() throw() {}
 
-  std::string jobSubmissionInterfaceId;
+  std::string dataMovementInterfaceId;
    ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement localDataMovement;
 
-  void __set_jobSubmissionInterfaceId(const std::string& val) {
-    jobSubmissionInterfaceId = val;
+  void __set_dataMovementInterfaceId(const std::string& val) {
+    dataMovementInterfaceId = val;
   }
 
   void __set_localDataMovement(const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& val) {
@@ -9028,7 +9028,7 @@ class Airavata_updateLocalDataMovementDetails_args {
 
   bool operator == (const Airavata_updateLocalDataMovementDetails_args & rhs) const
   {
-    if (!(jobSubmissionInterfaceId == rhs.jobSubmissionInterfaceId))
+    if (!(dataMovementInterfaceId == rhs.dataMovementInterfaceId))
       return false;
     if (!(localDataMovement == rhs.localDataMovement))
       return false;
@@ -9052,7 +9052,7 @@ class Airavata_updateLocalDataMovementDetails_pargs {
 
   virtual ~Airavata_updateLocalDataMovementDetails_pargs() throw() {}
 
-  const std::string* jobSubmissionInterfaceId;
+  const std::string* dataMovementInterfaceId;
   const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement* localDataMovement;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -9430,16 +9430,16 @@ class Airavata_addSCPDataMovementDetails_presult {
 class Airavata_updateSCPDataMovementDetails_args {
  public:
 
-  Airavata_updateSCPDataMovementDetails_args() : jobSubmissionInterfaceId() {
+  Airavata_updateSCPDataMovementDetails_args() : dataMovementInterfaceId() {
   }
 
   virtual ~Airavata_updateSCPDataMovementDetails_args() throw() {}
 
-  std::string jobSubmissionInterfaceId;
+  std::string dataMovementInterfaceId;
    ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement scpDataMovement;
 
-  void __set_jobSubmissionInterfaceId(const std::string& val) {
-    jobSubmissionInterfaceId = val;
+  void __set_dataMovementInterfaceId(const std::string& val) {
+    dataMovementInterfaceId = val;
   }
 
   void __set_scpDataMovement(const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& val) {
@@ -9448,7 +9448,7 @@ class Airavata_updateSCPDataMovementDetails_args {
 
   bool operator == (const Airavata_updateSCPDataMovementDetails_args & rhs) const
   {
-    if (!(jobSubmissionInterfaceId == rhs.jobSubmissionInterfaceId))
+    if (!(dataMovementInterfaceId == rhs.dataMovementInterfaceId))
       return false;
     if (!(scpDataMovement == rhs.scpDataMovement))
       return false;
@@ -9472,7 +9472,7 @@ class Airavata_updateSCPDataMovementDetails_pargs {
 
   virtual ~Airavata_updateSCPDataMovementDetails_pargs() throw() {}
 
-  const std::string* jobSubmissionInterfaceId;
+  const std::string* dataMovementInterfaceId;
   const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement* scpDataMovement;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -9850,16 +9850,16 @@ class Airavata_addGridFTPDataMovementDetails_presult {
 class Airavata_updateGridFTPDataMovementDetails_args {
  public:
 
-  Airavata_updateGridFTPDataMovementDetails_args() : jobSubmissionInterfaceId() {
+  Airavata_updateGridFTPDataMovementDetails_args() : dataMovementInterfaceId() {
   }
 
   virtual ~Airavata_updateGridFTPDataMovementDetails_args() throw() {}
 
-  std::string jobSubmissionInterfaceId;
+  std::string dataMovementInterfaceId;
    ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement gridFTPDataMovement;
 
-  void __set_jobSubmissionInterfaceId(const std::string& val) {
-    jobSubmissionInterfaceId = val;
+  void __set_dataMovementInterfaceId(const std::string& val) {
+    dataMovementInterfaceId = val;
   }
 
   void __set_gridFTPDataMovement(const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& val) {
@@ -9868,7 +9868,7 @@ class Airavata_updateGridFTPDataMovementDetails_args {
 
   bool operator == (const Airavata_updateGridFTPDataMovementDetails_args & rhs) const
   {
-    if (!(jobSubmissionInterfaceId == rhs.jobSubmissionInterfaceId))
+    if (!(dataMovementInterfaceId == rhs.dataMovementInterfaceId))
       return false;
     if (!(gridFTPDataMovement == rhs.gridFTPDataMovement))
       return false;
@@ -9892,7 +9892,7 @@ class Airavata_updateGridFTPDataMovementDetails_pargs {
 
   virtual ~Airavata_updateGridFTPDataMovementDetails_pargs() throw() {}
 
-  const std::string* jobSubmissionInterfaceId;
+  const std::string* dataMovementInterfaceId;
   const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement* gridFTPDataMovement;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -10666,19 +10666,26 @@ class Airavata_changeDataMovementPriorities_presult {
 class Airavata_deleteJobSubmissionInterface_args {
  public:
 
-  Airavata_deleteJobSubmissionInterface_args() : jobSubmissionInterfaceId() {
+  Airavata_deleteJobSubmissionInterface_args() : computeResourceId(), jobSubmissionInterfaceId() {
   }
 
   virtual ~Airavata_deleteJobSubmissionInterface_args() throw() {}
 
+  std::string computeResourceId;
   std::string jobSubmissionInterfaceId;
 
+  void __set_computeResourceId(const std::string& val) {
+    computeResourceId = val;
+  }
+
   void __set_jobSubmissionInterfaceId(const std::string& val) {
     jobSubmissionInterfaceId = val;
   }
 
   bool operator == (const Airavata_deleteJobSubmissionInterface_args & rhs) const
   {
+    if (!(computeResourceId == rhs.computeResourceId))
+      return false;
     if (!(jobSubmissionInterfaceId == rhs.jobSubmissionInterfaceId))
       return false;
     return true;
@@ -10701,6 +10708,7 @@ class Airavata_deleteJobSubmissionInterface_pargs {
 
   virtual ~Airavata_deleteJobSubmissionInterface_pargs() throw() {}
 
+  const std::string* computeResourceId;
   const std::string* jobSubmissionInterfaceId;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -10798,19 +10806,26 @@ class Airavata_deleteJobSubmissionInterface_presult {
 class Airavata_deleteDataMovementInterface_args {
  public:
 
-  Airavata_deleteDataMovementInterface_args() : dataMovementInterfaceId() {
+  Airavata_deleteDataMovementInterface_args() : computeResourceId(), dataMovementInterfaceId() {
   }
 
   virtual ~Airavata_deleteDataMovementInterface_args() throw() {}
 
+  std::string computeResourceId;
   std::string dataMovementInterfaceId;
 
+  void __set_computeResourceId(const std::string& val) {
+    computeResourceId = val;
+  }
+
   void __set_dataMovementInterfaceId(const std::string& val) {
     dataMovementInterfaceId = val;
   }
 
   bool operator == (const Airavata_deleteDataMovementInterface_args & rhs) const
   {
+    if (!(computeResourceId == rhs.computeResourceId))
+      return false;
     if (!(dataMovementInterfaceId == rhs.dataMovementInterfaceId))
       return false;
     return true;
@@ -10833,6 +10848,7 @@ class Airavata_deleteDataMovementInterface_pargs {
 
   virtual ~Airavata_deleteDataMovementInterface_pargs() throw() {}
 
+  const std::string* computeResourceId;
   const std::string* dataMovementInterfaceId;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -12915,8 +12931,8 @@ class AiravataClient : virtual public AiravataIf {
   void addLocalDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement);
   void send_addLocalDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement);
   void recv_addLocalDataMovementDetails(std::string& _return);
-  bool updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement);
-  void send_updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement);
+  bool updateLocalDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement);
+  void send_updateLocalDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement);
   bool recv_updateLocalDataMovementDetails();
   void getLocalDataMovement( ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& _return, const std::string& dataMovementId);
   void send_getLocalDataMovement(const std::string& dataMovementId);
@@ -12924,8 +12940,8 @@ class AiravataClient : virtual public AiravataIf {
   void addSCPDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement);
   void send_addSCPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement);
   void recv_addSCPDataMovementDetails(std::string& _return);
-  bool updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement);
-  void send_updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement);
+  bool updateSCPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement);
+  void send_updateSCPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement);
   bool recv_updateSCPDataMovementDetails();
   void getSCPDataMovement( ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& _return, const std::string& dataMovementId);
   void send_getSCPDataMovement(const std::string& dataMovementId);
@@ -12933,8 +12949,8 @@ class AiravataClient : virtual public AiravataIf {
   void addGridFTPDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement);
   void send_addGridFTPDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement);
   void recv_addGridFTPDataMovementDetails(std::string& _return);
-  bool updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement);
-  void send_updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement);
+  bool updateGridFTPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement);
+  void send_updateGridFTPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement);
   bool recv_updateGridFTPDataMovementDetails();
   void getGridFTPDataMovement( ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& _return, const std::string& dataMovementId);
   void send_getGridFTPDataMovement(const std::string& dataMovementId);
@@ -12951,11 +12967,11 @@ class AiravataClient : virtual public AiravataIf {
   bool changeDataMovementPriorities(const std::map<std::string, int32_t> & dataMovementPriorityMap);
   void send_changeDataMovementPriorities(const std::map<std::string, int32_t> & dataMovementPriorityMap);
   bool recv_changeDataMovementPriorities();
-  bool deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId);
-  void send_deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId);
+  bool deleteJobSubmissionInterface(const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId);
+  void send_deleteJobSubmissionInterface(const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId);
   bool recv_deleteJobSubmissionInterface();
-  bool deleteDataMovementInterface(const std::string& dataMovementInterfaceId);
-  void send_deleteDataMovementInterface(const std::string& dataMovementInterfaceId);
+  bool deleteDataMovementInterface(const std::string& computeResourceId, const std::string& dataMovementInterfaceId);
+  void send_deleteDataMovementInterface(const std::string& computeResourceId, const std::string& dataMovementInterfaceId);
   bool recv_deleteDataMovementInterface();
   void registerResourceJobManager(std::string& _return, const  ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager);
   void send_registerResourceJobManager(const  ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager);
@@ -13834,13 +13850,13 @@ class AiravataMultiface : virtual public AiravataIf {
     return;
   }
 
-  bool updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
+  bool updateLocalDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
-      ifaces_[i]->updateLocalDataMovementDetails(jobSubmissionInterfaceId, localDataMovement);
+      ifaces_[i]->updateLocalDataMovementDetails(dataMovementInterfaceId, localDataMovement);
     }
-    return ifaces_[i]->updateLocalDataMovementDetails(jobSubmissionInterfaceId, localDataMovement);
+    return ifaces_[i]->updateLocalDataMovementDetails(dataMovementInterfaceId, localDataMovement);
   }
 
   void getLocalDataMovement( ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& _return, const std::string& dataMovementId) {
@@ -13863,13 +13879,13 @@ class AiravataMultiface : virtual public AiravataIf {
     return;
   }
 
-  bool updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) {
+  bool updateSCPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
-      ifaces_[i]->updateSCPDataMovementDetails(jobSubmissionInterfaceId, scpDataMovement);
+      ifaces_[i]->updateSCPDataMovementDetails(dataMovementInterfaceId, scpDataMovement);
     }
-    return ifaces_[i]->updateSCPDataMovementDetails(jobSubmissionInterfaceId, scpDataMovement);
+    return ifaces_[i]->updateSCPDataMovementDetails(dataMovementInterfaceId, scpDataMovement);
   }
 
   void getSCPDataMovement( ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& _return, const std::string& dataMovementId) {
@@ -13892,13 +13908,13 @@ class AiravataMultiface : virtual public AiravataIf {
     return;
   }
 
-  bool updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
+  bool updateGridFTPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
-      ifaces_[i]->updateGridFTPDataMovementDetails(jobSubmissionInterfaceId, gridFTPDataMovement);
+      ifaces_[i]->updateGridFTPDataMovementDetails(dataMovementInterfaceId, gridFTPDataMovement);
     }
-    return ifaces_[i]->updateGridFTPDataMovementDetails(jobSubmissionInterfaceId, gridFTPDataMovement);
+    return ifaces_[i]->updateGridFTPDataMovementDetails(dataMovementInterfaceId, gridFTPDataMovement);
   }
 
   void getGridFTPDataMovement( ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& _return, const std::string& dataMovementId) {
@@ -13947,22 +13963,22 @@ class AiravataMultiface : virtual public AiravataIf {
     return ifaces_[i]->changeDataMovementPriorities(dataMovementPriorityMap);
   }
 
-  bool deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId) {
+  bool deleteJobSubmissionInterface(const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
-      ifaces_[i]->deleteJobSubmissionInterface(jobSubmissionInterfaceId);
+      ifaces_[i]->deleteJobSubmissionInterface(computeResourceId, jobSubmissionInterfaceId);
     }
-    return ifaces_[i]->deleteJobSubmissionInterface(jobSubmissionInterfaceId);
+    return ifaces_[i]->deleteJobSubmissionInterface(computeResourceId, jobSubmissionInterfaceId);
   }
 
-  bool deleteDataMovementInterface(const std::string& dataMovementInterfaceId) {
+  bool deleteDataMovementInterface(const std::string& computeResourceId, const std::string& dataMovementInterfaceId) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
-      ifaces_[i]->deleteDataMovementInterface(dataMovementInterfaceId);
+      ifaces_[i]->deleteDataMovementInterface(computeResourceId, dataMovementInterfaceId);
     }
-    return ifaces_[i]->deleteDataMovementInterface(dataMovementInterfaceId);
+    return ifaces_[i]->deleteDataMovementInterface(computeResourceId, dataMovementInterfaceId);
   }
 
   void registerResourceJobManager(std::string& _return, const  ::apache::airavata::model::appcatalog::computeresource::ResourceJobManager& resourceJobManager) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/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 fde48c0..4f36e0a 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
@@ -354,7 +354,7 @@ class AiravataHandler : virtual public AiravataIf {
     printf("addLocalDataMovementDetails\n");
   }
 
-  bool updateLocalDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
+  bool updateLocalDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
     // Your implementation goes here
     printf("updateLocalDataMovementDetails\n");
   }
@@ -369,7 +369,7 @@ class AiravataHandler : virtual public AiravataIf {
     printf("addSCPDataMovementDetails\n");
   }
 
-  bool updateSCPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) {
+  bool updateSCPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& scpDataMovement) {
     // Your implementation goes here
     printf("updateSCPDataMovementDetails\n");
   }
@@ -384,7 +384,7 @@ class AiravataHandler : virtual public AiravataIf {
     printf("addGridFTPDataMovementDetails\n");
   }
 
-  bool updateGridFTPDataMovementDetails(const std::string& jobSubmissionInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
+  bool updateGridFTPDataMovementDetails(const std::string& dataMovementInterfaceId, const  ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
     // Your implementation goes here
     printf("updateGridFTPDataMovementDetails\n");
   }
@@ -414,12 +414,12 @@ class AiravataHandler : virtual public AiravataIf {
     printf("changeDataMovementPriorities\n");
   }
 
-  bool deleteJobSubmissionInterface(const std::string& jobSubmissionInterfaceId) {
+  bool deleteJobSubmissionInterface(const std::string& computeResourceId, const std::string& jobSubmissionInterfaceId) {
     // Your implementation goes here
     printf("deleteJobSubmissionInterface\n");
   }
 
-  bool deleteDataMovementInterface(const std::string& dataMovementInterfaceId) {
+  bool deleteDataMovementInterface(const std::string& computeResourceId, const std::string& dataMovementInterfaceId) {
     // Your implementation goes here
     printf("deleteDataMovementInterface\n");
   }

http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.cpp
index 6b68a3a..546e96e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.cpp
@@ -23,7 +23,7 @@
  */
 #include "Workflow.h"
 
-namespace airavata { namespace api { namespace workflow {
+namespace apache { namespace airavata { namespace api {
 
 uint32_t Workflow_getAllWorkflows_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
@@ -94,14 +94,14 @@ uint32_t Workflow_getAllWorkflows_result::read(::apache::thrift::protocol::TProt
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             this->success.clear();
-            uint32_t _size0;
-            ::apache::thrift::protocol::TType _etype3;
-            xfer += iprot->readListBegin(_etype3, _size0);
-            this->success.resize(_size0);
-            uint32_t _i4;
-            for (_i4 = 0; _i4 < _size0; ++_i4)
+            uint32_t _size277;
+            ::apache::thrift::protocol::TType _etype280;
+            xfer += iprot->readListBegin(_etype280, _size277);
+            this->success.resize(_size277);
+            uint32_t _i281;
+            for (_i281 = 0; _i281 < _size277; ++_i281)
             {
-              xfer += iprot->readString(this->success[_i4]);
+              xfer += iprot->readString(this->success[_i281]);
             }
             xfer += iprot->readListEnd();
           }
@@ -156,10 +156,10 @@ uint32_t Workflow_getAllWorkflows_result::write(::apache::thrift::protocol::TPro
     xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
     {
       xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->success.size()));
-      std::vector<std::string> ::const_iterator _iter5;
-      for (_iter5 = this->success.begin(); _iter5 != this->success.end(); ++_iter5)
+      std::vector<std::string> ::const_iterator _iter282;
+      for (_iter282 = this->success.begin(); _iter282 != this->success.end(); ++_iter282)
       {
-        xfer += oprot->writeString((*_iter5));
+        xfer += oprot->writeString((*_iter282));
       }
       xfer += oprot->writeListEnd();
     }
@@ -206,14 +206,14 @@ uint32_t Workflow_getAllWorkflows_presult::read(::apache::thrift::protocol::TPro
         if (ftype == ::apache::thrift::protocol::T_LIST) {
           {
             (*(this->success)).clear();
-            uint32_t _size6;
-            ::apache::thrift::protocol::TType _etype9;
-            xfer += iprot->readListBegin(_etype9, _size6);
-            (*(this->success)).resize(_size6);
-            uint32_t _i10;
-            for (_i10 = 0; _i10 < _size6; ++_i10)
+            uint32_t _size283;
+            ::apache::thrift::protocol::TType _etype286;
+            xfer += iprot->readListBegin(_etype286, _size283);
+            (*(this->success)).resize(_size283);
+            uint32_t _i287;
+            for (_i287 = 0; _i287 < _size283; ++_i287)
             {
-              xfer += iprot->readString((*(this->success))[_i10]);
+              xfer += iprot->readString((*(this->success))[_i287]);
             }
             xfer += iprot->readListEnd();
           }

http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.h
index 508f173..31fdfe0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow.h
@@ -25,9 +25,9 @@
 #define Workflow_H
 
 #include <thrift/TDispatchProcessor.h>
-#include "workflowAPI_types.h"
+#include "airavataAPI_types.h"
 
-namespace airavata { namespace api { namespace workflow {
+namespace apache { namespace airavata { namespace api {
 
 class WorkflowIf {
  public:

http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow_server.skeleton.cpp
index c7233c5..6f2b207 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Workflow_server.skeleton.cpp
@@ -31,7 +31,7 @@ using namespace ::apache::thrift::server;
 
 using boost::shared_ptr;
 
-using namespace  ::airavata::api::workflow;
+using namespace  ::apache::airavata::api;
 
 class WorkflowHandler : virtual public WorkflowIf {
  public:

http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_types.h
index a5cf8d6..54edb43 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/airavataAPI_types.h
@@ -38,6 +38,7 @@
 #include "applicationDeploymentModel_types.h"
 #include "applicationInterfaceModel_types.h"
 #include "gatewayResourceProfileModel_types.h"
+#include "workflowDataModel_types.h"
 
 
 namespace apache { namespace airavata { namespace api {

http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/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 3181377..08c075b 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
@@ -80,20 +80,20 @@ interface AiravataIf {
   public function updateSSHJobSubmissionDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SSHJobSubmission $sshJobSubmission);
   public function updateCloudJobSubmissionDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\CloudJobSubmission $sshJobSubmission);
   public function addLocalDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
-  public function updateLocalDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
+  public function updateLocalDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement);
   public function getLocalDataMovement($dataMovementId);
   public function addSCPDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
-  public function updateSCPDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
+  public function updateSCPDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
   public function getSCPDataMovement($dataMovementId);
   public function addGridFTPDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
-  public function updateGridFTPDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
+  public function updateGridFTPDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
   public function getGridFTPDataMovement($dataMovementId);
   public function changeJobSubmissionPriority($jobSubmissionInterfaceId, $newPriorityOrder);
   public function changeDataMovementPriority($dataMovementInterfaceId, $newPriorityOrder);
   public function changeJobSubmissionPriorities($jobSubmissionPriorityMap);
   public function changeDataMovementPriorities($dataMovementPriorityMap);
-  public function deleteJobSubmissionInterface($jobSubmissionInterfaceId);
-  public function deleteDataMovementInterface($dataMovementInterfaceId);
+  public function deleteJobSubmissionInterface($computeResourceId, $jobSubmissionInterfaceId);
+  public function deleteDataMovementInterface($computeResourceId, $dataMovementInterfaceId);
   public function registerResourceJobManager(\Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager $resourceJobManager);
   public function updateResourceJobManager($resourceJobManagerId, \Airavata\Model\AppCatalog\ComputeResource\ResourceJobManager $updatedResourceJobManager);
   public function getResourceJobManager($resourceJobManagerId);
@@ -3936,16 +3936,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addLocalDataMovementDetails failed: unknown result");
   }
 
-  public function updateLocalDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+  public function updateLocalDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
   {
-    $this->send_updateLocalDataMovementDetails($jobSubmissionInterfaceId, $localDataMovement);
+    $this->send_updateLocalDataMovementDetails($dataMovementInterfaceId, $localDataMovement);
     return $this->recv_updateLocalDataMovementDetails();
   }
 
-  public function send_updateLocalDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
+  public function send_updateLocalDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
   {
     $args = new \Airavata\API\Airavata_updateLocalDataMovementDetails_args();
-    $args->jobSubmissionInterfaceId = $jobSubmissionInterfaceId;
+    $args->dataMovementInterfaceId = $dataMovementInterfaceId;
     $args->localDataMovement = $localDataMovement;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
@@ -4119,16 +4119,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addSCPDataMovementDetails failed: unknown result");
   }
 
-  public function updateSCPDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+  public function updateSCPDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
   {
-    $this->send_updateSCPDataMovementDetails($jobSubmissionInterfaceId, $scpDataMovement);
+    $this->send_updateSCPDataMovementDetails($dataMovementInterfaceId, $scpDataMovement);
     return $this->recv_updateSCPDataMovementDetails();
   }
 
-  public function send_updateSCPDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
+  public function send_updateSCPDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement)
   {
     $args = new \Airavata\API\Airavata_updateSCPDataMovementDetails_args();
-    $args->jobSubmissionInterfaceId = $jobSubmissionInterfaceId;
+    $args->dataMovementInterfaceId = $dataMovementInterfaceId;
     $args->scpDataMovement = $scpDataMovement;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
@@ -4302,16 +4302,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("addGridFTPDataMovementDetails failed: unknown result");
   }
 
-  public function updateGridFTPDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+  public function updateGridFTPDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
   {
-    $this->send_updateGridFTPDataMovementDetails($jobSubmissionInterfaceId, $gridFTPDataMovement);
+    $this->send_updateGridFTPDataMovementDetails($dataMovementInterfaceId, $gridFTPDataMovement);
     return $this->recv_updateGridFTPDataMovementDetails();
   }
 
-  public function send_updateGridFTPDataMovementDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
+  public function send_updateGridFTPDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
   {
     $args = new \Airavata\API\Airavata_updateGridFTPDataMovementDetails_args();
-    $args->jobSubmissionInterfaceId = $jobSubmissionInterfaceId;
+    $args->dataMovementInterfaceId = $dataMovementInterfaceId;
     $args->gridFTPDataMovement = $gridFTPDataMovement;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
@@ -4665,15 +4665,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("changeDataMovementPriorities failed: unknown result");
   }
 
-  public function deleteJobSubmissionInterface($jobSubmissionInterfaceId)
+  public function deleteJobSubmissionInterface($computeResourceId, $jobSubmissionInterfaceId)
   {
-    $this->send_deleteJobSubmissionInterface($jobSubmissionInterfaceId);
+    $this->send_deleteJobSubmissionInterface($computeResourceId, $jobSubmissionInterfaceId);
     return $this->recv_deleteJobSubmissionInterface();
   }
 
-  public function send_deleteJobSubmissionInterface($jobSubmissionInterfaceId)
+  public function send_deleteJobSubmissionInterface($computeResourceId, $jobSubmissionInterfaceId)
   {
     $args = new \Airavata\API\Airavata_deleteJobSubmissionInterface_args();
+    $args->computeResourceId = $computeResourceId;
     $args->jobSubmissionInterfaceId = $jobSubmissionInterfaceId;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
@@ -4725,15 +4726,16 @@ class AiravataClient implements \Airavata\API\AiravataIf {
     throw new \Exception("deleteJobSubmissionInterface failed: unknown result");
   }
 
-  public function deleteDataMovementInterface($dataMovementInterfaceId)
+  public function deleteDataMovementInterface($computeResourceId, $dataMovementInterfaceId)
   {
-    $this->send_deleteDataMovementInterface($dataMovementInterfaceId);
+    $this->send_deleteDataMovementInterface($computeResourceId, $dataMovementInterfaceId);
     return $this->recv_deleteDataMovementInterface();
   }
 
-  public function send_deleteDataMovementInterface($dataMovementInterfaceId)
+  public function send_deleteDataMovementInterface($computeResourceId, $dataMovementInterfaceId)
   {
     $args = new \Airavata\API\Airavata_deleteDataMovementInterface_args();
+    $args->computeResourceId = $computeResourceId;
     $args->dataMovementInterfaceId = $dataMovementInterfaceId;
     $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
     if ($bin_accel)
@@ -20193,14 +20195,14 @@ class Airavata_addLocalDataMovementDetails_result {
 class Airavata_updateLocalDataMovementDetails_args {
   static $_TSPEC;
 
-  public $jobSubmissionInterfaceId = null;
+  public $dataMovementInterfaceId = null;
   public $localDataMovement = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'jobSubmissionInterfaceId',
+          'var' => 'dataMovementInterfaceId',
           'type' => TType::STRING,
           ),
         2 => array(
@@ -20211,8 +20213,8 @@ class Airavata_updateLocalDataMovementDetails_args {
         );
     }
     if (is_array($vals)) {
-      if (isset($vals['jobSubmissionInterfaceId'])) {
-        $this->jobSubmissionInterfaceId = $vals['jobSubmissionInterfaceId'];
+      if (isset($vals['dataMovementInterfaceId'])) {
+        $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
       }
       if (isset($vals['localDataMovement'])) {
         $this->localDataMovement = $vals['localDataMovement'];
@@ -20241,7 +20243,7 @@ class Airavata_updateLocalDataMovementDetails_args {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->jobSubmissionInterfaceId);
+            $xfer += $input->readString($this->dataMovementInterfaceId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -20267,9 +20269,9 @@ class Airavata_updateLocalDataMovementDetails_args {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('Airavata_updateLocalDataMovementDetails_args');
-    if ($this->jobSubmissionInterfaceId !== null) {
-      $xfer += $output->writeFieldBegin('jobSubmissionInterfaceId', TType::STRING, 1);
-      $xfer += $output->writeString($this->jobSubmissionInterfaceId);
+    if ($this->dataMovementInterfaceId !== null) {
+      $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
+      $xfer += $output->writeString($this->dataMovementInterfaceId);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->localDataMovement !== null) {
@@ -20898,14 +20900,14 @@ class Airavata_addSCPDataMovementDetails_result {
 class Airavata_updateSCPDataMovementDetails_args {
   static $_TSPEC;
 
-  public $jobSubmissionInterfaceId = null;
+  public $dataMovementInterfaceId = null;
   public $scpDataMovement = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'jobSubmissionInterfaceId',
+          'var' => 'dataMovementInterfaceId',
           'type' => TType::STRING,
           ),
         2 => array(
@@ -20916,8 +20918,8 @@ class Airavata_updateSCPDataMovementDetails_args {
         );
     }
     if (is_array($vals)) {
-      if (isset($vals['jobSubmissionInterfaceId'])) {
-        $this->jobSubmissionInterfaceId = $vals['jobSubmissionInterfaceId'];
+      if (isset($vals['dataMovementInterfaceId'])) {
+        $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
       }
       if (isset($vals['scpDataMovement'])) {
         $this->scpDataMovement = $vals['scpDataMovement'];
@@ -20946,7 +20948,7 @@ class Airavata_updateSCPDataMovementDetails_args {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->jobSubmissionInterfaceId);
+            $xfer += $input->readString($this->dataMovementInterfaceId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -20972,9 +20974,9 @@ class Airavata_updateSCPDataMovementDetails_args {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('Airavata_updateSCPDataMovementDetails_args');
-    if ($this->jobSubmissionInterfaceId !== null) {
-      $xfer += $output->writeFieldBegin('jobSubmissionInterfaceId', TType::STRING, 1);
-      $xfer += $output->writeString($this->jobSubmissionInterfaceId);
+    if ($this->dataMovementInterfaceId !== null) {
+      $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
+      $xfer += $output->writeString($this->dataMovementInterfaceId);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->scpDataMovement !== null) {
@@ -21603,14 +21605,14 @@ class Airavata_addGridFTPDataMovementDetails_result {
 class Airavata_updateGridFTPDataMovementDetails_args {
   static $_TSPEC;
 
-  public $jobSubmissionInterfaceId = null;
+  public $dataMovementInterfaceId = null;
   public $gridFTPDataMovement = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'jobSubmissionInterfaceId',
+          'var' => 'dataMovementInterfaceId',
           'type' => TType::STRING,
           ),
         2 => array(
@@ -21621,8 +21623,8 @@ class Airavata_updateGridFTPDataMovementDetails_args {
         );
     }
     if (is_array($vals)) {
-      if (isset($vals['jobSubmissionInterfaceId'])) {
-        $this->jobSubmissionInterfaceId = $vals['jobSubmissionInterfaceId'];
+      if (isset($vals['dataMovementInterfaceId'])) {
+        $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
       }
       if (isset($vals['gridFTPDataMovement'])) {
         $this->gridFTPDataMovement = $vals['gridFTPDataMovement'];
@@ -21651,7 +21653,7 @@ class Airavata_updateGridFTPDataMovementDetails_args {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->jobSubmissionInterfaceId);
+            $xfer += $input->readString($this->dataMovementInterfaceId);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -21677,9 +21679,9 @@ class Airavata_updateGridFTPDataMovementDetails_args {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('Airavata_updateGridFTPDataMovementDetails_args');
-    if ($this->jobSubmissionInterfaceId !== null) {
-      $xfer += $output->writeFieldBegin('jobSubmissionInterfaceId', TType::STRING, 1);
-      $xfer += $output->writeString($this->jobSubmissionInterfaceId);
+    if ($this->dataMovementInterfaceId !== null) {
+      $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
+      $xfer += $output->writeString($this->dataMovementInterfaceId);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->gridFTPDataMovement !== null) {
@@ -23001,18 +23003,26 @@ class Airavata_changeDataMovementPriorities_result {
 class Airavata_deleteJobSubmissionInterface_args {
   static $_TSPEC;
 
+  public $computeResourceId = null;
   public $jobSubmissionInterfaceId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
+          'var' => 'computeResourceId',
+          'type' => TType::STRING,
+          ),
+        2 => array(
           'var' => 'jobSubmissionInterfaceId',
           'type' => TType::STRING,
           ),
         );
     }
     if (is_array($vals)) {
+      if (isset($vals['computeResourceId'])) {
+        $this->computeResourceId = $vals['computeResourceId'];
+      }
       if (isset($vals['jobSubmissionInterfaceId'])) {
         $this->jobSubmissionInterfaceId = $vals['jobSubmissionInterfaceId'];
       }
@@ -23040,6 +23050,13 @@ class Airavata_deleteJobSubmissionInterface_args {
       {
         case 1:
           if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->computeResourceId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->jobSubmissionInterfaceId);
           } else {
             $xfer += $input->skip($ftype);
@@ -23058,8 +23075,13 @@ class Airavata_deleteJobSubmissionInterface_args {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('Airavata_deleteJobSubmissionInterface_args');
+    if ($this->computeResourceId !== null) {
+      $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 1);
+      $xfer += $output->writeString($this->computeResourceId);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->jobSubmissionInterfaceId !== null) {
-      $xfer += $output->writeFieldBegin('jobSubmissionInterfaceId', TType::STRING, 1);
+      $xfer += $output->writeFieldBegin('jobSubmissionInterfaceId', TType::STRING, 2);
       $xfer += $output->writeString($this->jobSubmissionInterfaceId);
       $xfer += $output->writeFieldEnd();
     }
@@ -23211,18 +23233,26 @@ class Airavata_deleteJobSubmissionInterface_result {
 class Airavata_deleteDataMovementInterface_args {
   static $_TSPEC;
 
+  public $computeResourceId = null;
   public $dataMovementInterfaceId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
+          'var' => 'computeResourceId',
+          'type' => TType::STRING,
+          ),
+        2 => array(
           'var' => 'dataMovementInterfaceId',
           'type' => TType::STRING,
           ),
         );
     }
     if (is_array($vals)) {
+      if (isset($vals['computeResourceId'])) {
+        $this->computeResourceId = $vals['computeResourceId'];
+      }
       if (isset($vals['dataMovementInterfaceId'])) {
         $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
       }
@@ -23250,6 +23280,13 @@ class Airavata_deleteDataMovementInterface_args {
       {
         case 1:
           if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->computeResourceId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->dataMovementInterfaceId);
           } else {
             $xfer += $input->skip($ftype);
@@ -23268,8 +23305,13 @@ class Airavata_deleteDataMovementInterface_args {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('Airavata_deleteDataMovementInterface_args');
+    if ($this->computeResourceId !== null) {
+      $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 1);
+      $xfer += $output->writeString($this->computeResourceId);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->dataMovementInterfaceId !== null) {
-      $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
+      $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 2);
       $xfer += $output->writeString($this->dataMovementInterfaceId);
       $xfer += $output->writeFieldEnd();
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/a3cef493/airavata-api/generate-thrift-files.sh
----------------------------------------------------------------------
diff --git a/airavata-api/generate-thrift-files.sh b/airavata-api/generate-thrift-files.sh
index d38e60a..c4a4d71 100755
--- a/airavata-api/generate-thrift-files.sh
+++ b/airavata-api/generate-thrift-files.sh
@@ -152,7 +152,7 @@ rm -rf ${JAVA_GEN_DIR}
 #   The airavataAPI.thrift includes rest of data models.
 thrift ${THRIFT_ARGS} --gen java ${THRIFT_IDL_DIR}/airavataAPI.thrift || fail unable to generate java thrift classes on AiravataAPI
 
-thrift ${THRIFT_ARGS} --gen java ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate java thrift classes on WorkflowAPI
+#thrift ${THRIFT_ARGS} --gen java ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate java thrift classes on WorkflowAPI
 
 # For the generated java classes add the ASF V2 License header
 add_license_header $JAVA_GEN_DIR
@@ -175,7 +175,7 @@ rm -rf ${CPP_GEN_DIR}
 #   The airavataAPI.thrift includes rest of data models.
 thrift ${THRIFT_ARGS} --gen cpp ${THRIFT_IDL_DIR}/airavataAPI.thrift || fail unable to generate C++ thrift classes
 
-thrift ${THRIFT_ARGS} --gen cpp ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate C++ thrift classes for WorkflowAPI
+#thrift ${THRIFT_ARGS} --gen cpp ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate C++ thrift classes for WorkflowAPI
 # For the generated CPP classes add the ASF V2 License header
 add_license_header $CPP_GEN_DIR
 
@@ -197,7 +197,7 @@ rm -rf ${PHP_GEN_DIR}
 #   The airavataAPI.thrift includes rest of data models.
 thrift ${THRIFT_ARGS} --gen php:autoload ${THRIFT_IDL_DIR}/airavataAPI.thrift || fail unable to generate PHP thrift classes
 
-thrift ${THRIFT_ARGS} --gen php:autoload ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate PHP thrift classes for WorkflowAPI
+#thrift ${THRIFT_ARGS} --gen php:autoload ${THRIFT_IDL_DIR}/workflowAPI.thrift || fail unable to generate PHP thrift classes for WorkflowAPI
 # For the generated java classes add the ASF V2 License header
 ## TODO Write PHP license parser
 


Mime
View raw message