You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2015/02/24 16:57:54 UTC
[01/13] airavata git commit: fixing AIRAVATA-1561
Repository: airavata
Updated Branches:
refs/heads/queue-gfac-rabbitmq 840e627b4 -> ffbb1b9f6
fixing AIRAVATA-1561
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4ec9dc30
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4ec9dc30
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4ec9dc30
Branch: refs/heads/queue-gfac-rabbitmq
Commit: 4ec9dc309a618897c3b3dddbbc6a9842c89139f8
Parents: 09876ee
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Feb 10 14:23:34 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Feb 10 14:23:34 2015 -0500
----------------------------------------------------------------------
.../credential/store/client/TestSSLClient.java | 133 +++++++++++++++++++
.../store/server/CredentialStoreServer.java | 21 ++-
.../server/CredentialStoreServerHandler.java | 30 ++++-
.../airavata/credential/store/util/Utility.java | 14 +-
4 files changed, 184 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4ec9dc30/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
new file mode 100644
index 0000000..dc0889e
--- /dev/null
+++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
@@ -0,0 +1,133 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.airavata.credential.store.client;
+
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
+import org.apache.airavata.common.utils.Constants;
+import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.credential.store.cpi.CredentialStoreService;
+import org.apache.airavata.credential.store.datamodel.CertificateCredential;
+import org.apache.airavata.credential.store.datamodel.CommunityUser;
+import org.apache.airavata.credential.store.datamodel.SSHCredential;
+import org.apache.thrift.TException;
+import org.apache.thrift.protocol.TBinaryProtocol;
+import org.apache.thrift.protocol.TProtocol;
+import org.apache.thrift.transport.TSSLTransportFactory;
+import org.apache.thrift.transport.TTransport;
+import org.apache.thrift.transport.TTransportException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+public class TestSSLClient {
+ private void invoke() {
+ TTransport transport;
+ try {
+ AiravataUtils.setExecutionAsServer();
+ TSSLTransportFactory.TSSLTransportParameters params =
+ new TSSLTransportFactory.TSSLTransportParameters();
+ String keystorePath = ServerSettings.getCredentialStoreThriftServerKeyStorePath();
+ String keystorePWD = ServerSettings.getCredentialStoreThriftServerKeyStorePassword();
+ params.setTrustStore(keystorePath, keystorePWD);
+ final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.CREDNETIAL_SERVER_PORT, "8960"));
+ final String serverHost = ServerSettings.getSetting(Constants.CREDNETIAL_SERVER_HOST, null);
+
+ transport = TSSLTransportFactory.getClientSocket(serverHost, serverPort, 10000, params);
+ TProtocol protocol = new TBinaryProtocol(transport);
+
+ CredentialStoreService.Client client = new CredentialStoreService.Client(protocol);
+// testSSHCredential(client);
+ testCertificateCredential(client);
+ transport.close();
+ } catch (TTransportException e) {
+ e.printStackTrace();
+ }catch (ApplicationSettingsException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void testSSHCredential (CredentialStoreService.Client client){
+ try {
+ SSHCredential sshCredential = new SSHCredential();
+ sshCredential.setUsername("test");
+ sshCredential.setGatewayId("testGateway");
+ sshCredential.setPassphrase("mypassphrase");
+ String token = client.addSSHCredential(sshCredential);
+ System.out.println("SSH Token :" + token);
+ SSHCredential credential = client.getSSHCredential(token, "testGateway");
+ System.out.println("private key : " + credential.getPrivateKey());
+ System.out.println("public key : " + credential.getPublicKey());
+ }catch (TTransportException e) {
+ e.printStackTrace();
+ } catch (TException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void testCertificateCredential (CredentialStoreService.Client client){
+ try {
+ CertificateCredential certificateCredential = new CertificateCredential();
+ CommunityUser communityUser = new CommunityUser("testGateway", "test", "test@ddsd");
+ certificateCredential.setCommunityUser(communityUser);
+ X509Certificate[] x509Certificates = new X509Certificate[1];
+ KeyStore ks = KeyStore.getInstance("JKS");
+ File keyStoreFile = new File("/Users/chathuri/dev/airavata/credential-store/oa4mp/airavata.jks");
+ FileInputStream fis = new FileInputStream(keyStoreFile);
+ char[] password = "airavata".toCharArray();
+ ks.load(fis,password);
+ x509Certificates[0] = (X509Certificate) ks.getCertificate("airavata");
+ certificateCredential.setX509Cert(x509Certificates[0].toString());
+ String token = client.addCertificateCredential(certificateCredential);
+ System.out.println("Certificate Token :" + token);
+ CertificateCredential credential = client.getCertificateCredential(token, "testGateway");
+ System.out.println("certificate : " + credential.getX509Cert());
+ System.out.println("gateway name : " + credential.getCommunityUser().getGatewayNmae());
+ }catch (TTransportException e) {
+ e.printStackTrace();
+ } catch (TException e) {
+ e.printStackTrace();
+ } catch (KeyStoreException e) {
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (CertificateException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void main(String[] args) {
+ TestSSLClient c = new TestSSLClient();
+ c.invoke();
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4ec9dc30/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
index c5a8023..f0e14d5 100644
--- a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
+++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
@@ -1,4 +1,23 @@
-
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.airavata.credential.store.server;
http://git-wip-us.apache.org/repos/asf/airavata/blob/4ec9dc30/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
index 65ee48a..a364618 100644
--- a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
+++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
@@ -1,3 +1,23 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.airavata.credential.store.server;
import org.apache.airavata.common.exception.ApplicationSettingsException;
@@ -66,7 +86,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
credential.setPublicKey(sshCredential.getPublicKey().getBytes());
}
if (sshCredential.getPublicKey() == null || sshCredential.getPrivateKey() == null) {
- credential = Utility.generateKeyPair(sshCredential.getUsername(), sshCredential.getPassphrase());
+ credential = Utility.generateKeyPair(credential);
}
sshCredentialWriter.writeCredentials(credential);
return token;
@@ -97,11 +117,11 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
certificateCredentialWriter.writeCredentials(credential);
return token;
} catch (CredentialStoreException e) {
- log.error("Error occurred while saving SSH Credentials.", e);
- throw new org.apache.airavata.credential.store.exception.CredentialStoreException("Error occurred while saving SSH Credentials.");
+ log.error("Error occurred while saving Certificate Credentials.", e);
+ throw new org.apache.airavata.credential.store.exception.CredentialStoreException("Error occurred while saving Certificate Credentials.");
} catch (Exception e) {
- log.error("Error occurred while generating key pair.", e);
- throw new org.apache.airavata.credential.store.exception.CredentialStoreException("Error occurred while generating key pair..");
+ log.error("Error occurred while converting to X509 certificate.", e);
+ throw new org.apache.airavata.credential.store.exception.CredentialStoreException("Error occurred while converting to X509 certificate..");
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/4ec9dc30/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/util/Utility.java
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/util/Utility.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/util/Utility.java
index 9f97ee9..0ea7bc1 100644
--- a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/util/Utility.java
+++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/util/Utility.java
@@ -23,6 +23,7 @@ package org.apache.airavata.credential.store.util;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.KeyPair;
+import org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,25 +84,22 @@ public class Utility {
return new char[0];
}
- public static org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential generateKeyPair(String userName, String passphrase) throws Exception{
+ public static org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential generateKeyPair(SSHCredential credential) throws Exception{
JSch jsch=new JSch();
try{
KeyPair kpair=KeyPair.genKeyPair(jsch, KeyPair.RSA);
File file = File.createTempFile("id_rsa", "");
String fileName = file.getAbsolutePath();
- kpair.writePrivateKey(fileName,passphrase.getBytes());
+ kpair.writePrivateKey(fileName,credential.getPassphrase().getBytes());
kpair.writePublicKey(fileName + ".pub" , "");
kpair.dispose();
byte[] priKey = FileUtils.readFileToByteArray(new File(fileName));
byte[] pubKey = FileUtils.readFileToByteArray(new File(fileName + ".pub"));
- org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential sshCredential = new org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential();
- sshCredential.setPrivateKey(priKey);
- sshCredential.setPublicKey(pubKey);
- sshCredential.setPortalUserName(userName);
- sshCredential.setPassphrase(passphrase);
- return sshCredential;
+ credential.setPrivateKey(priKey);
+ credential.setPublicKey(pubKey);
+ return credential;
}
catch(Exception e){
log.error("Error while creating key pair", e);
[02/13] airavata git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d262e9f4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d262e9f4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d262e9f4
Branch: refs/heads/queue-gfac-rabbitmq
Commit: d262e9f4e26f77b74f0d1f8f4708a0b581497edf
Parents: 4ec9dc3 30aefc4
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Feb 10 14:23:52 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Feb 10 14:23:52 2015 -0500
----------------------------------------------------------------------
modules/distribution/server/pom.xml | 110 ++++++++++++++++++++++---------
1 file changed, 80 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
[06/13] airavata git commit: performance test for messaging framework
- AIRAVATA-1577
Posted by la...@apache.org.
performance test for messaging framework - AIRAVATA-1577
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b622683b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b622683b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b622683b
Branch: refs/heads/queue-gfac-rabbitmq
Commit: b622683bc8272cf9f1f88d40df1a2e19b10e2ac1
Parents: 155c3c7
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Feb 17 14:58:08 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Feb 17 14:58:08 2015 -0500
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 69 ++++++++------------
.../client/samples/RegisterSampleData.java | 2 +-
.../tools/RegisterSampleApplications.java | 13 ++--
.../messaging/core/impl/RabbitMQPublisher.java | 3 +
.../messaging/core/stats/StatCounter.java | 69 ++++++++++++++++++++
.../messaging/core/stats/WriterTask.java | 39 +++++++++++
6 files changed, 148 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b622683b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index b90e0ff..200b76e 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -25,6 +25,7 @@ import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
import org.apache.airavata.client.tools.RegisterSampleApplications;
import org.apache.airavata.client.tools.RegisterSampleApplicationsUtils;
+import org.apache.airavata.messaging.core.stats.StatCounter;
import org.apache.airavata.model.appcatalog.appinterface.DataType;
import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
@@ -42,28 +43,25 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
public class CreateLaunchExperiment {
//FIXME: Read from a config file
public static final String THRIFT_SERVER_HOST = "localhost";
public static final int THRIFT_SERVER_PORT = 8930;
-// public static final String THRIFT_SERVER_HOST = "gw127.iu.xsede.org";
-// public static final int THRIFT_SERVER_PORT = 9930;
+// public static final String THRIFT_SERVER_HOST = "gw111.iu.xsede.org";
+// public static final int THRIFT_SERVER_PORT = 9930;
private final static Logger logger = LoggerFactory.getLogger(CreateLaunchExperiment.class);
private static final String DEFAULT_USER = "default.registry.user";
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
private static Airavata.Client airavataClient;
- private static String echoAppId = "Echo_2e539083-665d-40fd-aaa2-4a751028326b";
+ private static String echoAppId = "Echo_7d2a5cde-5b2a-4cad-ae50-f71668f4876d";
private static String mpiAppId = "HelloMPI_720e159f-198f-4daa-96ca-9f5eafee92c9";
private static String wrfAppId = "WRF_7ad5da38-c08b-417c-a9ea-da9298839762";
- private static String amberAppId = "Amber_eda074ea-223d-49d7-a942-6c8742249f36";
+ private static String amberAppId = "Amber_42124128-628b-484c-829d-aff8b584eb00";
private static String gromacsAppId = "GROMACS_05622038-9edd-4cb1-824e-0b7cb993364b";
private static String espressoAppId = "ESPRESSO_10cc2820-5d0b-4c63-9546-8a8b595593c1";
private static String lammpsAppId = "LAMMPS_10893eb5-3840-438c-8446-d26c7ecb001f";
@@ -95,19 +93,19 @@ public class CreateLaunchExperiment {
public static void createAndLaunchExp() throws TException {
// final String expId = createEchoExperimentForFSD(airavataClient);
try {
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < 100; i++) {
// final String expId = createExperimentForSSHHost(airavata);
// final String expId = createEchoExperimentForFSD(airavataClient);
// final String expId = createMPIExperimentForFSD(airavataClient);
// final String expId = createEchoExperimentForStampede(airavataClient);
-// final String expId = createEchoExperimentForTrestles(airavataClient);
+ final String expId = createEchoExperimentForTrestles(airavataClient);
// final String expId = createExperimentEchoForLocalHost(airavataClient);
// final String expId = createExperimentWRFTrestles(airavataClient);
// final String expId = createExperimentForBR2(airavataClient);
// final String expId = createExperimentForBR2Amber(airavataClient);
// final String expId = createExperimentWRFStampede(airavataClient);
// final String expId = createExperimentForStampedeAmber(airavataClient);
- final String expId = createExperimentForTrestlesAmber(airavataClient);
+// final String expId = createExperimentForTrestlesAmber(airavataClient);
// final String expId = createExperimentGROMACSStampede(airavataClient);
// final String expId = createExperimentESPRESSOStampede(airavataClient);
// final String expId = createExperimentLAMMPSStampede(airavataClient);
@@ -115,9 +113,9 @@ public class CreateLaunchExperiment {
// final String expId = createExperimentTRINITYStampede(airavataClient);
// final String expId = createExperimentAUTODOCKStampede(airavataClient); // this is not working , we need to register AutoDock app on stampede
// final String expId = "Ultrascan_ln_eb029947-391a-4ccf-8ace-9bafebe07cc0";
- System.out.println("Experiment ID : " + expId);
+ System.out.println("Experiment ID : " + expId);
// updateExperiment(airavata, expId);
-
+
launchExperiment(airavataClient, expId);
}
} catch (Exception e) {
@@ -173,28 +171,19 @@ public class CreateLaunchExperiment {
public static String createEchoExperimentForTrestles(Airavata.Client client) throws TException {
try {
- List<InputDataObjectType> exInputs = new ArrayList<InputDataObjectType>();
- InputDataObjectType input = new InputDataObjectType();
- input.setName("Echo_Input");
- input.setType(DataType.STRING);
- input.setValue("Hello World");
- exInputs.add(input);
+ List<InputDataObjectType> exInputs = client.getApplicationInputs(echoAppId);
+ for (InputDataObjectType inputDataObjectType : exInputs) {
+ if (inputDataObjectType.getName().equalsIgnoreCase("Input_to_Echo")) {
+ inputDataObjectType.setValue("Hello World");
+ }
+ }
+ List<OutputDataObjectType> exOut = client.getApplicationOutputs(echoAppId);
+
+ Project project = ProjectModelUtil.createProject("default", "admin", "test project");
+ String projectId = client.createProject(project);
- List<OutputDataObjectType> exOut = new ArrayList<OutputDataObjectType>();
- OutputDataObjectType output = new OutputDataObjectType();
- output.setName("STDOUT");
- output.setType(DataType.STDOUT);
- output.setValue("");
- exOut.add(output);
-
-// OutputDataObjectType output2 = new OutputDataObjectType();
-// output2.setName("Echoed_Output2");
-// output2.setType(DataType.URI);
-// output2.setValue("file:///tmp/test.txt");
-// exOut.add(output2);
-//
Experiment simpleExperiment =
- ExperimentModelUtil.createSimpleExperiment("default", "admin", "echoExperiment", "SimpleEcho2", echoAppId, exInputs);
+ ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "echoExperiment", "SimpleEcho3", echoAppId, exInputs);
simpleExperiment.setExperimentOutputs(exOut);
Map<String, String> computeResources = airavataClient.getAvailableAppInterfaceComputeResources(echoAppId);
@@ -202,7 +191,7 @@ public class CreateLaunchExperiment {
for (String id : computeResources.keySet()) {
String resourceName = computeResources.get(id);
if (resourceName.equals(trestlesHostName)) {
- ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 1, 1, 1, "normal", 30, 0, 1, "sds128");
+ ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling(id, 1, 1, 1, "normal", 30, 0, 1, "TG-STA110014S");
UserConfigurationData userConfigurationData = new UserConfigurationData();
userConfigurationData.setAiravataAutoSchedule(false);
userConfigurationData.setOverrideManualScheduledParams(false);
@@ -1486,11 +1475,11 @@ public class CreateLaunchExperiment {
// }
for (InputDataObjectType inputDataObjectType : exInputs) {
if (inputDataObjectType.getName().equalsIgnoreCase("Heat_Restart_File")) {
- inputDataObjectType.setValue("file://root@test-drive.airavata.org:/var/www/experimentData/admin101a290e6330f15a91349159553ae8b6bb1/02_Heat.rst");
+ inputDataObjectType.setValue("/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/02_Heat.rst");
} else if (inputDataObjectType.getName().equalsIgnoreCase("Production_Control_File")) {
- inputDataObjectType.setValue("file://root@test-drive.airavata.org:/var/www/experimentData/admin101a290e6330f15a91349159553ae8b6bb1/03_Prod.in");
+ inputDataObjectType.setValue("/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/03_Prod.in");
} else if (inputDataObjectType.getName().equalsIgnoreCase("Parameter_Topology_File")) {
- inputDataObjectType.setValue("file://root@test-drive.airavata.org:/var/www/experimentData/admin101a290e6330f15a91349159553ae8b6bb1/prmtop");
+ inputDataObjectType.setValue("/Users/chathuri/dev/airavata/source/php/inputs/AMBER_FILES/prmtop");
}
}
@@ -1556,7 +1545,7 @@ public class CreateLaunchExperiment {
ExperimentModelUtil.createSimpleExperiment(projectId, "admin", "sshEchoExperiment", "SimpleEchoBR", amberAppId, exInputs);
simpleExperiment.setExperimentOutputs(exOut);
simpleExperiment.setEnableEmailNotification(true);
- simpleExperiment.addToEmailAddresses("raman@ogce.org");
+// simpleExperiment.addToEmailAddresses("raman@ogce.org");
Map<String, String> computeResources = airavataClient.getAvailableAppInterfaceComputeResources(amberAppId);
if (computeResources != null && computeResources.size() != 0) {
for (String id : computeResources.keySet()) {
@@ -1591,8 +1580,8 @@ public class CreateLaunchExperiment {
public static void launchExperiment(Airavata.Client client, String expId)
throws TException {
try {
- String tokenId = "5f116091-0ad3-4ab6-9df7-6ac909f21f8b";
-// String tokenId ="aaaaaa";
+// String tokenId = "5f116091-0ad3-4ab6-9df7-6ac909f21f8b";
+ String tokenId ="aaaaaa";
client.launchExperiment(expId, tokenId);
} catch (ExperimentNotFoundException e) {
logger.error("Error occured while launching the experiment...", e.getMessage());
http://git-wip-us.apache.org/repos/asf/airavata/blob/b622683b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
index 50bf15c..5496cc6 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/RegisterSampleData.java
@@ -78,7 +78,7 @@ public class RegisterSampleData {
public void register() throws AiravataClientConnectException, TException {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
registerLocalhost();
-// registerGatewayProfile();
+ registerGatewayProfile();
registerApplicationModules();
registerApplicationDeployments();
registerApplicationInterfaces();
http://git-wip-us.apache.org/repos/asf/airavata/blob/b622683b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
index 3111347..57f7512 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java
@@ -466,15 +466,16 @@ public class RegisterSampleApplications {
InputDataObjectType input1 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo", "",
DataType.STRING, null, 1, false, false,false, "A test string to Echo", null);
- InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo2", "",
- DataType.URI, null, 2, false, false,false, "A sample input remote file", null);
-
- InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo3", "file:///tmp/test.txt",
- DataType.URI, null, 3,false, false, false, "A sample input local file", null);
+// InputDataObjectType input2 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo2", "",
+// DataType.URI, null, 2, false, false,false, "A sample input remote file", null);
+//
+// InputDataObjectType input3 = RegisterSampleApplicationsUtils.createAppInput("Input_to_Echo3", "file:///tmp/test.txt",
+// DataType.URI, null, 3,false, false, false, "A sample input local file", null);
List<InputDataObjectType> applicationInputs = new ArrayList<InputDataObjectType>();
- applicationInputs.add(input1); applicationInputs.add(input2); applicationInputs.add(input3);
+ applicationInputs.add(input1);
+// applicationInputs.add(input2); applicationInputs.add(input3);
OutputDataObjectType output1 = RegisterSampleApplicationsUtils.createAppOutput("Echoed_Output",
"", DataType.STRING, false, false);
http://git-wip-us.apache.org/repos/asf/airavata/blob/b622683b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
index 97c0d98..b6e9c98 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
@@ -28,6 +28,7 @@ import org.apache.airavata.common.utils.ThriftUtils;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.MessagingConstants;
import org.apache.airavata.messaging.core.Publisher;
+import org.apache.airavata.messaging.core.stats.StatCounter;
import org.apache.airavata.model.messaging.event.*;
import org.apache.thrift.TException;
import org.slf4j.Logger;
@@ -39,6 +40,7 @@ public class RabbitMQPublisher implements Publisher {
private RabbitMQProducer rabbitMQProducer;
+ StatCounter statCounter = StatCounter.getInstance();
public RabbitMQPublisher() throws Exception {
String brokerUrl;
@@ -87,6 +89,7 @@ public class RabbitMQPublisher implements Publisher {
}
byte[] messageBody = ThriftUtils.serializeThriftObject(message);
rabbitMQProducer.send(messageBody, routingKey);
+ statCounter.add();
} catch (TException e) {
String msg = "Error while deserializing the object";
log.error(msg, e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/b622683b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
new file mode 100644
index 0000000..d6c572d
--- /dev/null
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
@@ -0,0 +1,69 @@
+package org.apache.airavata.messaging.core.stats;
+
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Timer;
+
+public class StatCounter {
+ private static StatCounter ourInstance = new StatCounter();
+ private long msgCount;
+ private long period = 10*1000;
+ private long msgCountForPeriod;
+
+ private long bucketStartTime = 0;
+ private File file;
+ private FileOutputStream fos;
+ private BufferedWriter bw;
+
+ private List<Long> messageContPer10S = new ArrayList<Long>();
+
+ public static StatCounter getInstance() {
+ return ourInstance;
+ }
+
+ public long getMsgCount() {
+ return msgCount;
+ }
+
+ public void setMsgCount(long msgCount) {
+ this.msgCount = msgCount;
+ }
+
+ public List<Long> getMessageContPer10S() {
+ return messageContPer10S;
+ }
+
+ public void setMessageContPer10S(List<Long> messageContPer10S) {
+ this.messageContPer10S = messageContPer10S;
+ }
+
+ private StatCounter() {
+ file = new File("/tmp/results");
+ Timer timer = new Timer();
+ WriterTask writerTask = new WriterTask();
+ writerTask.setFile(file);
+ timer.scheduleAtFixedRate(writerTask, 0, 60 * 1000);
+
+ }
+
+ public void add () {
+ if (System.currentTimeMillis() - bucketStartTime < period) {
+ msgCountForPeriod++;
+ } else {
+ messageContPer10S.add(msgCountForPeriod);
+ bucketStartTime = System.currentTimeMillis();
+ msgCountForPeriod = 1;
+ }
+ msgCount++;
+ }
+
+ public long getMsgCountForPeriod() {
+ return msgCountForPeriod;
+ }
+
+ public void setMsgCountForPeriod(long msgCountForPeriod) {
+ this.msgCountForPeriod = msgCountForPeriod;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/b622683b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/WriterTask.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/WriterTask.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/WriterTask.java
new file mode 100644
index 0000000..b154ad7
--- /dev/null
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/WriterTask.java
@@ -0,0 +1,39 @@
+package org.apache.airavata.messaging.core.stats;
+
+import java.io.*;
+import java.util.List;
+import java.util.TimerTask;
+
+/**
+ * Created by chathuri on 2/16/15.
+ */
+public class WriterTask extends TimerTask {
+
+ private File file;
+ private FileOutputStream fos;
+ private BufferedWriter bw;
+
+ public void setFile(File file) {
+ this.file = file;
+
+ }
+
+ @Override
+ public void run() {
+ try {
+ System.out.println("########### calling Write Task ############");
+ StatCounter statCounter = StatCounter.getInstance();
+ List<Long> contPer10S = statCounter.getMessageContPer10S();
+ fos = new FileOutputStream(file, false);
+ bw = new BufferedWriter(new OutputStreamWriter(fos));
+ for (int i = 0; i < contPer10S.size(); i++) {
+ bw.write(String.valueOf(i+1) + " :" + String.valueOf(contPer10S.get(i)));
+ bw.newLine();
+ }
+ bw.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+}
[13/13] airavata git commit: merging with master
Posted by la...@apache.org.
merging with master
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ffbb1b9f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ffbb1b9f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ffbb1b9f
Branch: refs/heads/queue-gfac-rabbitmq
Commit: ffbb1b9f6776cf90a3eb9e7d418bd5bed76a0ef4
Parents: 840e627 33d2e27
Author: Lahiru Gunathilake <gl...@gmail.com>
Authored: Tue Feb 24 10:57:46 2015 -0500
Committer: Lahiru Gunathilake <gl...@gmail.com>
Committed: Tue Feb 24 10:57:46 2015 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 86 +-
.../java/org/apache/airavata/api/Airavata.java | 6323 ++++++++++++++++--
.../main/resources/lib/airavata/Airavata.cpp | 5246 +++++++++------
.../src/main/resources/lib/airavata/Airavata.h | 636 ++
.../lib/airavata/Airavata_server.skeleton.cpp | 20 +
.../resources/lib/Airavata/API/Airavata.php | 1270 +++-
.../client/samples/CreateLaunchExperiment.java | 60 +-
.../client/samples/RegisterSampleData.java | 2 +-
.../tools/RegisterSampleApplications.java | 13 +-
.../airavataAPI.thrift | 23 +
.../appcatalog/cpi/ComputeResource.java | 3 +
.../catalog/data/impl/ComputeResourceImpl.java | 30 +-
.../catalog/data/model/UnicoreDataMovement.java | 65 +
.../data/resources/AbstractResource.java | 7 +
.../resources/UnicoreDataMovementResource.java | 255 +
.../catalog/data/util/AppCatalogJPAUtils.java | 19 +-
.../data/util/AppCatalogResourceType.java | 1 +
.../data/util/AppCatalogThriftConversion.java | 20 +-
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/appcatalog-derby.sql | 8 +
.../src/main/resources/appcatalog-mysql.sql | 9 +
.../src/test/resources/appcatalog-derby.sql | 8 +
.../main/resources/airavata-server.properties | 6 +
.../credential/store/client/TestSSLClient.java | 140 +
.../store/server/CredentialStoreServer.java | 21 +-
.../server/CredentialStoreServerHandler.java | 37 +-
.../airavata/credential/store/util/Utility.java | 14 +-
modules/distribution/server/pom.xml | 110 +-
modules/messaging/client/README | 15 +
modules/messaging/client/pom.xml | 103 +
.../messaging/client/RabbitMQListner.java | 230 +
.../core/impl/RabbitMQStatusPublisher.java | 12 +-
.../messaging/core/stats/CountWriterTask.java | 36 +
.../messaging/core/stats/LatencyWriterTask.java | 37 +
.../messaging/core/stats/StatCounter.java | 83 +
modules/messaging/pom.xml | 1 +
36 files changed, 12261 insertions(+), 2689 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ffbb1b9f/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ffbb1b9f/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 1e9d983,9f4cd12..c4c303f
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@@ -60,10 -57,10 +57,10 @@@ public class CreateLaunchExperiment
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
private static Airavata.Client airavataClient;
- private static String echoAppId = "Echo_2e539083-665d-40fd-aaa2-4a751028326b";
+ private static String echoAppId = "Echo_a8fc8511-7b8e-431a-ad0f-de5eb1a9c576";
private static String mpiAppId = "HelloMPI_720e159f-198f-4daa-96ca-9f5eafee92c9";
private static String wrfAppId = "WRF_7ad5da38-c08b-417c-a9ea-da9298839762";
- private static String amberAppId = "Amber_eda074ea-223d-49d7-a942-6c8742249f36";
+ private static String amberAppId = "Amber_42124128-628b-484c-829d-aff8b584eb00";
private static String gromacsAppId = "GROMACS_05622038-9edd-4cb1-824e-0b7cb993364b";
private static String espressoAppId = "ESPRESSO_10cc2820-5d0b-4c63-9546-8a8b595593c1";
private static String lammpsAppId = "LAMMPS_10893eb5-3840-438c-8446-d26c7ecb001f";
http://git-wip-us.apache.org/repos/asf/airavata/blob/ffbb1b9f/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --cc modules/configuration/server/src/main/resources/airavata-server.properties
index e309901,c493752..00191a7
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@@ -216,12 -215,9 +216,18 @@@ connection.name=xsed
#publisher
activity.listeners=org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataTaskStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataWorkflowNodeStatusUpdator,org.apache.airavata.api.server.listener.AiravataExperimentStatusUpdator,org.apache.airavata.gfac.core.monitor.GfacInternalStatusUpdator,org.apache.airavata.workflow.engine.util.ProxyMonitorPublisher
publish.rabbitmq=false
++<<<<<<< HEAD
+status.publisher=org.apache.airavata.messaging.core.impl.RabbitMQStatusPublisher
+task.launch.publisher=org.apache.airavata.messaging.core.impl.RabbitMQTaskLaunchPublisher
+rabbitmq.broker.url=amqp://localhost:5672
+rabbitmq.status.exchange.name=airavata_rabbitmq_exchange
+rabbitmq.task.launch.exchange.name=airavata_task_launch_rabbitmq_exchange
+
++=======
+ activity.publisher=org.apache.airavata.messaging.core.impl.RabbitMQPublisher
+ rabbitmq.broker.url=amqp://gw111.iu.xsede.org:5672
+ rabbitmq.exchange.name=airavata_rabbitmq_exchange
++>>>>>>> master
###########################################################################
# Orchestrator module Configuration
http://git-wip-us.apache.org/repos/asf/airavata/blob/ffbb1b9f/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java
----------------------------------------------------------------------
diff --cc modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java
index fe06ed7,0000000..70ed942
mode 100644,000000..100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQStatusPublisher.java
@@@ -1,99 -1,0 +1,103 @@@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.messaging.core.impl;
+
+import org.apache.airavata.common.exception.AiravataException;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.common.utils.ThriftUtils;
+import org.apache.airavata.messaging.core.MessageContext;
+import org.apache.airavata.messaging.core.MessagingConstants;
+import org.apache.airavata.messaging.core.Publisher;
++import org.apache.airavata.messaging.core.stats.StatCounter;
+import org.apache.airavata.model.messaging.event.*;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RabbitMQStatusPublisher implements Publisher {
+
+ private static Logger log = LoggerFactory.getLogger(RabbitMQStatusPublisher.class);
+
+ private RabbitMQProducer rabbitMQProducer;
+
++ StatCounter statCounter = StatCounter.getInstance();
+
+ public RabbitMQStatusPublisher() throws Exception {
+ String brokerUrl;
+ String exchangeName;
+ try {
+ brokerUrl = ServerSettings.getSetting(MessagingConstants.RABBITMQ_BROKER_URL);
+ exchangeName = ServerSettings.getSetting(MessagingConstants.RABBITMQ_STATUS_EXCHANGE_NAME);
+ } catch (ApplicationSettingsException e) {
+ String message = "Failed to get read the required properties from airavata to initialize rabbitmq";
+ log.error(message, e);
+ throw new AiravataException(message, e);
+ }
+ rabbitMQProducer = new RabbitMQProducer(brokerUrl, exchangeName);
+ rabbitMQProducer.open();
+ }
+
+ public void publish(MessageContext msgCtx) throws AiravataException {
+ try {
+ log.info("Publishing status to rabbitmq...");
+ byte[] body = ThriftUtils.serializeThriftObject(msgCtx.getEvent());
+ Message message = new Message();
+ message.setEvent(body);
+ message.setMessageId(msgCtx.getMessageId());
+ message.setMessageType(msgCtx.getType());
+ message.setUpdatedTime(msgCtx.getUpdatedTime().getTime());
++ String gatewayId = msgCtx.getGatewayId();
+ String routingKey = null;
+ if (msgCtx.getType().equals(MessageType.EXPERIMENT)){
+ ExperimentStatusChangeEvent event = (ExperimentStatusChangeEvent) msgCtx.getEvent();
- routingKey = event.getExperimentId();
++ routingKey = gatewayId + "." + event.getExperimentId();
+ } else if (msgCtx.getType().equals(MessageType.TASK)) {
+ TaskStatusChangeEvent event = (TaskStatusChangeEvent) msgCtx.getEvent();
- routingKey = event.getTaskIdentity().getExperimentId() + "." +
++ routingKey = gatewayId + "." + event.getTaskIdentity().getExperimentId() + "." +
+ event.getTaskIdentity().getWorkflowNodeId() + "." + event.getTaskIdentity().getTaskId();
+ }else if (msgCtx.getType().equals(MessageType.WORKFLOWNODE)){
+ WorkflowNodeStatusChangeEvent event = (WorkflowNodeStatusChangeEvent) msgCtx.getEvent();
+ WorkflowIdentifier workflowNodeIdentity = event.getWorkflowNodeIdentity();
- routingKey = workflowNodeIdentity.getExperimentId() + "." + workflowNodeIdentity.getWorkflowNodeId();
++ routingKey = gatewayId + "." + workflowNodeIdentity.getExperimentId() + "." + workflowNodeIdentity.getWorkflowNodeId();
+ }else if (msgCtx.getType().equals(MessageType.JOB)){
+ JobStatusChangeEvent event = (JobStatusChangeEvent)msgCtx.getEvent();
+ JobIdentifier identity = event.getJobIdentity();
- routingKey = identity.getExperimentId() + "." +
++ routingKey = gatewayId + "." + identity.getExperimentId() + "." +
+ identity.getWorkflowNodeId() + "." +
+ identity.getTaskId() + "." +
+ identity.getJobId();
+ }
+ byte[] messageBody = ThriftUtils.serializeThriftObject(message);
+ rabbitMQProducer.send(messageBody, routingKey);
++ statCounter.add(message);
+ } catch (TException e) {
+ String msg = "Error while deserializing the object";
+ log.error(msg, e);
+ throw new AiravataException(msg, e);
+ } catch (Exception e) {
+ String msg = "Error while sending to rabbitmq";
+ log.error(msg, e);
+ throw new AiravataException(msg, e);
+ }
+ }
+}
[03/13] airavata git commit: test certificate credential -
AIRAVATA-1561
Posted by la...@apache.org.
test certificate credential - AIRAVATA-1561
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e6803974
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e6803974
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e6803974
Branch: refs/heads/queue-gfac-rabbitmq
Commit: e68039748fcff30e608cdcfeebc83d18963bfa92
Parents: d262e9f
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Feb 10 15:27:30 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Feb 10 15:27:30 2015 -0500
----------------------------------------------------------------------
.../airavata/credential/store/client/TestSSLClient.java | 9 ++++++++-
.../store/server/CredentialStoreServerHandler.java | 7 +++++--
2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e6803974/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
index dc0889e..12105e2 100644
--- a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
+++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/client/TestSSLClient.java
@@ -44,6 +44,7 @@ import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
+import org.apache.commons.codec.binary.Base64;
public class TestSSLClient {
private void invoke() {
@@ -102,7 +103,13 @@ public class TestSSLClient {
char[] password = "airavata".toCharArray();
ks.load(fis,password);
x509Certificates[0] = (X509Certificate) ks.getCertificate("airavata");
- certificateCredential.setX509Cert(x509Certificates[0].toString());
+ Base64 encoder = new Base64(64);
+ String cert_begin = "-----BEGIN CERTIFICATE-----\n";
+ String end_cert = "-----END CERTIFICATE-----";
+ byte[] derCert = x509Certificates[0].getEncoded();
+ String pemCertPre = new String(encoder.encode(derCert));
+ String pemCert = cert_begin + pemCertPre + end_cert;
+ certificateCredential.setX509Cert(pemCert);
String token = client.addCertificateCredential(certificateCredential);
System.out.println("Certificate Token :" + token);
CertificateCredential credential = client.getCertificateCredential(token, "testGateway");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e6803974/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
index a364618..1675781 100644
--- a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
+++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
@@ -36,9 +36,11 @@ import org.apache.airavata.credential.store.store.impl.CredentialReaderImpl;
import org.apache.airavata.credential.store.store.impl.SSHCredentialWriter;
import org.apache.airavata.credential.store.util.TokenGenerator;
import org.apache.airavata.credential.store.util.Utility;
+import org.apache.commons.codec.binary.Base64;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import sun.security.provider.X509Factory;
import java.io.ByteArrayInputStream;
import java.security.cert.CertificateFactory;
@@ -108,9 +110,10 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
certificateCredential.getCommunityUser().getUsername(), certificateCredential.getCommunityUser().getUserEmail()));
String token = TokenGenerator.generateToken(certificateCredential.getCommunityUser().getGatewayNmae(), null);
credential.setToken(token);
+ Base64 encoder = new Base64(64);
+ byte [] decoded = encoder.decode(certificateCredential.getX509Cert().replaceAll(X509Factory.BEGIN_CERT, "").replaceAll(X509Factory.END_CERT, ""));
CertificateFactory cf = CertificateFactory.getInstance("X.509");
- ByteArrayInputStream stream = new ByteArrayInputStream(certificateCredential.getX509Cert().getBytes());
- X509Certificate certificate = (X509Certificate)cf.generateCertificate(stream);
+ X509Certificate certificate = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(decoded));
X509Certificate[] certificates = new X509Certificate[1];
certificates[0] = certificate;
credential.setCertificates(certificates);
[08/13] airavata git commit: fixing AIRAVATA-1584
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java b/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
index efa2f96..c17da17 100644
--- a/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
+++ b/modules/app-catalog/app-catalog-cpi/src/main/java/org/airavata/appcatalog/cpi/ComputeResource.java
@@ -95,6 +95,8 @@ public interface ComputeResource {
*/
String addScpDataMovement (SCPDataMovement scpDataMovement) throws AppCatalogException;
+ String addUnicoreDataMovement (UnicoreDataMovement unicoreDataMovement) throws AppCatalogException;
+
/**
* This will add a SCPDataMovement protocol to the database
* @param computeResourceId compute resource id
@@ -165,6 +167,7 @@ public interface ComputeResource {
* @return UnicoreSubmission object
*/
UnicoreJobSubmission getUNICOREJobSubmission (String submissionId) throws AppCatalogException;
+ UnicoreDataMovement getUNICOREDataMovement (String dataMovementId) throws AppCatalogException;
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
index 0ead526..4968a56 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
@@ -218,8 +218,6 @@ public class ComputeResourceImpl implements ComputeResource {
}
-
-
@Override
public String addJobSubmissionProtocol(String computeResourceId, JobSubmissionInterface jobSubmissionInterface) throws AppCatalogException {
try {
@@ -346,6 +344,19 @@ public class ComputeResourceImpl implements ComputeResource {
}
@Override
+ public String addUnicoreDataMovement(UnicoreDataMovement unicoreDataMovement) throws AppCatalogException {
+ try {
+ unicoreDataMovement.setDataMovementInterfaceId(AppCatalogUtils.getID("UNICORE"));
+ UnicoreDataMovementResource resource = AppCatalogThriftConversion.getUnicoreDMResource(unicoreDataMovement);
+ resource.save();
+ return resource.getDataMovementId();
+ }catch (Exception e){
+ logger.error("Error while saving UNICORE Data Movement...", e);
+ throw new AppCatalogException(e);
+ }
+ }
+
+ @Override
public String addDataMovementProtocol(String computeResourceId, DataMovementInterface dataMovementInterface) throws AppCatalogException {
try {
DataMovementInterfaceResource dmi = AppCatalogThriftConversion.getDataMovementInterface(dataMovementInterface);
@@ -364,7 +375,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public String addGridFTPDataMovement(GridFTPDataMovement gridFTPDataMovement) throws AppCatalogException {
try {
- gridFTPDataMovement.setDataMovementInterfaceId(AppCatalogUtils.getID("SCP"));
+ gridFTPDataMovement.setDataMovementInterfaceId(AppCatalogUtils.getID("GRIDFTP"));
GridftpDataMovementResource resource = AppCatalogThriftConversion.getGridFTPDataMovementDescription(gridFTPDataMovement);
resource.save();
List<String> gridFTPEndPoint = gridFTPDataMovement.getGridFTPEndPoints();
@@ -578,6 +589,19 @@ public class ComputeResourceImpl implements ComputeResource {
}
}
+ @Override
+ public UnicoreDataMovement getUNICOREDataMovement(String dataMovementId)
+ throws AppCatalogException {
+ try {
+ UnicoreDataMovementResource resource = new UnicoreDataMovementResource();
+ resource = (UnicoreDataMovementResource)resource.get(dataMovementId);
+ return AppCatalogThriftConversion.getUnicoreDMDescription(resource);
+ }catch (Exception e){
+ logger.error("Error while retrieving UNICORE data movement...", e);
+ throw new AppCatalogException(e);
+ }
+ }
+
@Override
public CloudJobSubmission getCloudJobSubmission(String submissionId) throws AppCatalogException {
try {
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreDataMovement.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreDataMovement.java
new file mode 100644
index 0000000..a39821f
--- /dev/null
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/model/UnicoreDataMovement.java
@@ -0,0 +1,65 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+package org.apache.aiaravata.application.catalog.data.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "UNICORE_DATAMOVEMENT")
+public class UnicoreDataMovement {
+ @Id
+ @Column(name = "DATAMOVEMENT_ID")
+ private String dataMovementId;
+ @Column(name = "SECURITY_PROTOCAL")
+ private String securityProtocol;
+
+ @Column(name = "UNICORE_ENDPOINT_URL")
+ private String unicoreEndpointUrl;
+
+ public String getUnicoreEndpointUrl() {
+ return unicoreEndpointUrl;
+ }
+
+ public void setUnicoreEndpointUrl(String unicoreEndpointUrl) {
+ this.unicoreEndpointUrl = unicoreEndpointUrl;
+ }
+
+ public String getDataMovementId() {
+ return dataMovementId;
+ }
+
+ public void setDataMovementId(String dataMovementId) {
+ this.dataMovementId = dataMovementId;
+ }
+
+ public String getSecurityProtocol() {
+ return securityProtocol;
+ }
+
+ public void setSecurityProtocol(String securityProtocol) {
+ this.securityProtocol = securityProtocol;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
index df005db..cd6e28c 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/AbstractResource.java
@@ -32,6 +32,7 @@ public abstract class AbstractResource implements Resource {
public static final String POST_JOBCOMMAND = "PostJobCommand";
public static final String GLOBUS_SUBMISSION = "GlobusJobSubmission";
public static final String UNICORE_JOB_SUBMISSION = "UnicoreJobSubmission";
+ public static final String UNICORE_DATA_MOVEMENT = "UnicoreDataMovement";
public static final String GLOBUS_GK_ENDPOINT = "GlobusGKEndpoint";
public static final String SSH_SUBMISSION = "SSHSubmission";
public static final String SCP_DATA_MOVEMENT = "ScpDataMovement";
@@ -126,6 +127,12 @@ public abstract class AbstractResource implements Resource {
public static final String UNICORE_ENDPOINT_URL = "unicoreEndpointUrl";
}
+ public final class UnicoreDataMovementConstants {
+ public static final String DATAMOVEMENT_ID = "dataMovementId";
+ public static final String SECURITY_PROTOCAL = "securityProtocol";
+ public static final String UNICORE_ENDPOINT_URL = "unicoreEndpointUrl";
+ }
+
public final class GlobusEPConstants{
public static final String SUBMISSION_ID = "submissionID";
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/UnicoreDataMovementResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/UnicoreDataMovementResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/UnicoreDataMovementResource.java
new file mode 100644
index 0000000..63f2b70
--- /dev/null
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/UnicoreDataMovementResource.java
@@ -0,0 +1,255 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+package org.apache.aiaravata.application.catalog.data.resources;
+
+import org.airavata.appcatalog.cpi.AppCatalogException;
+import org.apache.aiaravata.application.catalog.data.model.UnicoreDataMovement;
+import org.apache.aiaravata.application.catalog.data.util.AppCatalogJPAUtils;
+import org.apache.aiaravata.application.catalog.data.util.AppCatalogQueryGenerator;
+import org.apache.aiaravata.application.catalog.data.util.AppCatalogResourceType;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.ArrayList;
+import java.util.List;
+
+public class UnicoreDataMovementResource extends AbstractResource {
+
+ private final static Logger logger = LoggerFactory.getLogger(UnicoreDataMovementResource.class);
+
+ private String dataMovementId;
+ private String securityProtocol;
+ private String unicoreEndpointUrl;
+
+ public void remove(Object identifier) throws AppCatalogException {
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(UNICORE_DATA_MOVEMENT);
+ generator.setParameter(UnicoreDataMovementConstants.DATAMOVEMENT_ID, identifier);
+ Query q = generator.deleteQuery(em);
+ q.executeUpdate();
+ em.getTransaction().commit();
+ em.close();
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+ public Resource get(Object identifier) throws AppCatalogException {
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(UNICORE_DATA_MOVEMENT);
+ generator.setParameter(UnicoreDataMovementConstants.DATAMOVEMENT_ID, identifier);
+ Query q = generator.selectQuery(em);
+ UnicoreDataMovement unicoreDataMovement = (UnicoreDataMovement) q.getSingleResult();
+ UnicoreDataMovementResource dataMovementResource =
+ (UnicoreDataMovementResource) AppCatalogJPAUtils
+ .getResource(AppCatalogResourceType.UNICORE_DATA_MOVEMENT,
+ unicoreDataMovement);
+ em.getTransaction().commit();
+ em.close();
+ return dataMovementResource;
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+
+ public List<Resource> get(String fieldName, Object value) throws AppCatalogException {
+ List<Resource> unicoreDMResourceList = new ArrayList<Resource>();
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ Query q;
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(UNICORE_DATA_MOVEMENT);
+ List results;
+ if (fieldName.equals(UnicoreDataMovementConstants.UNICORE_ENDPOINT_URL)) {
+ generator.setParameter(UnicoreDataMovementConstants.UNICORE_ENDPOINT_URL, value);
+ q = generator.selectQuery(em);
+ results = q.getResultList();
+ if (results.size() != 0) {
+ for (Object result : results) {
+ UnicoreDataMovement dataMovement = (UnicoreDataMovement) result;
+ UnicoreDataMovementResource unicoreJobSubmissionResource =
+ (UnicoreDataMovementResource) AppCatalogJPAUtils.getResource(
+ AppCatalogResourceType.UNICORE_DATA_MOVEMENT, dataMovement);
+ unicoreDMResourceList.add(unicoreJobSubmissionResource);
+ }
+ }
+ } else if (fieldName.equals(UnicoreDataMovementConstants.SECURITY_PROTOCAL)) {
+ generator.setParameter(UnicoreDataMovementConstants.SECURITY_PROTOCAL, value);
+ q = generator.selectQuery(em);
+ results = q.getResultList();
+ if (results.size() != 0) {
+ for (Object result : results) {
+ UnicoreDataMovement dataMovement = (UnicoreDataMovement) result;
+ UnicoreDataMovementResource dataMovementResource =
+ (UnicoreDataMovementResource) AppCatalogJPAUtils.getResource(
+ AppCatalogResourceType.UNICORE_DATA_MOVEMENT, dataMovement);
+ unicoreDMResourceList.add(dataMovementResource);
+ }
+ }
+ } else {
+ em.getTransaction().commit();
+ em.close();
+ logger.error("Unsupported field name for Unicore data movement resource.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Unsupported field name for Unicore data movement resource.");
+ }
+ em.getTransaction().commit();
+ em.close();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ return unicoreDMResourceList;
+ }
+
+ @Override
+ public List<Resource> getAll() throws AppCatalogException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public List<String> getAllIds() throws AppCatalogException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<String> getIds(String fieldName, Object value) throws AppCatalogException {
+ return null;
+ }
+
+ public void save() throws AppCatalogException {
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ UnicoreDataMovement existingDataMovement = em.find(UnicoreDataMovement.class, dataMovementId);
+ em.close();
+
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ if (existingDataMovement != null) {
+ existingDataMovement.setDataMovementId(dataMovementId);;
+ existingDataMovement.setUnicoreEndpointUrl(unicoreEndpointUrl);
+ existingDataMovement.setSecurityProtocol(securityProtocol);
+ em.merge(existingDataMovement);
+ } else {
+ UnicoreDataMovement unicoreJobSubmission = new UnicoreDataMovement();
+ unicoreJobSubmission.setDataMovementId(dataMovementId);
+ unicoreJobSubmission.setUnicoreEndpointUrl(unicoreEndpointUrl);
+ unicoreJobSubmission.setSecurityProtocol(securityProtocol);
+ em.persist(unicoreJobSubmission);
+ }
+ em.getTransaction().commit();
+ em.close();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+ public boolean isExists(Object identifier) throws AppCatalogException {
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ UnicoreDataMovement dataMovement = em.find(UnicoreDataMovement.class, identifier);
+ em.close();
+ return dataMovement != null;
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ throw new AppCatalogException(e);
+ } finally {
+ if (em != null && em.isOpen()) {
+ if (em.getTransaction().isActive()) {
+ em.getTransaction().rollback();
+ }
+ em.close();
+ }
+ }
+ }
+
+
+ public String getDataMovementId() {
+ return dataMovementId;
+ }
+
+ public void setDataMovementId(String dataMovementId) {
+ this.dataMovementId = dataMovementId;
+ }
+
+ public String getSecurityProtocol() {
+ return securityProtocol;
+ }
+
+ public void setSecurityProtocol(String securityProtocol) {
+ this.securityProtocol = securityProtocol;
+ }
+
+ public String getUnicoreEndpointUrl() {
+ return unicoreEndpointUrl;
+ }
+
+ public void setUnicoreEndpointUrl(String unicoreEndpointUrl) {
+ this.unicoreEndpointUrl = unicoreEndpointUrl;
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
index e564cda..6f8777b 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogJPAUtils.java
@@ -122,7 +122,13 @@ public class AppCatalogJPAUtils {
logger.error("Object should be a GSISSH Submission", new IllegalArgumentException());
throw new IllegalArgumentException("Object should be a GSISSH Submission.");
}
-
+ case UNICORE_DATA_MOVEMENT:
+ if (o instanceof UnicoreDataMovement){
+ return createUnicoreDataMovement((UnicoreDataMovement) o);
+ }else {
+ logger.error("Object should be a GSISSH Submission", new IllegalArgumentException());
+ throw new IllegalArgumentException("Object should be a GSISSH Submission.");
+ }
case GSISSH_EXPORT:
if (o instanceof GSISSHExport){
return createGSISSHExport((GSISSHExport) o);
@@ -526,9 +532,20 @@ public class AppCatalogJPAUtils {
if (o != null) {
submissionResource.setjobSubmissionInterfaceId(o.getSubmissionID());
submissionResource.setUnicoreEndpointUrl(o.getUnicoreEndpointUrl());
+ submissionResource.setSecurityProtocol(o.getSecurityProtocol());
}
return submissionResource;
}
+
+ private static Resource createUnicoreDataMovement(UnicoreDataMovement o) {
+ UnicoreDataMovementResource dataMovementResource = new UnicoreDataMovementResource();
+ if (o != null) {
+ dataMovementResource.setDataMovementId(o.getDataMovementId());
+ dataMovementResource.setUnicoreEndpointUrl(o.getUnicoreEndpointUrl());
+ dataMovementResource.setSecurityProtocol(o.getSecurityProtocol());
+ }
+ return dataMovementResource;
+ }
private static Resource createGSISSHExport(GSISSHExport o){
GSISSHExportResource resource = new GSISSHExportResource();
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogResourceType.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogResourceType.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogResourceType.java
index 81b12d8..196d3a1 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogResourceType.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogResourceType.java
@@ -31,6 +31,7 @@ public enum AppCatalogResourceType {
POST_JOBCOMMAND,
GLOBUS_SUBMISSION,
UNICORE_JOB_SUBMISSION,
+ UNICORE_DATA_MOVEMENT,
GLOBUS_GK_ENDPOINT,
SSH_JOB_SUBMISSION,
SCP_DATA_MOVEMENT,
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index 6757da0..aef23ae 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -232,9 +232,7 @@ public class AppCatalogThriftConversion {
public static UnicoreJobSubmissionResource getUnicoreJobSubmission (UnicoreJobSubmission submission){
UnicoreJobSubmissionResource resource = new UnicoreJobSubmissionResource();
-
resource.setjobSubmissionInterfaceId(submission.getJobSubmissionInterfaceId());
-
if (submission.getSecurityProtocol() != null){
resource.setSecurityProtocol(submission.getSecurityProtocol().toString());
}
@@ -242,6 +240,16 @@ public class AppCatalogThriftConversion {
return resource;
}
+ public static UnicoreDataMovementResource getUnicoreDMResource (UnicoreDataMovement dataMovement){
+ UnicoreDataMovementResource resource = new UnicoreDataMovementResource();
+ resource.setDataMovementId(dataMovement.getDataMovementInterfaceId());
+ if (dataMovement.getSecurityProtocol() != null){
+ resource.setSecurityProtocol(dataMovement.getSecurityProtocol().toString());
+ }
+ resource.setUnicoreEndpointUrl(dataMovement.getUnicoreEndPointURL());
+ return resource;
+ }
+
public static CloudSubmissionResource getCloudJobSubmission (CloudJobSubmission submission){
CloudSubmissionResource resource = new CloudSubmissionResource();
@@ -333,6 +341,14 @@ public class AppCatalogThriftConversion {
return unicoreJobSubmission;
}
+ public static UnicoreDataMovement getUnicoreDMDescription (UnicoreDataMovementResource resource) throws AppCatalogException {
+ UnicoreDataMovement dataMovement = new UnicoreDataMovement();
+ dataMovement.setUnicoreEndPointURL(resource.getUnicoreEndpointUrl());
+ dataMovement.setDataMovementInterfaceId(resource.getDataMovementId());
+ dataMovement.setSecurityProtocol(SecurityProtocol.GSI);
+ return dataMovement;
+ }
+
public static CloudJobSubmission getCloudJobSubmissionDescription (CloudSubmissionResource submission) throws AppCatalogException {
CloudJobSubmission cloudJobSubmission = new CloudJobSubmission();
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml b/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
index e85eb3f..5fa184d 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/META-INF/persistence.xml
@@ -31,6 +31,7 @@
<class>org.apache.aiaravata.application.catalog.data.model.PreJobCommand</class>
<class>org.apache.aiaravata.application.catalog.data.model.PostJobCommand</class>
<class>org.apache.aiaravata.application.catalog.data.model.UnicoreJobSubmission</class>
+ <class>org.apache.aiaravata.application.catalog.data.model.UnicoreDataMovement</class>
<class>org.apache.aiaravata.application.catalog.data.model.HostAlias</class>
<class>org.apache.aiaravata.application.catalog.data.model.HostIPAddress</class>
<class>org.apache.aiaravata.application.catalog.data.model.ScpDataMovement</class>
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
index 7a1bb57..0ca4551 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-derby.sql
@@ -82,6 +82,14 @@ CREATE TABLE UNICORE_SUBMISSION
PRIMARY KEY(SUBMISSION_ID)
);
+CREATE TABLE UNICORE_DATAMOVEMENT
+(
+ DATAMOVEMENT_ID VARCHAR(255),
+ SECURITY_PROTOCAL VARCHAR(255),
+ UNICORE_ENDPOINT_URL VARCHAR(255),
+ PRIMARY KEY(DATAMOVEMENT_ID)
+);
+
CREATE TABLE GLOBUS_GK_ENDPOINT
(
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
index f874b3c..9dbf5d9 100644
--- a/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
+++ b/modules/app-catalog/app-catalog-data/src/main/resources/appcatalog-mysql.sql
@@ -93,6 +93,15 @@ CREATE TABLE UNICORE_SUBMISSION
UNICORE_ENDPOINT_URL VARCHAR(255),
PRIMARY KEY(SUBMISSION_ID)
);
+
+CREATE TABLE UNICORE_DATAMOVEMENT
+(
+ DATAMOVEMENT_ID VARCHAR(255),
+ SECURITY_PROTOCAL VARCHAR(255),
+ UNICORE_ENDPOINT_URL VARCHAR(255),
+ PRIMARY KEY(DATAMOVEMENT_ID)
+);
+
CREATE TABLE GLOBUS_GK_ENDPOINT
(
SUBMISSION_ID VARCHAR(255),
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
index 7a1bb57..0ca4551 100644
--- a/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
+++ b/modules/app-catalog/app-catalog-data/src/test/resources/appcatalog-derby.sql
@@ -82,6 +82,14 @@ CREATE TABLE UNICORE_SUBMISSION
PRIMARY KEY(SUBMISSION_ID)
);
+CREATE TABLE UNICORE_DATAMOVEMENT
+(
+ DATAMOVEMENT_ID VARCHAR(255),
+ SECURITY_PROTOCAL VARCHAR(255),
+ UNICORE_ENDPOINT_URL VARCHAR(255),
+ PRIMARY KEY(DATAMOVEMENT_ID)
+);
+
CREATE TABLE GLOBUS_GK_ENDPOINT
(
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index c73e61a..c493752 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -216,7 +216,7 @@ connection.name=xsede
activity.listeners=org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataTaskStatusUpdator,org.apache.airavata.gfac.core.monitor.AiravataWorkflowNodeStatusUpdator,org.apache.airavata.api.server.listener.AiravataExperimentStatusUpdator,org.apache.airavata.gfac.core.monitor.GfacInternalStatusUpdator,org.apache.airavata.workflow.engine.util.ProxyMonitorPublisher
publish.rabbitmq=false
activity.publisher=org.apache.airavata.messaging.core.impl.RabbitMQPublisher
-rabbitmq.broker.url=amqp://localhost:5672
+rabbitmq.broker.url=amqp://gw111.iu.xsede.org:5672
rabbitmq.exchange.name=airavata_rabbitmq_exchange
###########################################################################
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java
----------------------------------------------------------------------
diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java
index 215d531..601497a 100644
--- a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java
+++ b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java
@@ -30,12 +30,15 @@ import org.apache.airavata.messaging.core.MessageHandler;
import org.apache.airavata.messaging.core.MessagingConstants;
import org.apache.airavata.messaging.core.impl.RabbitMQConsumer;
import org.apache.airavata.model.messaging.event.*;
+import org.apache.airavata.model.workspace.experiment.ExperimentState;
import org.apache.commons.cli.*;
import org.apache.thrift.TBase;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.*;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -55,10 +58,14 @@ public class RabbitMQListner {
private static boolean allMessages = false;
public static void main(String[] args) {
+ File file = new File("/tmp/latency_client");
parseArguments(args);
try {
+ FileOutputStream fos = new FileOutputStream(file, false);
+ final BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(fos));
AiravataUtils.setExecutionAsServer();
String brokerUrl = ServerSettings.getSetting(RABBITMQ_BROKER_URL);
+ System.out.println("broker url " + brokerUrl);
final String exchangeName = ServerSettings.getSetting(RABBITMQ_EXCHANGE_NAME);
RabbitMQConsumer consumer = new RabbitMQConsumer(brokerUrl, exchangeName);
consumer.listen(new MessageHandler() {
@@ -99,6 +106,14 @@ public class RabbitMQListner {
@Override
public void onMessage(MessageContext message) {
+ try {
+ long latency = System.currentTimeMillis() - message.getUpdatedTime().getTime();
+ bw.write(message.getMessageId() + " :" + latency);
+ bw.newLine();
+ bw.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
if (message.getType().equals(MessageType.EXPERIMENT)){
try {
ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent();
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
index b6e9c98..a8b5150 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
@@ -89,7 +89,7 @@ public class RabbitMQPublisher implements Publisher {
}
byte[] messageBody = ThriftUtils.serializeThriftObject(message);
rabbitMQProducer.send(messageBody, routingKey);
- statCounter.add();
+ statCounter.add(message);
} catch (TException e) {
String msg = "Error while deserializing the object";
log.error(msg, e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java
new file mode 100644
index 0000000..286e059
--- /dev/null
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java
@@ -0,0 +1,36 @@
+package org.apache.airavata.messaging.core.stats;
+
+import java.io.*;
+import java.util.List;
+import java.util.TimerTask;
+
+public class CountWriterTask extends TimerTask {
+
+ private File file;
+ private FileOutputStream fos;
+ private BufferedWriter bw;
+
+ public void setFile(File file) {
+ this.file = file;
+
+ }
+
+ @Override
+ public void run() {
+ try {
+ System.out.println("########### calling Write Task ############");
+ StatCounter statCounter = StatCounter.getInstance();
+ List<Long> contPer10S = statCounter.getMessageContPer10S();
+ fos = new FileOutputStream(file, false);
+ bw = new BufferedWriter(new OutputStreamWriter(fos));
+ for (int i = 0; i < contPer10S.size(); i++) {
+ bw.write(String.valueOf(i+1) + " :" + String.valueOf(contPer10S.get(i)));
+ bw.newLine();
+ }
+ bw.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
new file mode 100644
index 0000000..1e2ccd0
--- /dev/null
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java
@@ -0,0 +1,37 @@
+package org.apache.airavata.messaging.core.stats;
+
+import java.io.*;
+import java.util.List;
+import java.util.Map;
+import java.util.TimerTask;
+
+public class LatencyWriterTask extends TimerTask {
+
+ private File file;
+ private FileOutputStream fos;
+ private BufferedWriter bw;
+
+ public void setFile(File file) {
+ this.file = file;
+
+ }
+
+ @Override
+ public void run() {
+ try {
+ System.out.println("########### Latency Write Task ############");
+ StatCounter statCounter = StatCounter.getInstance();
+ Map<String, Long> messageTimeStamp = statCounter.getMessageTimeStamp();
+ fos = new FileOutputStream(file, false);
+ bw = new BufferedWriter(new OutputStreamWriter(fos));
+ for (String msgId : messageTimeStamp.keySet()){
+ bw.write(msgId + " :" + String.valueOf(messageTimeStamp.get(msgId)));
+ bw.newLine();
+ }
+ bw.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
index d6c572d..19c675a 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java
@@ -1,10 +1,10 @@
package org.apache.airavata.messaging.core.stats;
+import org.apache.airavata.model.messaging.event.Message;
+
import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
+import java.util.*;
public class StatCounter {
private static StatCounter ourInstance = new StatCounter();
@@ -13,11 +13,11 @@ public class StatCounter {
private long msgCountForPeriod;
private long bucketStartTime = 0;
- private File file;
- private FileOutputStream fos;
- private BufferedWriter bw;
+ private File file1;
+ private File file2;
private List<Long> messageContPer10S = new ArrayList<Long>();
+ private Map<String, Long> messageTimeStamp = new HashMap<String, Long>();
public static StatCounter getInstance() {
return ourInstance;
@@ -40,15 +40,21 @@ public class StatCounter {
}
private StatCounter() {
- file = new File("/tmp/results");
- Timer timer = new Timer();
- WriterTask writerTask = new WriterTask();
- writerTask.setFile(file);
- timer.scheduleAtFixedRate(writerTask, 0, 60 * 1000);
+ file1 = new File("/tmp/results");
+ file2 = new File("/tmp/latency");
+ Timer counterTimer = new Timer();
+ Timer latencyTimer = new Timer();
+ CountWriterTask writerTask = new CountWriterTask();
+ writerTask.setFile(file1);
+ LatencyWriterTask latencyWriterTask = new LatencyWriterTask();
+ latencyWriterTask.setFile(file2);
+ counterTimer.scheduleAtFixedRate(writerTask, 0, 60 * 1000);
+ latencyTimer.scheduleAtFixedRate(latencyWriterTask, 0, 60 * 1000);
}
- public void add () {
+ public void add (Message message) {
+ messageTimeStamp.put(message.getMessageId(), System.currentTimeMillis());
if (System.currentTimeMillis() - bucketStartTime < period) {
msgCountForPeriod++;
} else {
@@ -66,4 +72,12 @@ public class StatCounter {
public void setMsgCountForPeriod(long msgCountForPeriod) {
this.msgCountForPeriod = msgCountForPeriod;
}
+
+ public Map<String, Long> getMessageTimeStamp() {
+ return messageTimeStamp;
+ }
+
+ public void setMessageTimeStamp(Map<String, Long> messageTimeStamp) {
+ this.messageTimeStamp = messageTimeStamp;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/WriterTask.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/WriterTask.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/WriterTask.java
deleted file mode 100644
index b154ad7..0000000
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/WriterTask.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.airavata.messaging.core.stats;
-
-import java.io.*;
-import java.util.List;
-import java.util.TimerTask;
-
-/**
- * Created by chathuri on 2/16/15.
- */
-public class WriterTask extends TimerTask {
-
- private File file;
- private FileOutputStream fos;
- private BufferedWriter bw;
-
- public void setFile(File file) {
- this.file = file;
-
- }
-
- @Override
- public void run() {
- try {
- System.out.println("########### calling Write Task ############");
- StatCounter statCounter = StatCounter.getInstance();
- List<Long> contPer10S = statCounter.getMessageContPer10S();
- fos = new FileOutputStream(file, false);
- bw = new BufferedWriter(new OutputStreamWriter(fos));
- for (int i = 0; i < contPer10S.size(); i++) {
- bw.write(String.valueOf(i+1) + " :" + String.valueOf(contPer10S.get(i)));
- bw.newLine();
- }
- bw.flush();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- }
-}
[09/13] airavata git commit: fixing AIRAVATA-1584
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/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 73a7aaa..397421e 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
@@ -96,12 +96,16 @@ class AiravataIf {
virtual void getCloudJobSubmission( ::apache::airavata::model::appcatalog::computeresource::CloudJobSubmission& _return, const std::string& jobSubmissionId) = 0;
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 bool updateUnicoreJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission) = 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& 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& 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 addUnicoreDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement) = 0;
+ virtual bool updateUnicoreDataMovementDetails(const std::string& dataMovementInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement) = 0;
+ virtual void getUnicoreDataMovement( ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& _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& 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;
@@ -366,6 +370,10 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
+ bool updateUnicoreJobSubmissionDetails(const std::string& /* jobSubmissionInterfaceId */, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& /* unicoreJobSubmission */) {
+ bool _return = false;
+ return _return;
+ }
void addLocalDataMovementDetails(std::string& /* _return */, const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& /* localDataMovement */) {
return;
}
@@ -386,6 +394,16 @@ class AiravataNull : virtual public AiravataIf {
void getSCPDataMovement( ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& /* _return */, const std::string& /* dataMovementId */) {
return;
}
+ void addUnicoreDataMovementDetails(std::string& /* _return */, const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& /* unicoreDataMovement */) {
+ return;
+ }
+ bool updateUnicoreDataMovementDetails(const std::string& /* dataMovementInterfaceId */, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& /* unicoreDataMovement */) {
+ bool _return = false;
+ return _return;
+ }
+ void getUnicoreDataMovement( ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& /* _return */, const std::string& /* dataMovementId */) {
+ return;
+ }
void addGridFTPDataMovementDetails(std::string& /* _return */, const std::string& /* computeResourceId */, const int32_t /* priorityOrder */, const ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& /* gridFTPDataMovement */) {
return;
}
@@ -9153,6 +9171,146 @@ class Airavata_updateCloudJobSubmissionDetails_presult {
};
+class Airavata_updateUnicoreJobSubmissionDetails_args {
+ public:
+
+ Airavata_updateUnicoreJobSubmissionDetails_args() : jobSubmissionInterfaceId() {
+ }
+
+ virtual ~Airavata_updateUnicoreJobSubmissionDetails_args() throw() {}
+
+ std::string jobSubmissionInterfaceId;
+ ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission unicoreJobSubmission;
+
+ void __set_jobSubmissionInterfaceId(const std::string& val) {
+ jobSubmissionInterfaceId = val;
+ }
+
+ void __set_unicoreJobSubmission(const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& val) {
+ unicoreJobSubmission = val;
+ }
+
+ bool operator == (const Airavata_updateUnicoreJobSubmissionDetails_args & rhs) const
+ {
+ if (!(jobSubmissionInterfaceId == rhs.jobSubmissionInterfaceId))
+ return false;
+ if (!(unicoreJobSubmission == rhs.unicoreJobSubmission))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_updateUnicoreJobSubmissionDetails_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_updateUnicoreJobSubmissionDetails_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class Airavata_updateUnicoreJobSubmissionDetails_pargs {
+ public:
+
+
+ virtual ~Airavata_updateUnicoreJobSubmissionDetails_pargs() throw() {}
+
+ const std::string* jobSubmissionInterfaceId;
+ const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission* unicoreJobSubmission;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_updateUnicoreJobSubmissionDetails_result__isset {
+ _Airavata_updateUnicoreJobSubmissionDetails_result__isset() : success(false), ire(false), ace(false), ase(false) {}
+ bool success;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_updateUnicoreJobSubmissionDetails_result__isset;
+
+class Airavata_updateUnicoreJobSubmissionDetails_result {
+ public:
+
+ Airavata_updateUnicoreJobSubmissionDetails_result() : success(0) {
+ }
+
+ virtual ~Airavata_updateUnicoreJobSubmissionDetails_result() throw() {}
+
+ bool success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+
+ _Airavata_updateUnicoreJobSubmissionDetails_result__isset __isset;
+
+ void __set_success(const bool val) {
+ success = val;
+ }
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val) {
+ ire = val;
+ }
+
+ void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val) {
+ ace = val;
+ }
+
+ void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val) {
+ ase = val;
+ }
+
+ bool operator == (const Airavata_updateUnicoreJobSubmissionDetails_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_updateUnicoreJobSubmissionDetails_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_updateUnicoreJobSubmissionDetails_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_updateUnicoreJobSubmissionDetails_presult__isset {
+ _Airavata_updateUnicoreJobSubmissionDetails_presult__isset() : success(false), ire(false), ace(false), ase(false) {}
+ bool success;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_updateUnicoreJobSubmissionDetails_presult__isset;
+
+class Airavata_updateUnicoreJobSubmissionDetails_presult {
+ public:
+
+
+ virtual ~Airavata_updateUnicoreJobSubmissionDetails_presult() throw() {}
+
+ bool* success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+
+ _Airavata_updateUnicoreJobSubmissionDetails_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
class Airavata_addLocalDataMovementDetails_args {
public:
@@ -9993,6 +10151,426 @@ class Airavata_getSCPDataMovement_presult {
};
+class Airavata_addUnicoreDataMovementDetails_args {
+ public:
+
+ Airavata_addUnicoreDataMovementDetails_args() : computeResourceId(), priorityOrder(0) {
+ }
+
+ virtual ~Airavata_addUnicoreDataMovementDetails_args() throw() {}
+
+ std::string computeResourceId;
+ int32_t priorityOrder;
+ ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement unicoreDataMovement;
+
+ void __set_computeResourceId(const std::string& val) {
+ computeResourceId = val;
+ }
+
+ void __set_priorityOrder(const int32_t val) {
+ priorityOrder = val;
+ }
+
+ void __set_unicoreDataMovement(const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& val) {
+ unicoreDataMovement = val;
+ }
+
+ bool operator == (const Airavata_addUnicoreDataMovementDetails_args & rhs) const
+ {
+ if (!(computeResourceId == rhs.computeResourceId))
+ return false;
+ if (!(priorityOrder == rhs.priorityOrder))
+ return false;
+ if (!(unicoreDataMovement == rhs.unicoreDataMovement))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_addUnicoreDataMovementDetails_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_addUnicoreDataMovementDetails_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class Airavata_addUnicoreDataMovementDetails_pargs {
+ public:
+
+
+ virtual ~Airavata_addUnicoreDataMovementDetails_pargs() throw() {}
+
+ const std::string* computeResourceId;
+ const int32_t* priorityOrder;
+ const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement* unicoreDataMovement;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_addUnicoreDataMovementDetails_result__isset {
+ _Airavata_addUnicoreDataMovementDetails_result__isset() : success(false), ire(false), ace(false), ase(false) {}
+ bool success;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_addUnicoreDataMovementDetails_result__isset;
+
+class Airavata_addUnicoreDataMovementDetails_result {
+ public:
+
+ Airavata_addUnicoreDataMovementDetails_result() : success() {
+ }
+
+ virtual ~Airavata_addUnicoreDataMovementDetails_result() throw() {}
+
+ std::string success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+
+ _Airavata_addUnicoreDataMovementDetails_result__isset __isset;
+
+ void __set_success(const std::string& val) {
+ success = val;
+ }
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val) {
+ ire = val;
+ }
+
+ void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val) {
+ ace = val;
+ }
+
+ void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val) {
+ ase = val;
+ }
+
+ bool operator == (const Airavata_addUnicoreDataMovementDetails_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_addUnicoreDataMovementDetails_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_addUnicoreDataMovementDetails_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_addUnicoreDataMovementDetails_presult__isset {
+ _Airavata_addUnicoreDataMovementDetails_presult__isset() : success(false), ire(false), ace(false), ase(false) {}
+ bool success;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_addUnicoreDataMovementDetails_presult__isset;
+
+class Airavata_addUnicoreDataMovementDetails_presult {
+ public:
+
+
+ virtual ~Airavata_addUnicoreDataMovementDetails_presult() throw() {}
+
+ std::string* success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+
+ _Airavata_addUnicoreDataMovementDetails_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class Airavata_updateUnicoreDataMovementDetails_args {
+ public:
+
+ Airavata_updateUnicoreDataMovementDetails_args() : dataMovementInterfaceId() {
+ }
+
+ virtual ~Airavata_updateUnicoreDataMovementDetails_args() throw() {}
+
+ std::string dataMovementInterfaceId;
+ ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement unicoreDataMovement;
+
+ void __set_dataMovementInterfaceId(const std::string& val) {
+ dataMovementInterfaceId = val;
+ }
+
+ void __set_unicoreDataMovement(const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& val) {
+ unicoreDataMovement = val;
+ }
+
+ bool operator == (const Airavata_updateUnicoreDataMovementDetails_args & rhs) const
+ {
+ if (!(dataMovementInterfaceId == rhs.dataMovementInterfaceId))
+ return false;
+ if (!(unicoreDataMovement == rhs.unicoreDataMovement))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_updateUnicoreDataMovementDetails_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_updateUnicoreDataMovementDetails_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class Airavata_updateUnicoreDataMovementDetails_pargs {
+ public:
+
+
+ virtual ~Airavata_updateUnicoreDataMovementDetails_pargs() throw() {}
+
+ const std::string* dataMovementInterfaceId;
+ const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement* unicoreDataMovement;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_updateUnicoreDataMovementDetails_result__isset {
+ _Airavata_updateUnicoreDataMovementDetails_result__isset() : success(false), ire(false), ace(false), ase(false) {}
+ bool success;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_updateUnicoreDataMovementDetails_result__isset;
+
+class Airavata_updateUnicoreDataMovementDetails_result {
+ public:
+
+ Airavata_updateUnicoreDataMovementDetails_result() : success(0) {
+ }
+
+ virtual ~Airavata_updateUnicoreDataMovementDetails_result() throw() {}
+
+ bool success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+
+ _Airavata_updateUnicoreDataMovementDetails_result__isset __isset;
+
+ void __set_success(const bool val) {
+ success = val;
+ }
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val) {
+ ire = val;
+ }
+
+ void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val) {
+ ace = val;
+ }
+
+ void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val) {
+ ase = val;
+ }
+
+ bool operator == (const Airavata_updateUnicoreDataMovementDetails_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_updateUnicoreDataMovementDetails_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_updateUnicoreDataMovementDetails_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_updateUnicoreDataMovementDetails_presult__isset {
+ _Airavata_updateUnicoreDataMovementDetails_presult__isset() : success(false), ire(false), ace(false), ase(false) {}
+ bool success;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_updateUnicoreDataMovementDetails_presult__isset;
+
+class Airavata_updateUnicoreDataMovementDetails_presult {
+ public:
+
+
+ virtual ~Airavata_updateUnicoreDataMovementDetails_presult() throw() {}
+
+ bool* success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+
+ _Airavata_updateUnicoreDataMovementDetails_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
+class Airavata_getUnicoreDataMovement_args {
+ public:
+
+ Airavata_getUnicoreDataMovement_args() : dataMovementId() {
+ }
+
+ virtual ~Airavata_getUnicoreDataMovement_args() throw() {}
+
+ std::string dataMovementId;
+
+ void __set_dataMovementId(const std::string& val) {
+ dataMovementId = val;
+ }
+
+ bool operator == (const Airavata_getUnicoreDataMovement_args & rhs) const
+ {
+ if (!(dataMovementId == rhs.dataMovementId))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_getUnicoreDataMovement_args &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_getUnicoreDataMovement_args & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+
+class Airavata_getUnicoreDataMovement_pargs {
+ public:
+
+
+ virtual ~Airavata_getUnicoreDataMovement_pargs() throw() {}
+
+ const std::string* dataMovementId;
+
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_getUnicoreDataMovement_result__isset {
+ _Airavata_getUnicoreDataMovement_result__isset() : success(false), ire(false), ace(false), ase(false) {}
+ bool success;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_getUnicoreDataMovement_result__isset;
+
+class Airavata_getUnicoreDataMovement_result {
+ public:
+
+ Airavata_getUnicoreDataMovement_result() {
+ }
+
+ virtual ~Airavata_getUnicoreDataMovement_result() throw() {}
+
+ ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+
+ _Airavata_getUnicoreDataMovement_result__isset __isset;
+
+ void __set_success(const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& val) {
+ success = val;
+ }
+
+ void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val) {
+ ire = val;
+ }
+
+ void __set_ace(const ::apache::airavata::api::error::AiravataClientException& val) {
+ ace = val;
+ }
+
+ void __set_ase(const ::apache::airavata::api::error::AiravataSystemException& val) {
+ ase = val;
+ }
+
+ bool operator == (const Airavata_getUnicoreDataMovement_result & rhs) const
+ {
+ if (!(success == rhs.success))
+ return false;
+ if (!(ire == rhs.ire))
+ return false;
+ if (!(ace == rhs.ace))
+ return false;
+ if (!(ase == rhs.ase))
+ return false;
+ return true;
+ }
+ bool operator != (const Airavata_getUnicoreDataMovement_result &rhs) const {
+ return !(*this == rhs);
+ }
+
+ bool operator < (const Airavata_getUnicoreDataMovement_result & ) const;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+ uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
+
+};
+
+typedef struct _Airavata_getUnicoreDataMovement_presult__isset {
+ _Airavata_getUnicoreDataMovement_presult__isset() : success(false), ire(false), ace(false), ase(false) {}
+ bool success;
+ bool ire;
+ bool ace;
+ bool ase;
+} _Airavata_getUnicoreDataMovement_presult__isset;
+
+class Airavata_getUnicoreDataMovement_presult {
+ public:
+
+
+ virtual ~Airavata_getUnicoreDataMovement_presult() throw() {}
+
+ ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement* success;
+ ::apache::airavata::api::error::InvalidRequestException ire;
+ ::apache::airavata::api::error::AiravataClientException ace;
+ ::apache::airavata::api::error::AiravataSystemException ase;
+
+ _Airavata_getUnicoreDataMovement_presult__isset __isset;
+
+ uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
+
+};
+
+
class Airavata_addGridFTPDataMovementDetails_args {
public:
@@ -14396,6 +14974,9 @@ class AiravataClient : virtual public AiravataIf {
bool updateCloudJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::CloudJobSubmission& sshJobSubmission);
void send_updateCloudJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::CloudJobSubmission& sshJobSubmission);
bool recv_updateCloudJobSubmissionDetails();
+ bool updateUnicoreJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission);
+ void send_updateUnicoreJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission);
+ bool recv_updateUnicoreJobSubmissionDetails();
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);
@@ -14414,6 +14995,15 @@ class AiravataClient : virtual public AiravataIf {
void getSCPDataMovement( ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& _return, const std::string& dataMovementId);
void send_getSCPDataMovement(const std::string& dataMovementId);
void recv_getSCPDataMovement( ::apache::airavata::model::appcatalog::computeresource::SCPDataMovement& _return);
+ void addUnicoreDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement);
+ void send_addUnicoreDataMovementDetails(const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement);
+ void recv_addUnicoreDataMovementDetails(std::string& _return);
+ bool updateUnicoreDataMovementDetails(const std::string& dataMovementInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement);
+ void send_updateUnicoreDataMovementDetails(const std::string& dataMovementInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement);
+ bool recv_updateUnicoreDataMovementDetails();
+ void getUnicoreDataMovement( ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& _return, const std::string& dataMovementId);
+ void send_getUnicoreDataMovement(const std::string& dataMovementId);
+ void recv_getUnicoreDataMovement( ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& _return);
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);
@@ -14586,12 +15176,16 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_getCloudJobSubmission(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateSSHJobSubmissionDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateCloudJobSubmissionDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_updateUnicoreJobSubmissionDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_addLocalDataMovementDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateLocalDataMovementDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getLocalDataMovement(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_addSCPDataMovementDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateSCPDataMovementDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getSCPDataMovement(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_addUnicoreDataMovementDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_updateUnicoreDataMovementDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_getUnicoreDataMovement(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_addGridFTPDataMovementDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateGridFTPDataMovementDetails(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getGridFTPDataMovement(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -14690,12 +15284,16 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["getCloudJobSubmission"] = &AiravataProcessor::process_getCloudJobSubmission;
processMap_["updateSSHJobSubmissionDetails"] = &AiravataProcessor::process_updateSSHJobSubmissionDetails;
processMap_["updateCloudJobSubmissionDetails"] = &AiravataProcessor::process_updateCloudJobSubmissionDetails;
+ processMap_["updateUnicoreJobSubmissionDetails"] = &AiravataProcessor::process_updateUnicoreJobSubmissionDetails;
processMap_["addLocalDataMovementDetails"] = &AiravataProcessor::process_addLocalDataMovementDetails;
processMap_["updateLocalDataMovementDetails"] = &AiravataProcessor::process_updateLocalDataMovementDetails;
processMap_["getLocalDataMovement"] = &AiravataProcessor::process_getLocalDataMovement;
processMap_["addSCPDataMovementDetails"] = &AiravataProcessor::process_addSCPDataMovementDetails;
processMap_["updateSCPDataMovementDetails"] = &AiravataProcessor::process_updateSCPDataMovementDetails;
processMap_["getSCPDataMovement"] = &AiravataProcessor::process_getSCPDataMovement;
+ processMap_["addUnicoreDataMovementDetails"] = &AiravataProcessor::process_addUnicoreDataMovementDetails;
+ processMap_["updateUnicoreDataMovementDetails"] = &AiravataProcessor::process_updateUnicoreDataMovementDetails;
+ processMap_["getUnicoreDataMovement"] = &AiravataProcessor::process_getUnicoreDataMovement;
processMap_["addGridFTPDataMovementDetails"] = &AiravataProcessor::process_addGridFTPDataMovementDetails;
processMap_["updateGridFTPDataMovementDetails"] = &AiravataProcessor::process_updateGridFTPDataMovementDetails;
processMap_["getGridFTPDataMovement"] = &AiravataProcessor::process_getGridFTPDataMovement;
@@ -15377,6 +15975,15 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->updateCloudJobSubmissionDetails(jobSubmissionInterfaceId, sshJobSubmission);
}
+ bool updateUnicoreJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->updateUnicoreJobSubmissionDetails(jobSubmissionInterfaceId, unicoreJobSubmission);
+ }
+ return ifaces_[i]->updateUnicoreJobSubmissionDetails(jobSubmissionInterfaceId, unicoreJobSubmission);
+ }
+
void addLocalDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
size_t sz = ifaces_.size();
size_t i = 0;
@@ -15435,6 +16042,35 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
+ void addUnicoreDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->addUnicoreDataMovementDetails(_return, computeResourceId, priorityOrder, unicoreDataMovement);
+ }
+ ifaces_[i]->addUnicoreDataMovementDetails(_return, computeResourceId, priorityOrder, unicoreDataMovement);
+ return;
+ }
+
+ bool updateUnicoreDataMovementDetails(const std::string& dataMovementInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->updateUnicoreDataMovementDetails(dataMovementInterfaceId, unicoreDataMovement);
+ }
+ return ifaces_[i]->updateUnicoreDataMovementDetails(dataMovementInterfaceId, unicoreDataMovement);
+ }
+
+ void getUnicoreDataMovement( ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& _return, const std::string& dataMovementId) {
+ size_t sz = ifaces_.size();
+ size_t i = 0;
+ for (; i < (sz - 1); ++i) {
+ ifaces_[i]->getUnicoreDataMovement(_return, dataMovementId);
+ }
+ ifaces_[i]->getUnicoreDataMovement(_return, dataMovementId);
+ return;
+ }
+
void addGridFTPDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
size_t sz = ifaces_.size();
size_t i = 0;
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/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 2add1ac..ca5abee 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
@@ -359,6 +359,11 @@ class AiravataHandler : virtual public AiravataIf {
printf("updateCloudJobSubmissionDetails\n");
}
+ bool updateUnicoreJobSubmissionDetails(const std::string& jobSubmissionInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreJobSubmission& unicoreJobSubmission) {
+ // Your implementation goes here
+ printf("updateUnicoreJobSubmissionDetails\n");
+ }
+
void addLocalDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::LOCALDataMovement& localDataMovement) {
// Your implementation goes here
printf("addLocalDataMovementDetails\n");
@@ -389,6 +394,21 @@ class AiravataHandler : virtual public AiravataIf {
printf("getSCPDataMovement\n");
}
+ void addUnicoreDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement) {
+ // Your implementation goes here
+ printf("addUnicoreDataMovementDetails\n");
+ }
+
+ bool updateUnicoreDataMovementDetails(const std::string& dataMovementInterfaceId, const ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& unicoreDataMovement) {
+ // Your implementation goes here
+ printf("updateUnicoreDataMovementDetails\n");
+ }
+
+ void getUnicoreDataMovement( ::apache::airavata::model::appcatalog::computeresource::UnicoreDataMovement& _return, const std::string& dataMovementId) {
+ // Your implementation goes here
+ printf("getUnicoreDataMovement\n");
+ }
+
void addGridFTPDataMovementDetails(std::string& _return, const std::string& computeResourceId, const int32_t priorityOrder, const ::apache::airavata::model::appcatalog::computeresource::GridFTPDataMovement& gridFTPDataMovement) {
// Your implementation goes here
printf("addGridFTPDataMovementDetails\n");
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/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 88779bc..019627c 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
@@ -81,12 +81,16 @@ interface AiravataIf {
public function getCloudJobSubmission($jobSubmissionId);
public function updateSSHJobSubmissionDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SSHJobSubmission $sshJobSubmission);
public function updateCloudJobSubmissionDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\CloudJobSubmission $sshJobSubmission);
+ public function updateUnicoreJobSubmissionDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission $unicoreJobSubmission);
public function addLocalDataMovementDetails($computeResourceId, $priorityOrder, \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($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\SCPDataMovement $scpDataMovement);
public function getSCPDataMovement($dataMovementId);
+ public function addUnicoreDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement);
+ public function updateUnicoreDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement);
+ public function getUnicoreDataMovement($dataMovementId);
public function addGridFTPDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
public function updateGridFTPDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement);
public function getGridFTPDataMovement($dataMovementId);
@@ -4003,6 +4007,67 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("updateCloudJobSubmissionDetails failed: unknown result");
}
+ public function updateUnicoreJobSubmissionDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission $unicoreJobSubmission)
+ {
+ $this->send_updateUnicoreJobSubmissionDetails($jobSubmissionInterfaceId, $unicoreJobSubmission);
+ return $this->recv_updateUnicoreJobSubmissionDetails();
+ }
+
+ public function send_updateUnicoreJobSubmissionDetails($jobSubmissionInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission $unicoreJobSubmission)
+ {
+ $args = new \Airavata\API\Airavata_updateUnicoreJobSubmissionDetails_args();
+ $args->jobSubmissionInterfaceId = $jobSubmissionInterfaceId;
+ $args->unicoreJobSubmission = $unicoreJobSubmission;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'updateUnicoreJobSubmissionDetails', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('updateUnicoreJobSubmissionDetails', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_updateUnicoreJobSubmissionDetails()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateUnicoreJobSubmissionDetails_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_updateUnicoreJobSubmissionDetails_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ throw new \Exception("updateUnicoreJobSubmissionDetails failed: unknown result");
+ }
+
public function addLocalDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement $localDataMovement)
{
$this->send_addLocalDataMovementDetails($computeResourceId, $priorityOrder, $localDataMovement);
@@ -4369,6 +4434,189 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getSCPDataMovement failed: unknown result");
}
+ public function addUnicoreDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ {
+ $this->send_addUnicoreDataMovementDetails($computeResourceId, $priorityOrder, $unicoreDataMovement);
+ return $this->recv_addUnicoreDataMovementDetails();
+ }
+
+ public function send_addUnicoreDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ {
+ $args = new \Airavata\API\Airavata_addUnicoreDataMovementDetails_args();
+ $args->computeResourceId = $computeResourceId;
+ $args->priorityOrder = $priorityOrder;
+ $args->unicoreDataMovement = $unicoreDataMovement;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'addUnicoreDataMovementDetails', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('addUnicoreDataMovementDetails', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_addUnicoreDataMovementDetails()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_addUnicoreDataMovementDetails_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_addUnicoreDataMovementDetails_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ throw new \Exception("addUnicoreDataMovementDetails failed: unknown result");
+ }
+
+ public function updateUnicoreDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ {
+ $this->send_updateUnicoreDataMovementDetails($dataMovementInterfaceId, $unicoreDataMovement);
+ return $this->recv_updateUnicoreDataMovementDetails();
+ }
+
+ public function send_updateUnicoreDataMovementDetails($dataMovementInterfaceId, \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement $unicoreDataMovement)
+ {
+ $args = new \Airavata\API\Airavata_updateUnicoreDataMovementDetails_args();
+ $args->dataMovementInterfaceId = $dataMovementInterfaceId;
+ $args->unicoreDataMovement = $unicoreDataMovement;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'updateUnicoreDataMovementDetails', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('updateUnicoreDataMovementDetails', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_updateUnicoreDataMovementDetails()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateUnicoreDataMovementDetails_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_updateUnicoreDataMovementDetails_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ throw new \Exception("updateUnicoreDataMovementDetails failed: unknown result");
+ }
+
+ public function getUnicoreDataMovement($dataMovementId)
+ {
+ $this->send_getUnicoreDataMovement($dataMovementId);
+ return $this->recv_getUnicoreDataMovement();
+ }
+
+ public function send_getUnicoreDataMovement($dataMovementId)
+ {
+ $args = new \Airavata\API\Airavata_getUnicoreDataMovement_args();
+ $args->dataMovementId = $dataMovementId;
+ $bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
+ if ($bin_accel)
+ {
+ thrift_protocol_write_binary($this->output_, 'getUnicoreDataMovement', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ }
+ else
+ {
+ $this->output_->writeMessageBegin('getUnicoreDataMovement', TMessageType::CALL, $this->seqid_);
+ $args->write($this->output_);
+ $this->output_->writeMessageEnd();
+ $this->output_->getTransport()->flush();
+ }
+ }
+
+ public function recv_getUnicoreDataMovement()
+ {
+ $bin_accel = ($this->input_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_read_binary');
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getUnicoreDataMovement_result', $this->input_->isStrictRead());
+ else
+ {
+ $rseqid = 0;
+ $fname = null;
+ $mtype = 0;
+
+ $this->input_->readMessageBegin($fname, $mtype, $rseqid);
+ if ($mtype == TMessageType::EXCEPTION) {
+ $x = new TApplicationException();
+ $x->read($this->input_);
+ $this->input_->readMessageEnd();
+ throw $x;
+ }
+ $result = new \Airavata\API\Airavata_getUnicoreDataMovement_result();
+ $result->read($this->input_);
+ $this->input_->readMessageEnd();
+ }
+ if ($result->success !== null) {
+ return $result->success;
+ }
+ if ($result->ire !== null) {
+ throw $result->ire;
+ }
+ if ($result->ace !== null) {
+ throw $result->ace;
+ }
+ if ($result->ase !== null) {
+ throw $result->ase;
+ }
+ throw new \Exception("getUnicoreDataMovement failed: unknown result");
+ }
+
public function addGridFTPDataMovementDetails($computeResourceId, $priorityOrder, \Airavata\Model\AppCatalog\ComputeResource\GridFTPDataMovement $gridFTPDataMovement)
{
$this->send_addGridFTPDataMovementDetails($computeResourceId, $priorityOrder, $gridFTPDataMovement);
@@ -21032,46 +21280,38 @@ class Airavata_updateCloudJobSubmissionDetails_result {
}
-class Airavata_addLocalDataMovementDetails_args {
+class Airavata_updateUnicoreJobSubmissionDetails_args {
static $_TSPEC;
- public $computeResourceId = null;
- public $priorityOrder = null;
- public $localDataMovement = null;
+ public $jobSubmissionInterfaceId = null;
+ public $unicoreJobSubmission = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'computeResourceId',
+ 'var' => 'jobSubmissionInterfaceId',
'type' => TType::STRING,
),
2 => array(
- 'var' => 'priorityOrder',
- 'type' => TType::I32,
- ),
- 3 => array(
- 'var' => 'localDataMovement',
+ 'var' => 'unicoreJobSubmission',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
+ 'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission',
),
);
}
if (is_array($vals)) {
- if (isset($vals['computeResourceId'])) {
- $this->computeResourceId = $vals['computeResourceId'];
- }
- if (isset($vals['priorityOrder'])) {
- $this->priorityOrder = $vals['priorityOrder'];
+ if (isset($vals['jobSubmissionInterfaceId'])) {
+ $this->jobSubmissionInterfaceId = $vals['jobSubmissionInterfaceId'];
}
- if (isset($vals['localDataMovement'])) {
- $this->localDataMovement = $vals['localDataMovement'];
+ if (isset($vals['unicoreJobSubmission'])) {
+ $this->unicoreJobSubmission = $vals['unicoreJobSubmission'];
}
}
}
public function getName() {
- return 'Airavata_addLocalDataMovementDetails_args';
+ return 'Airavata_updateUnicoreJobSubmissionDetails_args';
}
public function read($input)
@@ -21091,22 +21331,15 @@ class Airavata_addLocalDataMovementDetails_args {
{
case 1:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->computeResourceId);
+ $xfer += $input->readString($this->jobSubmissionInterfaceId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 2:
- if ($ftype == TType::I32) {
- $xfer += $input->readI32($this->priorityOrder);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
- case 3:
if ($ftype == TType::STRUCT) {
- $this->localDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
- $xfer += $this->localDataMovement->read($input);
+ $this->unicoreJobSubmission = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreJobSubmission();
+ $xfer += $this->unicoreJobSubmission->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -21123,22 +21356,272 @@ class Airavata_addLocalDataMovementDetails_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addLocalDataMovementDetails_args');
- if ($this->computeResourceId !== null) {
- $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 1);
- $xfer += $output->writeString($this->computeResourceId);
- $xfer += $output->writeFieldEnd();
- }
- if ($this->priorityOrder !== null) {
- $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 2);
- $xfer += $output->writeI32($this->priorityOrder);
+ $xfer += $output->writeStructBegin('Airavata_updateUnicoreJobSubmissionDetails_args');
+ if ($this->jobSubmissionInterfaceId !== null) {
+ $xfer += $output->writeFieldBegin('jobSubmissionInterfaceId', TType::STRING, 1);
+ $xfer += $output->writeString($this->jobSubmissionInterfaceId);
$xfer += $output->writeFieldEnd();
}
- if ($this->localDataMovement !== null) {
- if (!is_object($this->localDataMovement)) {
+ if ($this->unicoreJobSubmission !== null) {
+ if (!is_object($this->unicoreJobSubmission)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('localDataMovement', TType::STRUCT, 3);
+ $xfer += $output->writeFieldBegin('unicoreJobSubmission', TType::STRUCT, 2);
+ $xfer += $this->unicoreJobSubmission->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_updateUnicoreJobSubmissionDetails_result {
+ static $_TSPEC;
+
+ public $success = null;
+ public $ire = null;
+ public $ace = null;
+ public $ase = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::BOOL,
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_updateUnicoreJobSubmissionDetails_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_updateUnicoreJobSubmissionDetails_result');
+ if ($this->success !== null) {
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_addLocalDataMovementDetails_args {
+ static $_TSPEC;
+
+ public $computeResourceId = null;
+ public $priorityOrder = null;
+ public $localDataMovement = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'computeResourceId',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'priorityOrder',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
+ 'var' => 'localDataMovement',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['computeResourceId'])) {
+ $this->computeResourceId = $vals['computeResourceId'];
+ }
+ if (isset($vals['priorityOrder'])) {
+ $this->priorityOrder = $vals['priorityOrder'];
+ }
+ if (isset($vals['localDataMovement'])) {
+ $this->localDataMovement = $vals['localDataMovement'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_addLocalDataMovementDetails_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->computeResourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->priorityOrder);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->localDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\LOCALDataMovement();
+ $xfer += $this->localDataMovement->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_addLocalDataMovementDetails_args');
+ if ($this->computeResourceId !== null) {
+ $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 1);
+ $xfer += $output->writeString($this->computeResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->priorityOrder !== null) {
+ $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 2);
+ $xfer += $output->writeI32($this->priorityOrder);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->localDataMovement !== null) {
+ if (!is_object($this->localDataMovement)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('localDataMovement', TType::STRUCT, 3);
$xfer += $this->localDataMovement->write($output);
$xfer += $output->writeFieldEnd();
}
@@ -22442,6 +22925,711 @@ class Airavata_getSCPDataMovement_result {
}
+class Airavata_addUnicoreDataMovementDetails_args {
+ static $_TSPEC;
+
+ public $computeResourceId = null;
+ public $priorityOrder = null;
+ public $unicoreDataMovement = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'computeResourceId',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'priorityOrder',
+ 'type' => TType::I32,
+ ),
+ 3 => array(
+ 'var' => 'unicoreDataMovement',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['computeResourceId'])) {
+ $this->computeResourceId = $vals['computeResourceId'];
+ }
+ if (isset($vals['priorityOrder'])) {
+ $this->priorityOrder = $vals['priorityOrder'];
+ }
+ if (isset($vals['unicoreDataMovement'])) {
+ $this->unicoreDataMovement = $vals['unicoreDataMovement'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_addUnicoreDataMovementDetails_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->computeResourceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->priorityOrder);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->unicoreDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+ $xfer += $this->unicoreDataMovement->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_addUnicoreDataMovementDetails_args');
+ if ($this->computeResourceId !== null) {
+ $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 1);
+ $xfer += $output->writeString($this->computeResourceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->priorityOrder !== null) {
+ $xfer += $output->writeFieldBegin('priorityOrder', TType::I32, 2);
+ $xfer += $output->writeI32($this->priorityOrder);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->unicoreDataMovement !== null) {
+ if (!is_object($this->unicoreDataMovement)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('unicoreDataMovement', TType::STRUCT, 3);
+ $xfer += $this->unicoreDataMovement->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_addUnicoreDataMovementDetails_result {
+ static $_TSPEC;
+
+ public $success = null;
+ public $ire = null;
+ public $ace = null;
+ public $ase = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::STRING,
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_addUnicoreDataMovementDetails_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->success);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_addUnicoreDataMovementDetails_result');
+ if ($this->success !== null) {
+ $xfer += $output->writeFieldBegin('success', TType::STRING, 0);
+ $xfer += $output->writeString($this->success);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_updateUnicoreDataMovementDetails_args {
+ static $_TSPEC;
+
+ public $dataMovementInterfaceId = null;
+ public $unicoreDataMovement = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'dataMovementInterfaceId',
+ 'type' => TType::STRING,
+ ),
+ 2 => array(
+ 'var' => 'unicoreDataMovement',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['dataMovementInterfaceId'])) {
+ $this->dataMovementInterfaceId = $vals['dataMovementInterfaceId'];
+ }
+ if (isset($vals['unicoreDataMovement'])) {
+ $this->unicoreDataMovement = $vals['unicoreDataMovement'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_updateUnicoreDataMovementDetails_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->dataMovementInterfaceId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->unicoreDataMovement = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+ $xfer += $this->unicoreDataMovement->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_updateUnicoreDataMovementDetails_args');
+ if ($this->dataMovementInterfaceId !== null) {
+ $xfer += $output->writeFieldBegin('dataMovementInterfaceId', TType::STRING, 1);
+ $xfer += $output->writeString($this->dataMovementInterfaceId);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->unicoreDataMovement !== null) {
+ if (!is_object($this->unicoreDataMovement)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('unicoreDataMovement', TType::STRUCT, 2);
+ $xfer += $this->unicoreDataMovement->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_updateUnicoreDataMovementDetails_result {
+ static $_TSPEC;
+
+ public $success = null;
+ public $ire = null;
+ public $ace = null;
+ public $ase = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::BOOL,
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_updateUnicoreDataMovementDetails_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->success);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_updateUnicoreDataMovementDetails_result');
+ if ($this->success !== null) {
+ $xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
+ $xfer += $output->writeBool($this->success);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_getUnicoreDataMovement_args {
+ static $_TSPEC;
+
+ public $dataMovementId = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 1 => array(
+ 'var' => 'dataMovementId',
+ 'type' => TType::STRING,
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['dataMovementId'])) {
+ $this->dataMovementId = $vals['dataMovementId'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_getUnicoreDataMovement_args';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 1:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->dataMovementId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_getUnicoreDataMovement_args');
+ if ($this->dataMovementId !== null) {
+ $xfer += $output->writeFieldBegin('dataMovementId', TType::STRING, 1);
+ $xfer += $output->writeString($this->dataMovementId);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
+class Airavata_getUnicoreDataMovement_result {
+ static $_TSPEC;
+
+ public $success = null;
+ public $ire = null;
+ public $ace = null;
+ public $ase = null;
+
+ public function __construct($vals=null) {
+ if (!isset(self::$_TSPEC)) {
+ self::$_TSPEC = array(
+ 0 => array(
+ 'var' => 'success',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement',
+ ),
+ 1 => array(
+ 'var' => 'ire',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\InvalidRequestException',
+ ),
+ 2 => array(
+ 'var' => 'ace',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataClientException',
+ ),
+ 3 => array(
+ 'var' => 'ase',
+ 'type' => TType::STRUCT,
+ 'class' => '\Airavata\API\Error\AiravataSystemException',
+ ),
+ );
+ }
+ if (is_array($vals)) {
+ if (isset($vals['success'])) {
+ $this->success = $vals['success'];
+ }
+ if (isset($vals['ire'])) {
+ $this->ire = $vals['ire'];
+ }
+ if (isset($vals['ace'])) {
+ $this->ace = $vals['ace'];
+ }
+ if (isset($vals['ase'])) {
+ $this->ase = $vals['ase'];
+ }
+ }
+ }
+
+ public function getName() {
+ return 'Airavata_getUnicoreDataMovement_result';
+ }
+
+ public function read($input)
+ {
+ $xfer = 0;
+ $fname = null;
+ $ftype = 0;
+ $fid = 0;
+ $xfer += $input->readStructBegin($fname);
+ while (true)
+ {
+ $xfer += $input->readFieldBegin($fname, $ftype, $fid);
+ if ($ftype == TType::STOP) {
+ break;
+ }
+ switch ($fid)
+ {
+ case 0:
+ if ($ftype == TType::STRUCT) {
+ $this->success = new \Airavata\Model\AppCatalog\ComputeResource\UnicoreDataMovement();
+ $xfer += $this->success->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 1:
+ if ($ftype == TType::STRUCT) {
+ $this->ire = new \Airavata\API\Error\InvalidRequestException();
+ $xfer += $this->ire->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 2:
+ if ($ftype == TType::STRUCT) {
+ $this->ace = new \Airavata\API\Error\AiravataClientException();
+ $xfer += $this->ace->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 3:
+ if ($ftype == TType::STRUCT) {
+ $this->ase = new \Airavata\API\Error\AiravataSystemException();
+ $xfer += $this->ase->read($input);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ default:
+ $xfer += $input->skip($ftype);
+ break;
+ }
+ $xfer += $input->readFieldEnd();
+ }
+ $xfer += $input->readStructEnd();
+ return $xfer;
+ }
+
+ public function write($output) {
+ $xfer = 0;
+ $xfer += $output->writeStructBegin('Airavata_getUnicoreDataMovement_result');
+ if ($this->success !== null) {
+ if (!is_object($this->success)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('success', TType::STRUCT, 0);
+ $xfer += $this->success->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ire !== null) {
+ $xfer += $output->writeFieldBegin('ire', TType::STRUCT, 1);
+ $xfer += $this->ire->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ace !== null) {
+ $xfer += $output->writeFieldBegin('ace', TType::STRUCT, 2);
+ $xfer += $this->ace->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->ase !== null) {
+ $xfer += $output->writeFieldBegin('ase', TType::STRUCT, 3);
+ $xfer += $this->ase->write($output);
+ $xfer += $output->writeFieldEnd();
+ }
+ $xfer += $output->writeFieldStop();
+ $xfer += $output->writeStructEnd();
+ return $xfer;
+ }
+
+}
+
class Airavata_addGridFTPDataMovementDetails_args {
static $_TSPEC;
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 7fbb18b..9f4cd12 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -47,17 +47,17 @@ import java.util.*;
public class CreateLaunchExperiment {
//FIXME: Read from a config file
- public static final String THRIFT_SERVER_HOST = "localhost";
- public static final int THRIFT_SERVER_PORT = 8930;
-// public static final String THRIFT_SERVER_HOST = "gw111.iu.xsede.org";
-// public static final int THRIFT_SERVER_PORT = 9930;
+// public static final String THRIFT_SERVER_HOST = "localhost";
+// public static final int THRIFT_SERVER_PORT = 8930;
+ public static final String THRIFT_SERVER_HOST = "gw111.iu.xsede.org";
+ public static final int THRIFT_SERVER_PORT = 9930;
private final static Logger logger = LoggerFactory.getLogger(CreateLaunchExperiment.class);
private static final String DEFAULT_USER = "default.registry.user";
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
private static Airavata.Client airavataClient;
- private static String echoAppId = "Echo_7d2a5cde-5b2a-4cad-ae50-f71668f4876d";
+ private static String echoAppId = "Echo_2e539083-665d-40fd-aaa2-4a751028326b";
private static String mpiAppId = "HelloMPI_720e159f-198f-4daa-96ca-9f5eafee92c9";
private static String wrfAppId = "WRF_7ad5da38-c08b-417c-a9ea-da9298839762";
private static String amberAppId = "Amber_42124128-628b-484c-829d-aff8b584eb00";
@@ -92,7 +92,7 @@ public class CreateLaunchExperiment {
public static void createAndLaunchExp() throws TException {
// final String expId = createEchoExperimentForFSD(airavataClient);
try {
- for (int i = 0; i < 100; i++) {
+ for (int i = 0; i < 300; i++) {
// final String expId = createExperimentForSSHHost(airavata);
// final String expId = createEchoExperimentForFSD(airavataClient);
// final String expId = createMPIExperimentForFSD(airavataClient);
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
----------------------------------------------------------------------
diff --git a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
index a628335..6710a76 100644
--- a/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
+++ b/airavata-api/thrift-interface-descriptions/airavataAPI.thrift
@@ -1122,6 +1122,11 @@ service Airavata {
2: airavataErrors.AiravataClientException ace,
3: airavataErrors.AiravataSystemException ase)
+ bool updateUnicoreJobSubmissionDetails(1: required string jobSubmissionInterfaceId,
+ 2: required computeResourceModel.UnicoreJobSubmission unicoreJobSubmission)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
/**
* Add a Local data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -1233,6 +1238,24 @@ service Airavata {
3: airavataErrors.AiravataSystemException ase)
+ string addUnicoreDataMovementDetails(1: required string computeResourceId,
+ 2: required i32 priorityOrder,
+ 3: required computeResourceModel.UnicoreDataMovement unicoreDataMovement)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ bool updateUnicoreDataMovementDetails(1: required string dataMovementInterfaceId,
+ 2: required computeResourceModel.UnicoreDataMovement unicoreDataMovement)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
+ computeResourceModel.UnicoreDataMovement getUnicoreDataMovement(1: required string dataMovementId)
+ throws (1: airavataErrors.InvalidRequestException ire,
+ 2: airavataErrors.AiravataClientException ace,
+ 3: airavataErrors.AiravataSystemException ase)
+
/**
* Add a GridFTP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
[11/13] airavata git commit: fixing AIRAVATA-1584
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index fd8b0c3..e253126 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -977,6 +977,8 @@ import org.slf4j.LoggerFactory;
*/
public boolean updateCloudJobSubmissionDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission sshJobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public boolean updateUnicoreJobSubmissionDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+
/**
* Add a Local data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -1082,6 +1084,12 @@ import org.slf4j.LoggerFactory;
*/
public org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement getSCPDataMovement(String dataMovementId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public String addUnicoreDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+
+ public boolean updateUnicoreDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+
+ public org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement getUnicoreDataMovement(String dataMovementId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+
/**
* Add a GridFTP data movement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -1548,6 +1556,8 @@ import org.slf4j.LoggerFactory;
public void updateCloudJobSubmissionDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission sshJobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void updateUnicoreJobSubmissionDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
public void addLocalDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void updateLocalDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -1560,6 +1570,12 @@ import org.slf4j.LoggerFactory;
public void getSCPDataMovement(String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void addUnicoreDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
+ public void updateUnicoreDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
+ public void getUnicoreDataMovement(String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
public void addGridFTPDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void updateGridFTPDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -3724,6 +3740,39 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateCloudJobSubmissionDetails failed: unknown result");
}
+ public boolean updateUnicoreJobSubmissionDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ {
+ send_updateUnicoreJobSubmissionDetails(jobSubmissionInterfaceId, unicoreJobSubmission);
+ return recv_updateUnicoreJobSubmissionDetails();
+ }
+
+ public void send_updateUnicoreJobSubmissionDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission) throws org.apache.thrift.TException
+ {
+ updateUnicoreJobSubmissionDetails_args args = new updateUnicoreJobSubmissionDetails_args();
+ args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId);
+ args.setUnicoreJobSubmission(unicoreJobSubmission);
+ sendBase("updateUnicoreJobSubmissionDetails", args);
+ }
+
+ public boolean recv_updateUnicoreJobSubmissionDetails() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ {
+ updateUnicoreJobSubmissionDetails_result result = new updateUnicoreJobSubmissionDetails_result();
+ receiveBase(result, "updateUnicoreJobSubmissionDetails");
+ if (result.isSetSuccess()) {
+ return result.success;
+ }
+ if (result.ire != null) {
+ throw result.ire;
+ }
+ if (result.ace != null) {
+ throw result.ace;
+ }
+ if (result.ase != null) {
+ throw result.ase;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateUnicoreJobSubmissionDetails failed: unknown result");
+ }
+
public String addLocalDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
send_addLocalDataMovementDetails(computeResourceId, priorityOrder, localDataMovement);
@@ -3922,6 +3971,105 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSCPDataMovement failed: unknown result");
}
+ public String addUnicoreDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ {
+ send_addUnicoreDataMovementDetails(computeResourceId, priorityOrder, unicoreDataMovement);
+ return recv_addUnicoreDataMovementDetails();
+ }
+
+ public void send_addUnicoreDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.thrift.TException
+ {
+ addUnicoreDataMovementDetails_args args = new addUnicoreDataMovementDetails_args();
+ args.setComputeResourceId(computeResourceId);
+ args.setPriorityOrder(priorityOrder);
+ args.setUnicoreDataMovement(unicoreDataMovement);
+ sendBase("addUnicoreDataMovementDetails", args);
+ }
+
+ public String recv_addUnicoreDataMovementDetails() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ {
+ addUnicoreDataMovementDetails_result result = new addUnicoreDataMovementDetails_result();
+ receiveBase(result, "addUnicoreDataMovementDetails");
+ if (result.isSetSuccess()) {
+ return result.success;
+ }
+ if (result.ire != null) {
+ throw result.ire;
+ }
+ if (result.ace != null) {
+ throw result.ace;
+ }
+ if (result.ase != null) {
+ throw result.ase;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addUnicoreDataMovementDetails failed: unknown result");
+ }
+
+ public boolean updateUnicoreDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ {
+ send_updateUnicoreDataMovementDetails(dataMovementInterfaceId, unicoreDataMovement);
+ return recv_updateUnicoreDataMovementDetails();
+ }
+
+ public void send_updateUnicoreDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement) throws org.apache.thrift.TException
+ {
+ updateUnicoreDataMovementDetails_args args = new updateUnicoreDataMovementDetails_args();
+ args.setDataMovementInterfaceId(dataMovementInterfaceId);
+ args.setUnicoreDataMovement(unicoreDataMovement);
+ sendBase("updateUnicoreDataMovementDetails", args);
+ }
+
+ public boolean recv_updateUnicoreDataMovementDetails() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ {
+ updateUnicoreDataMovementDetails_result result = new updateUnicoreDataMovementDetails_result();
+ receiveBase(result, "updateUnicoreDataMovementDetails");
+ if (result.isSetSuccess()) {
+ return result.success;
+ }
+ if (result.ire != null) {
+ throw result.ire;
+ }
+ if (result.ace != null) {
+ throw result.ace;
+ }
+ if (result.ase != null) {
+ throw result.ase;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateUnicoreDataMovementDetails failed: unknown result");
+ }
+
+ public org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement getUnicoreDataMovement(String dataMovementId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ {
+ send_getUnicoreDataMovement(dataMovementId);
+ return recv_getUnicoreDataMovement();
+ }
+
+ public void send_getUnicoreDataMovement(String dataMovementId) throws org.apache.thrift.TException
+ {
+ getUnicoreDataMovement_args args = new getUnicoreDataMovement_args();
+ args.setDataMovementId(dataMovementId);
+ sendBase("getUnicoreDataMovement", args);
+ }
+
+ public org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement recv_getUnicoreDataMovement() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ {
+ getUnicoreDataMovement_result result = new getUnicoreDataMovement_result();
+ receiveBase(result, "getUnicoreDataMovement");
+ if (result.isSetSuccess()) {
+ return result.success;
+ }
+ if (result.ire != null) {
+ throw result.ire;
+ }
+ if (result.ace != null) {
+ throw result.ace;
+ }
+ if (result.ase != null) {
+ throw result.ase;
+ }
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUnicoreDataMovement failed: unknown result");
+ }
+
public String addGridFTPDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
send_addGridFTPDataMovementDetails(computeResourceId, priorityOrder, gridFTPDataMovement);
@@ -7058,6 +7206,41 @@ import org.slf4j.LoggerFactory;
}
}
+ public void updateUnicoreJobSubmissionDetails(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ updateUnicoreJobSubmissionDetails_call method_call = new updateUnicoreJobSubmissionDetails_call(jobSubmissionInterfaceId, unicoreJobSubmission, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class updateUnicoreJobSubmissionDetails_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private String jobSubmissionInterfaceId;
+ private org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission;
+ public updateUnicoreJobSubmissionDetails_call(String jobSubmissionInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ super(client, protocolFactory, transport, resultHandler, false);
+ this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
+ this.unicoreJobSubmission = unicoreJobSubmission;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateUnicoreJobSubmissionDetails", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ updateUnicoreJobSubmissionDetails_args args = new updateUnicoreJobSubmissionDetails_args();
+ args.setJobSubmissionInterfaceId(jobSubmissionInterfaceId);
+ args.setUnicoreJobSubmission(unicoreJobSubmission);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public boolean getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_updateUnicoreJobSubmissionDetails();
+ }
+ }
+
public void addLocalDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
addLocalDataMovementDetails_call method_call = new addLocalDataMovementDetails_call(computeResourceId, priorityOrder, localDataMovement, resultHandler, this, ___protocolFactory, ___transport);
@@ -7268,6 +7451,111 @@ import org.slf4j.LoggerFactory;
}
}
+ public void addUnicoreDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ addUnicoreDataMovementDetails_call method_call = new addUnicoreDataMovementDetails_call(computeResourceId, priorityOrder, unicoreDataMovement, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class addUnicoreDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private String computeResourceId;
+ private int priorityOrder;
+ private org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement;
+ public addUnicoreDataMovementDetails_call(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ super(client, protocolFactory, transport, resultHandler, false);
+ this.computeResourceId = computeResourceId;
+ this.priorityOrder = priorityOrder;
+ this.unicoreDataMovement = unicoreDataMovement;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addUnicoreDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ addUnicoreDataMovementDetails_args args = new addUnicoreDataMovementDetails_args();
+ args.setComputeResourceId(computeResourceId);
+ args.setPriorityOrder(priorityOrder);
+ args.setUnicoreDataMovement(unicoreDataMovement);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public String getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_addUnicoreDataMovementDetails();
+ }
+ }
+
+ public void updateUnicoreDataMovementDetails(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ updateUnicoreDataMovementDetails_call method_call = new updateUnicoreDataMovementDetails_call(dataMovementInterfaceId, unicoreDataMovement, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class updateUnicoreDataMovementDetails_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private String dataMovementInterfaceId;
+ private org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement;
+ public updateUnicoreDataMovementDetails_call(String dataMovementInterfaceId, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement unicoreDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ super(client, protocolFactory, transport, resultHandler, false);
+ this.dataMovementInterfaceId = dataMovementInterfaceId;
+ this.unicoreDataMovement = unicoreDataMovement;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateUnicoreDataMovementDetails", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ updateUnicoreDataMovementDetails_args args = new updateUnicoreDataMovementDetails_args();
+ args.setDataMovementInterfaceId(dataMovementInterfaceId);
+ args.setUnicoreDataMovement(unicoreDataMovement);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public boolean getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_updateUnicoreDataMovementDetails();
+ }
+ }
+
+ public void getUnicoreDataMovement(String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ checkReady();
+ getUnicoreDataMovement_call method_call = new getUnicoreDataMovement_call(dataMovementId, resultHandler, this, ___protocolFactory, ___transport);
+ this.___currentMethod = method_call;
+ ___manager.call(method_call);
+ }
+
+ public static class getUnicoreDataMovement_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private String dataMovementId;
+ public getUnicoreDataMovement_call(String dataMovementId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ super(client, protocolFactory, transport, resultHandler, false);
+ this.dataMovementId = dataMovementId;
+ }
+
+ public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getUnicoreDataMovement", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getUnicoreDataMovement_args args = new getUnicoreDataMovement_args();
+ args.setDataMovementId(dataMovementId);
+ args.write(prot);
+ prot.writeMessageEnd();
+ }
+
+ public org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException {
+ if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+ throw new IllegalStateException("Method call not finished!");
+ }
+ org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+ org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+ return (new Client(prot)).recv_getUnicoreDataMovement();
+ }
+ }
+
public void addGridFTPDataMovementDetails(String computeResourceId, int priorityOrder, org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement gridFTPDataMovement, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
addGridFTPDataMovementDetails_call method_call = new addGridFTPDataMovementDetails_call(computeResourceId, priorityOrder, gridFTPDataMovement, resultHandler, this, ___protocolFactory, ___transport);
@@ -8382,12 +8670,16 @@ import org.slf4j.LoggerFactory;
processMap.put("getCloudJobSubmission", new getCloudJobSubmission());
processMap.put("updateSSHJobSubmissionDetails", new updateSSHJobSubmissionDetails());
processMap.put("updateCloudJobSubmissionDetails", new updateCloudJobSubmissionDetails());
+ processMap.put("updateUnicoreJobSubmissionDetails", new updateUnicoreJobSubmissionDetails());
processMap.put("addLocalDataMovementDetails", new addLocalDataMovementDetails());
processMap.put("updateLocalDataMovementDetails", new updateLocalDataMovementDetails());
processMap.put("getLocalDataMovement", new getLocalDataMovement());
processMap.put("addSCPDataMovementDetails", new addSCPDataMovementDetails());
processMap.put("updateSCPDataMovementDetails", new updateSCPDataMovementDetails());
processMap.put("getSCPDataMovement", new getSCPDataMovement());
+ processMap.put("addUnicoreDataMovementDetails", new addUnicoreDataMovementDetails());
+ processMap.put("updateUnicoreDataMovementDetails", new updateUnicoreDataMovementDetails());
+ processMap.put("getUnicoreDataMovement", new getUnicoreDataMovement());
processMap.put("addGridFTPDataMovementDetails", new addGridFTPDataMovementDetails());
processMap.put("updateGridFTPDataMovementDetails", new updateGridFTPDataMovementDetails());
processMap.put("getGridFTPDataMovement", new getGridFTPDataMovement());
@@ -10240,6 +10532,35 @@ import org.slf4j.LoggerFactory;
}
}
+ public static class updateUnicoreJobSubmissionDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUnicoreJobSubmissionDetails_args> {
+ public updateUnicoreJobSubmissionDetails() {
+ super("updateUnicoreJobSubmissionDetails");
+ }
+
+ public updateUnicoreJobSubmissionDetails_args getEmptyArgsInstance() {
+ return new updateUnicoreJobSubmissionDetails_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public updateUnicoreJobSubmissionDetails_result getResult(I iface, updateUnicoreJobSubmissionDetails_args args) throws org.apache.thrift.TException {
+ updateUnicoreJobSubmissionDetails_result result = new updateUnicoreJobSubmissionDetails_result();
+ try {
+ result.success = iface.updateUnicoreJobSubmissionDetails(args.jobSubmissionInterfaceId, args.unicoreJobSubmission);
+ result.setSuccessIsSet(true);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ }
+ return result;
+ }
+ }
+
public static class addLocalDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addLocalDataMovementDetails_args> {
public addLocalDataMovementDetails() {
super("addLocalDataMovementDetails");
@@ -10410,6 +10731,91 @@ import org.slf4j.LoggerFactory;
}
}
+ public static class addUnicoreDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addUnicoreDataMovementDetails_args> {
+ public addUnicoreDataMovementDetails() {
+ super("addUnicoreDataMovementDetails");
+ }
+
+ public addUnicoreDataMovementDetails_args getEmptyArgsInstance() {
+ return new addUnicoreDataMovementDetails_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public addUnicoreDataMovementDetails_result getResult(I iface, addUnicoreDataMovementDetails_args args) throws org.apache.thrift.TException {
+ addUnicoreDataMovementDetails_result result = new addUnicoreDataMovementDetails_result();
+ try {
+ result.success = iface.addUnicoreDataMovementDetails(args.computeResourceId, args.priorityOrder, args.unicoreDataMovement);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ }
+ return result;
+ }
+ }
+
+ public static class updateUnicoreDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateUnicoreDataMovementDetails_args> {
+ public updateUnicoreDataMovementDetails() {
+ super("updateUnicoreDataMovementDetails");
+ }
+
+ public updateUnicoreDataMovementDetails_args getEmptyArgsInstance() {
+ return new updateUnicoreDataMovementDetails_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public updateUnicoreDataMovementDetails_result getResult(I iface, updateUnicoreDataMovementDetails_args args) throws org.apache.thrift.TException {
+ updateUnicoreDataMovementDetails_result result = new updateUnicoreDataMovementDetails_result();
+ try {
+ result.success = iface.updateUnicoreDataMovementDetails(args.dataMovementInterfaceId, args.unicoreDataMovement);
+ result.setSuccessIsSet(true);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ }
+ return result;
+ }
+ }
+
+ public static class getUnicoreDataMovement<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getUnicoreDataMovement_args> {
+ public getUnicoreDataMovement() {
+ super("getUnicoreDataMovement");
+ }
+
+ public getUnicoreDataMovement_args getEmptyArgsInstance() {
+ return new getUnicoreDataMovement_args();
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getUnicoreDataMovement_result getResult(I iface, getUnicoreDataMovement_args args) throws org.apache.thrift.TException {
+ getUnicoreDataMovement_result result = new getUnicoreDataMovement_result();
+ try {
+ result.success = iface.getUnicoreDataMovement(args.dataMovementId);
+ } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+ result.ire = ire;
+ } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+ result.ace = ace;
+ } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+ result.ase = ase;
+ }
+ return result;
+ }
+ }
+
public static class addGridFTPDataMovementDetails<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGridFTPDataMovementDetails_args> {
public addGridFTPDataMovementDetails() {
super("addGridFTPDataMovementDetails");
@@ -11371,12 +11777,16 @@ import org.slf4j.LoggerFactory;
processMap.put("getCloudJobSubmission", new getCloudJobSubmission());
processMap.put("updateSSHJobSubmissionDetails", new updateSSHJobSubmissionDetails());
processMap.put("updateCloudJobSubmissionDetails", new updateCloudJobSubmissionDetails());
+ processMap.put("updateUnicoreJobSubmissionDetails", new updateUnicoreJobSubmissionDetails());
processMap.put("addLocalDataMovementDetails", new addLocalDataMovementDetails());
processMap.put("updateLocalDataMovementDetails", new updateLocalDataMovementDetails());
processMap.put("getLocalDataMovement", new getLocalDataMovement());
processMap.put("addSCPDataMovementDetails", new addSCPDataMovementDetails());
processMap.put("updateSCPDataMovementDetails", new updateSCPDataMovementDetails());
processMap.put("getSCPDataMovement", new getSCPDataMovement());
+ processMap.put("addUnicoreDataMovementDetails", new addUnicoreDataMovementDetails());
+ processMap.put("updateUnicoreDataMovementDetails", new updateUnicoreDataMovementDetails());
+ processMap.put("getUnicoreDataMovement", new getUnicoreDataMovement());
processMap.put("addGridFTPDataMovementDetails", new addGridFTPDataMovementDetails());
processMap.put("updateGridFTPDataMovementDetails", new updateGridFTPDataMovementDetails());
processMap.put("getGridFTPDataMovement", new getGridFTPDataMovement());
@@ -15748,6 +16158,74 @@ import org.slf4j.LoggerFactory;
}
}
+ public static class updateUnicoreJobSubmissionDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateUnicoreJobSubmissionDetails_args, Boolean> {
+ public updateUnicoreJobSubmissionDetails() {
+ super("updateUnicoreJobSubmissionDetails");
+ }
+
+ public updateUnicoreJobSubmissionDetails_args getEmptyArgsInstance() {
+ return new updateUnicoreJobSubmissionDetails_args();
+ }
+
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ updateUnicoreJobSubmissionDetails_result result = new updateUnicoreJobSubmissionDetails_result();
+ result.success = o;
+ result.setSuccessIsSet(true);
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ updateUnicoreJobSubmissionDetails_result result = new updateUnicoreJobSubmissionDetails_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, updateUnicoreJobSubmissionDetails_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.updateUnicoreJobSubmissionDetails(args.jobSubmissionInterfaceId, args.unicoreJobSubmission,resultHandler);
+ }
+ }
+
public static class addLocalDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addLocalDataMovementDetails_args, String> {
public addLocalDataMovementDetails() {
super("addLocalDataMovementDetails");
@@ -16152,6 +16630,208 @@ import org.slf4j.LoggerFactory;
}
}
+ public static class addUnicoreDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addUnicoreDataMovementDetails_args, String> {
+ public addUnicoreDataMovementDetails() {
+ super("addUnicoreDataMovementDetails");
+ }
+
+ public addUnicoreDataMovementDetails_args getEmptyArgsInstance() {
+ return new addUnicoreDataMovementDetails_args();
+ }
+
+ public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<String>() {
+ public void onComplete(String o) {
+ addUnicoreDataMovementDetails_result result = new addUnicoreDataMovementDetails_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ addUnicoreDataMovementDetails_result result = new addUnicoreDataMovementDetails_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, addUnicoreDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+ iface.addUnicoreDataMovementDetails(args.computeResourceId, args.priorityOrder, args.unicoreDataMovement,resultHandler);
+ }
+ }
+
+ public static class updateUnicoreDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateUnicoreDataMovementDetails_args, Boolean> {
+ public updateUnicoreDataMovementDetails() {
+ super("updateUnicoreDataMovementDetails");
+ }
+
+ public updateUnicoreDataMovementDetails_args getEmptyArgsInstance() {
+ return new updateUnicoreDataMovementDetails_args();
+ }
+
+ public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<Boolean>() {
+ public void onComplete(Boolean o) {
+ updateUnicoreDataMovementDetails_result result = new updateUnicoreDataMovementDetails_result();
+ result.success = o;
+ result.setSuccessIsSet(true);
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ updateUnicoreDataMovementDetails_result result = new updateUnicoreDataMovementDetails_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, updateUnicoreDataMovementDetails_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.updateUnicoreDataMovementDetails(args.dataMovementInterfaceId, args.unicoreDataMovement,resultHandler);
+ }
+ }
+
+ public static class getUnicoreDataMovement<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUnicoreDataMovement_args, org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement> {
+ public getUnicoreDataMovement() {
+ super("getUnicoreDataMovement");
+ }
+
+ public getUnicoreDataMovement_args getEmptyArgsInstance() {
+ return new getUnicoreDataMovement_args();
+ }
+
+ public AsyncMethodCallback<org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ final org.apache.thrift.AsyncProcessFunction fcall = this;
+ return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement>() {
+ public void onComplete(org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement o) {
+ getUnicoreDataMovement_result result = new getUnicoreDataMovement_result();
+ result.success = o;
+ try {
+ fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+ return;
+ } catch (Exception e) {
+ LOGGER.error("Exception writing to internal frame buffer", e);
+ }
+ fb.close();
+ }
+ public void onError(Exception e) {
+ byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+ org.apache.thrift.TBase msg;
+ getUnicoreDataMovement_result result = new getUnicoreDataMovement_result();
+ if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
+ result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
+ result.setIreIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataClientException) {
+ result.ace = (org.apache.airavata.model.error.AiravataClientException) e;
+ result.setAceIsSet(true);
+ msg = result;
+ }
+ else if (e instanceof org.apache.airavata.model.error.AiravataSystemException) {
+ result.ase = (org.apache.airavata.model.error.AiravataSystemException) e;
+ result.setAseIsSet(true);
+ msg = result;
+ }
+ else
+ {
+ msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+ msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+ }
+ try {
+ fcall.sendResponse(fb,msg,msgType,seqid);
+ return;
+ } catch (Exception ex) {
+ LOGGER.error("Exception writing to internal frame buffer", ex);
+ }
+ fb.close();
+ }
+ };
+ }
+
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public void start(I iface, getUnicoreDataMovement_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement> resultHandler) throws TException {
+ iface.getUnicoreDataMovement(args.dataMovementId,resultHandler);
+ }
+ }
+
public static class addGridFTPDataMovementDetails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGridFTPDataMovementDetails_args, String> {
public addGridFTPDataMovementDetails() {
super("addGridFTPDataMovementDetails");
@@ -86599,28 +87279,25 @@ import org.slf4j.LoggerFactory;
}
- public static class addLocalDataMovementDetails_args implements org.apache.thrift.TBase<addLocalDataMovementDetails_args, addLocalDataMovementDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<addLocalDataMovementDetails_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addLocalDataMovementDetails_args");
+ public static class updateUnicoreJobSubmissionDetails_args implements org.apache.thrift.TBase<updateUnicoreJobSubmissionDetails_args, updateUnicoreJobSubmissionDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateUnicoreJobSubmissionDetails_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateUnicoreJobSubmissionDetails_args");
- private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField PRIORITY_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("priorityOrder", org.apache.thrift.protocol.TType.I32, (short)2);
- private static final org.apache.thrift.protocol.TField LOCAL_DATA_MOVEMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("localDataMovement", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+ private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField UNICORE_JOB_SUBMISSION_FIELD_DESC = new org.apache.thrift.protocol.TField("unicoreJobSubmission", org.apache.thrift.protocol.TType.STRUCT, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new addLocalDataMovementDetails_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new addLocalDataMovementDetails_argsTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new updateUnicoreJobSubmissionDetails_argsStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new updateUnicoreJobSubmissionDetails_argsTupleSchemeFactory());
}
- public String computeResourceId; // required
- public int priorityOrder; // required
- public org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement localDataMovement; // required
+ public String jobSubmissionInterfaceId; // required
+ public org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- COMPUTE_RESOURCE_ID((short)1, "computeResourceId"),
- PRIORITY_ORDER((short)2, "priorityOrder"),
- LOCAL_DATA_MOVEMENT((short)3, "localDataMovement");
+ JOB_SUBMISSION_INTERFACE_ID((short)1, "jobSubmissionInterfaceId"),
+ UNICORE_JOB_SUBMISSION((short)2, "unicoreJobSubmission");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -86635,12 +87312,4446 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // COMPUTE_RESOURCE_ID
- return COMPUTE_RESOURCE_ID;
- case 2: // PRIORITY_ORDER
- return PRIORITY_ORDER;
- case 3: // LOCAL_DATA_MOVEMENT
- return LOCAL_DATA_MOVEMENT;
+ case 1: // JOB_SUBMISSION_INTERFACE_ID
+ return JOB_SUBMISSION_INTERFACE_ID;
+ case 2: // UNICORE_JOB_SUBMISSION
+ return UNICORE_JOB_SUBMISSION;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.JOB_SUBMISSION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("jobSubmissionInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.UNICORE_JOB_SUBMISSION, new org.apache.thrift.meta_data.FieldMetaData("unicoreJobSubmission", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission.class)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateUnicoreJobSubmissionDetails_args.class, metaDataMap);
+ }
+
+ public updateUnicoreJobSubmissionDetails_args() {
+ }
+
+ public updateUnicoreJobSubmissionDetails_args(
+ String jobSubmissionInterfaceId,
+ org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission)
+ {
+ this();
+ this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
+ this.unicoreJobSubmission = unicoreJobSubmission;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public updateUnicoreJobSubmissionDetails_args(updateUnicoreJobSubmissionDetails_args other) {
+ if (other.isSetJobSubmissionInterfaceId()) {
+ this.jobSubmissionInterfaceId = other.jobSubmissionInterfaceId;
+ }
+ if (other.isSetUnicoreJobSubmission()) {
+ this.unicoreJobSubmission = new org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission(other.unicoreJobSubmission);
+ }
+ }
+
+ public updateUnicoreJobSubmissionDetails_args deepCopy() {
+ return new updateUnicoreJobSubmissionDetails_args(this);
+ }
+
+ @Override
+ public void clear() {
+ this.jobSubmissionInterfaceId = null;
+ this.unicoreJobSubmission = null;
+ }
+
+ public String getJobSubmissionInterfaceId() {
+ return this.jobSubmissionInterfaceId;
+ }
+
+ public updateUnicoreJobSubmissionDetails_args setJobSubmissionInterfaceId(String jobSubmissionInterfaceId) {
+ this.jobSubmissionInterfaceId = jobSubmissionInterfaceId;
+ return this;
+ }
+
+ public void unsetJobSubmissionInterfaceId() {
+ this.jobSubmissionInterfaceId = null;
+ }
+
+ /** Returns true if field jobSubmissionInterfaceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetJobSubmissionInterfaceId() {
+ return this.jobSubmissionInterfaceId != null;
+ }
+
+ public void setJobSubmissionInterfaceIdIsSet(boolean value) {
+ if (!value) {
+ this.jobSubmissionInterfaceId = null;
+ }
+ }
+
+ public org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission getUnicoreJobSubmission() {
+ return this.unicoreJobSubmission;
+ }
+
+ public updateUnicoreJobSubmissionDetails_args setUnicoreJobSubmission(org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission unicoreJobSubmission) {
+ this.unicoreJobSubmission = unicoreJobSubmission;
+ return this;
+ }
+
+ public void unsetUnicoreJobSubmission() {
+ this.unicoreJobSubmission = null;
+ }
+
+ /** Returns true if field unicoreJobSubmission is set (has been assigned a value) and false otherwise */
+ public boolean isSetUnicoreJobSubmission() {
+ return this.unicoreJobSubmission != null;
+ }
+
+ public void setUnicoreJobSubmissionIsSet(boolean value) {
+ if (!value) {
+ this.unicoreJobSubmission = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case JOB_SUBMISSION_INTERFACE_ID:
+ if (value == null) {
+ unsetJobSubmissionInterfaceId();
+ } else {
+ setJobSubmissionInterfaceId((String)value);
+ }
+ break;
+
+ case UNICORE_JOB_SUBMISSION:
+ if (value == null) {
+ unsetUnicoreJobSubmission();
+ } else {
+ setUnicoreJobSubmission((org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case JOB_SUBMISSION_INTERFACE_ID:
+ return getJobSubmissionInterfaceId();
+
+ case UNICORE_JOB_SUBMISSION:
+ return getUnicoreJobSubmission();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case JOB_SUBMISSION_INTERFACE_ID:
+ return isSetJobSubmissionInterfaceId();
+ case UNICORE_JOB_SUBMISSION:
+ return isSetUnicoreJobSubmission();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof updateUnicoreJobSubmissionDetails_args)
+ return this.equals((updateUnicoreJobSubmissionDetails_args)that);
+ return false;
+ }
+
+ public boolean equals(updateUnicoreJobSubmissionDetails_args that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_jobSubmissionInterfaceId = true && this.isSetJobSubmissionInterfaceId();
+ boolean that_present_jobSubmissionInterfaceId = true && that.isSetJobSubmissionInterfaceId();
+ if (this_present_jobSubmissionInterfaceId || that_present_jobSubmissionInterfaceId) {
+ if (!(this_present_jobSubmissionInterfaceId && that_present_jobSubmissionInterfaceId))
+ return false;
+ if (!this.jobSubmissionInterfaceId.equals(that.jobSubmissionInterfaceId))
+ return false;
+ }
+
+ boolean this_present_unicoreJobSubmission = true && this.isSetUnicoreJobSubmission();
+ boolean that_present_unicoreJobSubmission = true && that.isSetUnicoreJobSubmission();
+ if (this_present_unicoreJobSubmission || that_present_unicoreJobSubmission) {
+ if (!(this_present_unicoreJobSubmission && that_present_unicoreJobSubmission))
+ return false;
+ if (!this.unicoreJobSubmission.equals(that.unicoreJobSubmission))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(updateUnicoreJobSubmissionDetails_args other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetJobSubmissionInterfaceId()).compareTo(other.isSetJobSubmissionInterfaceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetJobSubmissionInterfaceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.jobSubmissionInterfaceId, other.jobSubmissionInterfaceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetUnicoreJobSubmission()).compareTo(other.isSetUnicoreJobSubmission());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetUnicoreJobSubmission()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unicoreJobSubmission, other.unicoreJobSubmission);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("updateUnicoreJobSubmissionDetails_args(");
+ boolean first = true;
+
+ sb.append("jobSubmissionInterfaceId:");
+ if (this.jobSubmissionInterfaceId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.jobSubmissionInterfaceId);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("unicoreJobSubmission:");
+ if (this.unicoreJobSubmission == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.unicoreJobSubmission);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (jobSubmissionInterfaceId == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'jobSubmissionInterfaceId' was not present! Struct: " + toString());
+ }
+ if (unicoreJobSubmission == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'unicoreJobSubmission' was not present! Struct: " + toString());
+ }
+ // check for sub-struct validity
+ if (unicoreJobSubmission != null) {
+ unicoreJobSubmission.validate();
+ }
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class updateUnicoreJobSubmissionDetails_argsStandardSchemeFactory implements SchemeFactory {
+ public updateUnicoreJobSubmissionDetails_argsStandardScheme getScheme() {
+ return new updateUnicoreJobSubmissionDetails_argsStandardScheme();
+ }
+ }
+
+ private static class updateUnicoreJobSubmissionDetails_argsStandardScheme extends StandardScheme<updateUnicoreJobSubmissionDetails_args> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, updateUnicoreJobSubmissionDetails_args struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // JOB_SUBMISSION_INTERFACE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.jobSubmissionInterfaceId = iprot.readString();
+ struct.setJobSubmissionInterfaceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // UNICORE_JOB_SUBMISSION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.unicoreJobSubmission = new org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission();
+ struct.unicoreJobSubmission.read(iprot);
+ struct.setUnicoreJobSubmissionIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, updateUnicoreJobSubmissionDetails_args struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.jobSubmissionInterfaceId != null) {
+ oprot.writeFieldBegin(JOB_SUBMISSION_INTERFACE_ID_FIELD_DESC);
+ oprot.writeString(struct.jobSubmissionInterfaceId);
+ oprot.writeFieldEnd();
+ }
+ if (struct.unicoreJobSubmission != null) {
+ oprot.writeFieldBegin(UNICORE_JOB_SUBMISSION_FIELD_DESC);
+ struct.unicoreJobSubmission.write(oprot);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class updateUnicoreJobSubmissionDetails_argsTupleSchemeFactory implements SchemeFactory {
+ public updateUnicoreJobSubmissionDetails_argsTupleScheme getScheme() {
+ return new updateUnicoreJobSubmissionDetails_argsTupleScheme();
+ }
+ }
+
+ private static class updateUnicoreJobSubmissionDetails_argsTupleScheme extends TupleScheme<updateUnicoreJobSubmissionDetails_args> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, updateUnicoreJobSubmissionDetails_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.jobSubmissionInterfaceId);
+ struct.unicoreJobSubmission.write(oprot);
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, updateUnicoreJobSubmissionDetails_args struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.jobSubmissionInterfaceId = iprot.readString();
+ struct.setJobSubmissionInterfaceIdIsSet(true);
+ struct.unicoreJobSubmission = new org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission();
+ struct.unicoreJobSubmission.read(iprot);
+ struct.setUnicoreJobSubmissionIsSet(true);
+ }
+ }
+
+ }
+
+ public static class updateUnicoreJobSubmissionDetails_result implements org.apache.thrift.TBase<updateUnicoreJobSubmissionDetails_result, updateUnicoreJobSubmissionDetails_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateUnicoreJobSubmissionDetails_result> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateUnicoreJobSubmissionDetails_result");
+
+ private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
+ private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = new org.apache.thrift.protocol.TField("ire", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+ private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = new org.apache.thrift.protocol.TField("ace", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+ private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = new org.apache.thrift.protocol.TField("ase", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new updateUnicoreJobSubmissionDetails_resultStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new updateUnicoreJobSubmissionDetails_resultTupleSchemeFactory());
+ }
+
+ public boolean success; // required
+ public org.apache.airavata.model.error.InvalidRequestException ire; // required
+ public org.apache.airavata.model.error.AiravataClientException ace; // required
+ public org.apache.airavata.model.error.AiravataSystemException ase; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ SUCCESS((short)0, "success"),
+ IRE((short)1, "ire"),
+ ACE((short)2, "ace"),
+ ASE((short)3, "ase");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 0: // SUCCESS
+ return SUCCESS;
+ case 1: // IRE
+ return IRE;
+ case 2: // ACE
+ return ACE;
+ case 3: // ASE
+ return ASE;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ private static final int __SUCCESS_ISSET_ID = 0;
+ private byte __isset_bitfield = 0;
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.IRE, new org.apache.thrift.meta_data.FieldMetaData("ire", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+ tmpMap.put(_Fields.ACE, new org.apache.thrift.meta_data.FieldMetaData("ace", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+ tmpMap.put(_Fields.ASE, new org.apache.thrift.meta_data.FieldMetaData("ase", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateUnicoreJobSubmissionDetails_result.class, metaDataMap);
+ }
+
+ public updateUnicoreJobSubmissionDetails_result() {
+ }
+
+ public updateUnicoreJobSubmissionDetails_result(
+ boolean success,
+ org.apache.airavata.model.error.InvalidRequestException ire,
+ org.apache.airavata.model.error.AiravataClientException ace,
+ org.apache.airavata.model.error.AiravataSystemException ase)
+ {
+ this();
+ this.success = success;
+ setSuccessIsSet(true);
+ this.ire = ire;
+ this.ace = ace;
+ this.ase = ase;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public updateUnicoreJobSubmissionDetails_result(updateUnicoreJobSubmissionDetails_result other) {
+ __isset_bitfield = other.__isset_bitfield;
+ this.success = other.success;
+ if (other.isSetIre()) {
+ this.ire = new org.apache.airavata.model.error.InvalidRequestException(other.ire);
+ }
+ if (other.isSetAce()) {
+ this.ace = new org.apache.airavata.model.error.AiravataClientException(other.ace);
+ }
+ if (other.isSetAse()) {
+ this.ase = new org.apache.airavata.model.error.AiravataSystemException(other.ase);
+ }
+ }
+
+ public updateUnicoreJobSubmissionDetails_result deepCopy() {
+ return new updateUnicoreJobSubmissionDetails_result(this);
+ }
+
+ @Override
+ public void clear() {
+ setSuccessIsSet(false);
+ this.success = false;
+ this.ire = null;
+ this.ace = null;
+ this.ase = null;
+ }
+
+ public boolean isSuccess() {
+ return this.success;
+ }
+
+ public updateUnicoreJobSubmissionDetails_result setSuccess(boolean success) {
+ this.success = success;
+ setSuccessIsSet(true);
+ return this;
+ }
+
+ public void unsetSuccess() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ }
+
+ /** Returns true if field success is set (has been assigned a value) and false otherwise */
+ public boolean isSetSuccess() {
+ return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+ }
+
+ public void setSuccessIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+ }
+
+ public org.apache.airavata.model.error.InvalidRequestException getIre() {
+ return this.ire;
+ }
+
+ public updateUnicoreJobSubmissionDetails_result setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+ this.ire = ire;
+ return this;
+ }
+
+ public void unsetIre() {
+ this.ire = null;
+ }
+
+ /** Returns true if field ire is set (has been assigned a value) and false otherwise */
+ public boolean isSetIre() {
+ return this.ire != null;
+ }
+
+ public void setIreIsSet(boolean value) {
+ if (!value) {
+ this.ire = null;
+ }
+ }
+
+ public org.apache.airavata.model.error.AiravataClientException getAce() {
+ return this.ace;
+ }
+
+ public updateUnicoreJobSubmissionDetails_result setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+ this.ace = ace;
+ return this;
+ }
+
+ public void unsetAce() {
+ this.ace = null;
+ }
+
+ /** Returns true if field ace is set (has been assigned a value) and false otherwise */
+ public boolean isSetAce() {
+ return this.ace != null;
+ }
+
+ public void setAceIsSet(boolean value) {
+ if (!value) {
+ this.ace = null;
+ }
+ }
+
+ public org.apache.airavata.model.error.AiravataSystemException getAse() {
+ return this.ase;
+ }
+
+ public updateUnicoreJobSubmissionDetails_result setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+ this.ase = ase;
+ return this;
+ }
+
+ public void unsetAse() {
+ this.ase = null;
+ }
+
+ /** Returns true if field ase is set (has been assigned a value) and false otherwise */
+ public boolean isSetAse() {
+ return this.ase != null;
+ }
+
+ public void setAseIsSet(boolean value) {
+ if (!value) {
+ this.ase = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case SUCCESS:
+ if (value == null) {
+ unsetSuccess();
+ } else {
+ setSuccess((Boolean)value);
+ }
+ break;
+
+ case IRE:
+ if (value == null) {
+ unsetIre();
+ } else {
+ setIre((org.apache.airavata.model.error.InvalidRequestException)value);
+ }
+ break;
+
+ case ACE:
+ if (value == null) {
+ unsetAce();
+ } else {
+ setAce((org.apache.airavata.model.error.AiravataClientException)value);
+ }
+ break;
+
+ case ASE:
+ if (value == null) {
+ unsetAse();
+ } else {
+ setAse((org.apache.airavata.model.error.AiravataSystemException)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case SUCCESS:
+ return Boolean.valueOf(isSuccess());
+
+ case IRE:
+ return getIre();
+
+ case ACE:
+ return getAce();
+
+ case ASE:
+ return getAse();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case SUCCESS:
+ return isSetSuccess();
+ case IRE:
+ return isSetIre();
+ case ACE:
+ return isSetAce();
+ case ASE:
+ return isSetAse();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof updateUnicoreJobSubmissionDetails_result)
+ return this.equals((updateUnicoreJobSubmissionDetails_result)that);
+ return false;
+ }
+
+ public boolean equals(updateUnicoreJobSubmissionDetails_result that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_success = true;
+ boolean that_present_success = true;
+ if (this_present_success || that_present_success) {
+ if (!(this_present_success && that_present_success))
+ return false;
+ if (this.success != that.success)
+ return false;
+ }
+
+ boolean this_present_ire = true && this.isSetIre();
+ boolean that_present_ire = true && that.isSetIre();
+ if (this_present_ire || that_present_ire) {
+ if (!(this_present_ire && that_present_ire))
+ return false;
+ if (!this.ire.equals(that.ire))
+ return false;
+ }
+
+ boolean this_present_ace = true && this.isSetAce();
+ boolean that_present_ace = true && that.isSetAce();
+ if (this_present_ace || that_present_ace) {
+ if (!(this_present_ace && that_present_ace))
+ return false;
+ if (!this.ace.equals(that.ace))
+ return false;
+ }
+
+ boolean this_present_ase = true && this.isSetAse();
+ boolean that_present_ase = true && that.isSetAse();
+ if (this_present_ase || that_present_ase) {
+ if (!(this_present_ase && that_present_ase))
+ return false;
+ if (!this.ase.equals(that.ase))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public int compareTo(updateUnicoreJobSubmissionDetails_result other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetSuccess()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetIre()).compareTo(other.isSetIre());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetIre()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ire, other.ire);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetAce()).compareTo(other.isSetAce());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAce()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ace, other.ace);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetAse()).compareTo(other.isSetAse());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetAse()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ase, other.ase);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("updateUnicoreJobSubmissionDetails_result(");
+ boolean first = true;
+
+ sb.append("success:");
+ sb.append(this.success);
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("ire:");
+ if (this.ire == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ire);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("ace:");
+ if (this.ace == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ace);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("ase:");
+ if (this.ase == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ase);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ // check for sub-struct validity
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bitfield = 0;
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class updateUnicoreJobSubmissionDetails_resultStandardSchemeFactory implements SchemeFactory {
+ public updateUnicoreJobSubmissionDetails_resultStandardScheme getScheme() {
+ return new updateUnicoreJobSubmissionDetails_resultStandardScheme();
+ }
+ }
+
+ private static class updateUnicoreJobSubmissionDetails_resultStandardScheme extends StandardScheme<updateUnicoreJobSubmissionDetails_result> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, updateUnicoreJobSubmissionDetails_result struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 0: // SUCCESS
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.success = iprot.readBool();
+ struct.setSuccessIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 1: // IRE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.ire = new org.apache.airavata.model.error.InvalidRequestException();
+ struct.ire.read(iprot);
+ struct.setIreIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // ACE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+ struct.ace = new org.apache.airavata.model.error.AiravataClientException();
+ struct.ace.read(iprot);
+ struct.setAceIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // ASE
+ if (schemeField.type == org.
<TRUNCATED>
[05/13] airavata git commit: reverting changes done to distribution
pom - 30aefc46bedcc06516d992a1b3da196f3bf21289
Posted by la...@apache.org.
reverting changes done to distribution pom - 30aefc46bedcc06516d992a1b3da196f3bf21289
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/155c3c75
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/155c3c75
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/155c3c75
Branch: refs/heads/queue-gfac-rabbitmq
Commit: 155c3c75326945f80e123701cac8af62aa0d1502
Parents: 0422094
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Mon Feb 16 16:45:39 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Mon Feb 16 16:45:39 2015 -0500
----------------------------------------------------------------------
modules/distribution/server/pom.xml | 110 +++++++++----------------------
1 file changed, 30 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/155c3c75/modules/distribution/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml
index 8dee07d..5f44c45 100644
--- a/modules/distribution/server/pom.xml
+++ b/modules/distribution/server/pom.xml
@@ -179,21 +179,11 @@
<artifactId>xpp5</artifactId>
<version>${xpp5.version}</version>
</dependency>
- <dependency>
- <groupId>org.ogce</groupId>
- <artifactId>xsul</artifactId>
- <version>${xsul.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.ogce</groupId>
+ <artifactId>xsul</artifactId>
+ <version>${xsul.version}</version>
+ </dependency>
<dependency>
<groupId>org.ogce</groupId>
<artifactId>gpel-client</artifactId>
@@ -204,17 +194,11 @@
<artifactId>jython</artifactId>
<version>${jython.version}</version>
</dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.3.20</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>1.3.20</version>
+ </dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
@@ -270,44 +254,16 @@
<artifactId>app-catalog-data</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-common-utils</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-service</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-common-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-orchestrator-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-orchestrator-stubs</artifactId>
@@ -363,11 +319,11 @@
<!--<artifactId>airavata-gfac-gram</artifactId>-->
<!--<version>${project.version}</version>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-bes</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.airavata</groupId>-->
+ <!--<artifactId>airavata-gfac-bes</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-gfac-gsissh</artifactId>
@@ -524,17 +480,11 @@
<artifactId>jackson-core-asl</artifactId>
<version>1.9.2</version>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
[12/13] airavata git commit: fixing AIRAVATA-1584
Posted by la...@apache.org.
fixing AIRAVATA-1584
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/33d2e27a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/33d2e27a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/33d2e27a
Branch: refs/heads/queue-gfac-rabbitmq
Commit: 33d2e27a4d329f95ce12ba621817ef9e2b956fb4
Parents: d9ae024
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Feb 19 15:10:38 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu Feb 19 15:10:38 2015 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 86 +-
.../java/org/apache/airavata/api/Airavata.java | 6323 ++++++++++++++++--
.../main/resources/lib/airavata/Airavata.cpp | 5246 +++++++++------
.../src/main/resources/lib/airavata/Airavata.h | 636 ++
.../lib/airavata/Airavata_server.skeleton.cpp | 20 +
.../resources/lib/Airavata/API/Airavata.php | 1270 +++-
.../client/samples/CreateLaunchExperiment.java | 12 +-
.../airavataAPI.thrift | 23 +
.../appcatalog/cpi/ComputeResource.java | 3 +
.../catalog/data/impl/ComputeResourceImpl.java | 30 +-
.../catalog/data/model/UnicoreDataMovement.java | 65 +
.../data/resources/AbstractResource.java | 7 +
.../resources/UnicoreDataMovementResource.java | 255 +
.../catalog/data/util/AppCatalogJPAUtils.java | 19 +-
.../data/util/AppCatalogResourceType.java | 1 +
.../data/util/AppCatalogThriftConversion.java | 20 +-
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/appcatalog-derby.sql | 8 +
.../src/main/resources/appcatalog-mysql.sql | 9 +
.../src/test/resources/appcatalog-derby.sql | 8 +
.../main/resources/airavata-server.properties | 2 +-
.../messaging/client/RabbitMQListner.java | 15 +
.../messaging/core/impl/RabbitMQPublisher.java | 2 +-
.../messaging/core/stats/CountWriterTask.java | 36 +
.../messaging/core/stats/LatencyWriterTask.java | 37 +
.../messaging/core/stats/StatCounter.java | 38 +-
.../messaging/core/stats/WriterTask.java | 39 -
27 files changed, 11606 insertions(+), 2605 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 8e2ca17..722c1d0 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -28,13 +28,7 @@ import org.airavata.appcatalog.cpi.ComputeResource;
import org.airavata.appcatalog.cpi.GwyResourceProfile;
import org.airavata.appcatalog.cpi.WorkflowCatalog;
import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
-import org.apache.aiaravata.application.catalog.data.resources.AbstractResource;
-import org.apache.aiaravata.application.catalog.data.resources.CloudSubmissionResource;
-import org.apache.aiaravata.application.catalog.data.resources.GridftpDataMovementResource;
-import org.apache.aiaravata.application.catalog.data.resources.LocalDataMovementResource;
-import org.apache.aiaravata.application.catalog.data.resources.LocalSubmissionResource;
-import org.apache.aiaravata.application.catalog.data.resources.ScpDataMovementResource;
-import org.apache.aiaravata.application.catalog.data.resources.SshJobSubmissionResource;
+import org.apache.aiaravata.application.catalog.data.resources.*;
import org.apache.aiaravata.application.catalog.data.util.AppCatalogThriftConversion;
import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.airavataAPIConstants;
@@ -53,19 +47,7 @@ import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
-import org.apache.airavata.model.appcatalog.computeresource.CloudJobSubmission;
-import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
-import org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface;
-import org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol;
-import org.apache.airavata.model.appcatalog.computeresource.GridFTPDataMovement;
-import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
-import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol;
-import org.apache.airavata.model.appcatalog.computeresource.LOCALDataMovement;
-import org.apache.airavata.model.appcatalog.computeresource.LOCALSubmission;
-import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
-import org.apache.airavata.model.appcatalog.computeresource.SCPDataMovement;
-import org.apache.airavata.model.appcatalog.computeresource.SSHJobSubmission;
-import org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission;
+import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
import org.apache.airavata.model.error.AiravataClientConnectException;
@@ -2025,6 +2007,23 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
}
+
+ @Override
+ public boolean updateUnicoreJobSubmissionDetails(String jobSubmissionInterfaceId, UnicoreJobSubmission unicoreJobSubmission) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
+ UnicoreJobSubmissionResource submission = AppCatalogThriftConversion.getUnicoreJobSubmission(unicoreJobSubmission);
+ submission.setjobSubmissionInterfaceId(jobSubmissionInterfaceId);
+ submission.save();
+ return true;
+ } catch (AppCatalogException e) {
+ logger.errorId(jobSubmissionInterfaceId, "Error while adding job submission interface to resource compute resource...", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while adding job submission interface to resource compute resource. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
/**
* Add a Local data moevement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
@@ -2167,6 +2166,53 @@ public class AiravataServerHandler implements Airavata.Iface {
}
}
+ @Override
+ public String addUnicoreDataMovementDetails(String computeResourceId, int priorityOrder, UnicoreDataMovement unicoreDataMovement) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
+ appCatalog = AppCatalogFactory.getAppCatalog();
+ ComputeResource computeResource = appCatalog.getComputeResource();
+ return addDataMovementInterface(computeResource, computeResourceId,
+ computeResource.addUnicoreDataMovement(unicoreDataMovement), DataMovementProtocol.UNICORE_STORAGE_SERVICE, priorityOrder);
+ } catch (AppCatalogException e) {
+ logger.errorId(computeResourceId, "Error while adding data movement interface to resource compute resource...", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while adding data movement interface to resource compute resource. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
+ @Override
+ public boolean updateUnicoreDataMovementDetails(String dataMovementInterfaceId, UnicoreDataMovement unicoreDataMovement) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
+ UnicoreDataMovementResource movment = AppCatalogThriftConversion.getUnicoreDMResource(unicoreDataMovement);
+ movment.setDataMovementId(dataMovementInterfaceId);
+ movment.save();
+ return true;
+ } catch (AppCatalogException e) {
+ logger.errorId(dataMovementInterfaceId, "Error while updating unicore data movement to compute resource...", e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage("Error while updating unicore data movement to compute resource. More info : " + e.getMessage());
+ throw exception;
+ }
+ }
+
+ @Override
+ public UnicoreDataMovement getUnicoreDataMovement(String dataMovementId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, TException {
+ try {
+ appCatalog = AppCatalogFactory.getAppCatalog();
+ return appCatalog.getComputeResource().getUNICOREDataMovement(dataMovementId);
+ } catch (AppCatalogException e) {
+ String errorMsg = "Error while retrieving UNICORE data movement interface...";
+ logger.errorId(dataMovementId, errorMsg, e);
+ AiravataSystemException exception = new AiravataSystemException();
+ exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+ exception.setMessage(errorMsg + e.getMessage());
+ throw exception;
+ }
+ }
+
/**
* Add a GridFTP data moevement details to a compute resource
* App catalog will return a dataMovementInterfaceId which will be added to the dataMovementInterfaces.
[07/13] airavata git commit: fixing compilation issue
Posted by la...@apache.org.
fixing compilation issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d9ae024b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d9ae024b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d9ae024b
Branch: refs/heads/queue-gfac-rabbitmq
Commit: d9ae024b90d6a66c5cef4d0b7db344057af8364c
Parents: b622683
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Feb 17 15:04:13 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Feb 17 15:04:13 2015 -0500
----------------------------------------------------------------------
.../org/apache/airavata/client/samples/CreateLaunchExperiment.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d9ae024b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 200b76e..7fbb18b 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -25,7 +25,6 @@ import org.apache.airavata.api.Airavata;
import org.apache.airavata.api.client.AiravataClientFactory;
import org.apache.airavata.client.tools.RegisterSampleApplications;
import org.apache.airavata.client.tools.RegisterSampleApplicationsUtils;
-import org.apache.airavata.messaging.core.stats.StatCounter;
import org.apache.airavata.model.appcatalog.appinterface.DataType;
import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType;
import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType;
[04/13] airavata git commit: adding rabbitMQ java client -
AIRAVATA-1574
Posted by la...@apache.org.
adding rabbitMQ java client - AIRAVATA-1574
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/04220940
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/04220940
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/04220940
Branch: refs/heads/queue-gfac-rabbitmq
Commit: 042209406ecacb00d88c610dd8717aa12e7aa33c
Parents: e680397
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Feb 12 14:50:00 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu Feb 12 14:50:00 2015 -0500
----------------------------------------------------------------------
modules/messaging/client/README | 15 ++
modules/messaging/client/pom.xml | 103 +++++++++
.../messaging/client/RabbitMQListner.java | 215 +++++++++++++++++++
.../messaging/core/impl/RabbitMQPublisher.java | 9 +-
modules/messaging/pom.xml | 1 +
5 files changed, 339 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/04220940/modules/messaging/client/README
----------------------------------------------------------------------
diff --git a/modules/messaging/client/README b/modules/messaging/client/README
new file mode 100644
index 0000000..86a9f1a
--- /dev/null
+++ b/modules/messaging/client/README
@@ -0,0 +1,15 @@
+How to run
+========================
+
+1. Copy airavata-messaging-client-0.15-SNAPSHOT-jar-with-dependencies.jar to a location
+2. Create a folder called "resources" in the same location and copy airavata-server.properties with updated broker url in to the resources folder.
+3. To run the jar, in the command line type :
+ java -Xmx1024m -jar airavata-messaging-client-0.15-SNAPSHOT-jar-with-dependencies.jar -a
+
+ You can provide different parameters.
+ -a = to listen to all the messages
+ -gId = to listen to all the messages for given gateway Id
+ -eId = to listen to all the messages for given experiment Id
+ -jId = to listen to all the messages for given job Id
+
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/04220940/modules/messaging/client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/messaging/client/pom.xml b/modules/messaging/client/pom.xml
new file mode 100644
index 0000000..762bd10
--- /dev/null
+++ b/modules/messaging/client/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
+ the Apache License, Version 2.0 (theÏ "License"); you may not use this file except in compliance with the License. You may
+ obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
+ in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+ ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under
+ the License. -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>messaging</artifactId>
+ <version>0.15-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>airavata-messaging-client</artifactId>
+ <packaging>jar</packaging>
+ <name>Airavata Messaging Client</name>
+ <url>http://airavata.apache.org/</url>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-messaging-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-data-models</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>3.3.5</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.airavata.messaging.client.RabbitMQListner</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id> <!-- this is used for inheritance merges -->
+ <phase>package</phase> <!-- bind to the packaging phase -->
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/04220940/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java
----------------------------------------------------------------------
diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java
new file mode 100644
index 0000000..215d531
--- /dev/null
+++ b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/RabbitMQListner.java
@@ -0,0 +1,215 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.messaging.client;
+
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
+import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.common.utils.ThriftUtils;
+import org.apache.airavata.messaging.core.MessageContext;
+import org.apache.airavata.messaging.core.MessageHandler;
+import org.apache.airavata.messaging.core.MessagingConstants;
+import org.apache.airavata.messaging.core.impl.RabbitMQConsumer;
+import org.apache.airavata.model.messaging.event.*;
+import org.apache.commons.cli.*;
+import org.apache.thrift.TBase;
+import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class RabbitMQListner {
+ public static final String RABBITMQ_BROKER_URL = "rabbitmq.broker.url";
+ public static final String RABBITMQ_EXCHANGE_NAME = "rabbitmq.exchange.name";
+ private final static Logger logger = LoggerFactory.getLogger(RabbitMQListner.class);
+ private static String gatewayId = "*";
+ private static boolean gatewayLevelMessages = false;
+ private static boolean experimentLevelMessages = false;
+ private static boolean jobLevelMessages = false;
+ private static String experimentId = "*";
+ private static String jobId = "*";
+ private static boolean allMessages = false;
+
+ public static void main(String[] args) {
+ parseArguments(args);
+ try {
+ AiravataUtils.setExecutionAsServer();
+ String brokerUrl = ServerSettings.getSetting(RABBITMQ_BROKER_URL);
+ final String exchangeName = ServerSettings.getSetting(RABBITMQ_EXCHANGE_NAME);
+ RabbitMQConsumer consumer = new RabbitMQConsumer(brokerUrl, exchangeName);
+ consumer.listen(new MessageHandler() {
+ @Override
+ public Map<String, Object> getProperties() {
+ Map<String, Object> props = new HashMap<String, Object>();
+ List<String> routingKeys = new ArrayList<String>();
+ if (allMessages){
+ routingKeys.add("*");
+ routingKeys.add("*.*");
+ routingKeys.add("*.*.*");
+ routingKeys.add("*.*.*.*");
+ routingKeys.add("*.*.*.*.*");
+ }else {
+ if (gatewayLevelMessages){
+ routingKeys.add(gatewayId);
+ routingKeys.add(gatewayId + ".*");
+ routingKeys.add(gatewayId + ".*.*");
+ routingKeys.add(gatewayId + ".*.*.*");
+ routingKeys.add(gatewayId + ".*.*.*.*");
+ }else if (experimentLevelMessages){
+ routingKeys.add(gatewayId);
+ routingKeys.add(gatewayId + "." + experimentId);
+ routingKeys.add(gatewayId + "." + experimentId+ ".*");
+ routingKeys.add(gatewayId + "." + experimentId+ ".*.*");
+ routingKeys.add(gatewayId + "." + experimentId+ ".*.*.*");
+ }else if (jobLevelMessages){
+ routingKeys.add(gatewayId);
+ routingKeys.add(gatewayId + "." + experimentId);
+ routingKeys.add(gatewayId + "." + experimentId+ ".*");
+ routingKeys.add(gatewayId + "." + experimentId+ ".*.*");
+ routingKeys.add(gatewayId + "." + experimentId+ ".*." + jobId);
+ }
+ }
+ props.put(MessagingConstants.RABBIT_ROUTING_KEY, routingKeys);
+ return props;
+ }
+
+ @Override
+ public void onMessage(MessageContext message) {
+ if (message.getType().equals(MessageType.EXPERIMENT)){
+ try {
+ ExperimentStatusChangeEvent event = new ExperimentStatusChangeEvent();
+ TBase messageEvent = message.getEvent();
+ byte[] bytes = ThriftUtils.serializeThriftObject(messageEvent);
+ ThriftUtils.createThriftFromBytes(bytes, event);
+ System.out.println(" Message Received with message id '" + message.getMessageId()
+ + "' and with message type '" + message.getType() + "' and with state : '" + event.getState().toString() +
+ " for Gateway " + event.getGatewayId());
+ } catch (TException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }else if (message.getType().equals(MessageType.WORKFLOWNODE)){
+ try {
+ WorkflowNodeStatusChangeEvent event = new WorkflowNodeStatusChangeEvent();
+ TBase messageEvent = message.getEvent();
+ byte[] bytes = ThriftUtils.serializeThriftObject(messageEvent);
+ ThriftUtils.createThriftFromBytes(bytes, event);
+ System.out.println(" Message Received with message id '" + message.getMessageId()
+ + "' and with message type '" + message.getType() + "' and with state : '" + event.getState().toString() +
+ " for Gateway " + event.getWorkflowNodeIdentity().getGatewayId());
+ } catch (TException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }else if (message.getType().equals(MessageType.TASK)){
+ try {
+ TaskStatusChangeEvent event = new TaskStatusChangeEvent();
+ TBase messageEvent = message.getEvent();
+ byte[] bytes = ThriftUtils.serializeThriftObject(messageEvent);
+ ThriftUtils.createThriftFromBytes(bytes, event);
+ System.out.println(" Message Received with message id '" + message.getMessageId()
+ + "' and with message type '" + message.getType() + "' and with state : '" + event.getState().toString() +
+ " for Gateway " + event.getTaskIdentity().getGatewayId());
+ } catch (TException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }else if (message.getType().equals(MessageType.JOB)){
+ try {
+ JobStatusChangeEvent event = new JobStatusChangeEvent();
+ TBase messageEvent = message.getEvent();
+ byte[] bytes = ThriftUtils.serializeThriftObject(messageEvent);
+ ThriftUtils.createThriftFromBytes(bytes, event);
+ System.out.println(" Message Received with message id '" + message.getMessageId()
+ + "' and with message type '" + message.getType() + "' and with state : '" + event.getState().toString() +
+ " for Gateway " + event.getJobIdentity().getGatewayId());
+ } catch (TException e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+ }
+ });
+ } catch (ApplicationSettingsException e) {
+ logger.error("Error reading airavata server properties", e);
+ }catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ }
+
+ }
+
+ public static void parseArguments(String[] args) {
+ try{
+ Options options = new Options();
+
+ options.addOption("gId", true , "Gateway ID");
+ options.addOption("eId", true, "Experiment ID");
+ options.addOption("jId", true, "Job ID");
+ options.addOption("a", false, "All Notifications");
+
+ CommandLineParser parser = new PosixParser();
+ CommandLine cmd = parser.parse( options, args);
+ if (cmd.getOptions() == null || cmd.getOptions().length == 0){
+ logger.info("You have not specified any options. We assume you need to listen to all the messages...");
+ allMessages = true;
+ gatewayId = "*";
+ }
+ if (cmd.hasOption("a")){
+ logger.info("Listening to all the messages...");
+ allMessages = true;
+ gatewayId = "*";
+ }else {
+ gatewayId = cmd.getOptionValue("gId");
+ if (gatewayId == null){
+ gatewayId = "*";
+ logger.info("You have not specified a gateway id. We assume you need to listen to all the messages...");
+ } else {
+ gatewayLevelMessages = true;
+ }
+ experimentId = cmd.getOptionValue("eId");
+ if (experimentId == null && !gatewayId.equals("*")){
+ experimentId = "*";
+ logger.info("You have not specified a experiment id. We assume you need to listen to all the messages for the gateway with id " + gatewayId);
+ } else if (experimentId == null && gatewayId.equals("*")) {
+ experimentId = "*";
+ logger.info("You have not specified a experiment id and a gateway id. We assume you need to listen to all the messages...");
+ }else {
+ experimentLevelMessages = true;
+ }
+ jobId = cmd.getOptionValue("jId");
+ if (jobId == null && !gatewayId.equals("*") && !experimentId.equals("*")){
+ jobId = "*";
+ logger.info("You have not specified a job id. We assume you need to listen to all the messages for the gateway with id " + gatewayId
+ + " with experiment id : " + experimentId );
+ } else if (jobId == null && gatewayId.equals("*") && experimentId.equals("*")) {
+ jobId = "*";
+ logger.info("You have not specified a job Id or experiment Id or a gateway Id. We assume you need to listen to all the messages...");
+ }else {
+ jobLevelMessages = true;
+ }
+ }
+ } catch (ParseException e) {
+ logger.error("Error while reading command line parameters" , e);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/04220940/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
index ff14a8c..97c0d98 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
@@ -64,22 +64,23 @@ public class RabbitMQPublisher implements Publisher {
message.setMessageId(msgCtx.getMessageId());
message.setMessageType(msgCtx.getType());
message.setUpdatedTime(msgCtx.getUpdatedTime().getTime());
+ String gatewayId = msgCtx.getGatewayId();
String routingKey = null;
if (msgCtx.getType().equals(MessageType.EXPERIMENT)){
ExperimentStatusChangeEvent event = (ExperimentStatusChangeEvent) msgCtx.getEvent();
- routingKey = event.getExperimentId();
+ routingKey = gatewayId + "." + event.getExperimentId();
} else if (msgCtx.getType().equals(MessageType.TASK)) {
TaskStatusChangeEvent event = (TaskStatusChangeEvent) msgCtx.getEvent();
- routingKey = event.getTaskIdentity().getExperimentId() + "." +
+ routingKey = gatewayId + "." + event.getTaskIdentity().getExperimentId() + "." +
event.getTaskIdentity().getWorkflowNodeId() + "." + event.getTaskIdentity().getTaskId();
}else if (msgCtx.getType().equals(MessageType.WORKFLOWNODE)){
WorkflowNodeStatusChangeEvent event = (WorkflowNodeStatusChangeEvent) msgCtx.getEvent();
WorkflowIdentifier workflowNodeIdentity = event.getWorkflowNodeIdentity();
- routingKey = workflowNodeIdentity.getExperimentId() + "." + workflowNodeIdentity.getWorkflowNodeId();
+ routingKey = gatewayId + "." + workflowNodeIdentity.getExperimentId() + "." + workflowNodeIdentity.getWorkflowNodeId();
}else if (msgCtx.getType().equals(MessageType.JOB)){
JobStatusChangeEvent event = (JobStatusChangeEvent)msgCtx.getEvent();
JobIdentifier identity = event.getJobIdentity();
- routingKey = identity.getExperimentId() + "." +
+ routingKey = gatewayId + "." + identity.getExperimentId() + "." +
identity.getWorkflowNodeId() + "." +
identity.getTaskId() + "." +
identity.getJobId();
http://git-wip-us.apache.org/repos/asf/airavata/blob/04220940/modules/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/modules/messaging/pom.xml b/modules/messaging/pom.xml
index e8237be..bfc5424 100644
--- a/modules/messaging/pom.xml
+++ b/modules/messaging/pom.xml
@@ -31,6 +31,7 @@
</activation>
<modules>
<module>core</module>
+ <module>client</module>
</modules>
</profile>
</profiles>
[10/13] airavata git commit: fixing AIRAVATA-1584
Posted by la...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/33d2e27a/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 5991413..1a7bbbb 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
@@ -15627,6 +15627,250 @@ uint32_t Airavata_updateCloudJobSubmissionDetails_presult::read(::apache::thrift
return xfer;
}
+uint32_t Airavata_updateUnicoreJobSubmissionDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+ bool isset_jobSubmissionInterfaceId = false;
+ bool isset_unicoreJobSubmission = false;
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->jobSubmissionInterfaceId);
+ isset_jobSubmissionInterfaceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->unicoreJobSubmission.read(iprot);
+ isset_unicoreJobSubmission = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ if (!isset_jobSubmissionInterfaceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_unicoreJobSubmission)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ return xfer;
+}
+
+uint32_t Airavata_updateUnicoreJobSubmissionDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ xfer += oprot->writeStructBegin("Airavata_updateUnicoreJobSubmissionDetails_args");
+
+ xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->jobSubmissionInterfaceId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("unicoreJobSubmission", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->unicoreJobSubmission.write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t Airavata_updateUnicoreJobSubmissionDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+ uint32_t xfer = 0;
+ xfer += oprot->writeStructBegin("Airavata_updateUnicoreJobSubmissionDetails_pargs");
+
+ xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("unicoreJobSubmission", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += (*(this->unicoreJobSubmission)).write(oprot);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t Airavata_updateUnicoreJobSubmissionDetails_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
+uint32_t Airavata_updateUnicoreJobSubmissionDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+
+ uint32_t xfer = 0;
+
+ xfer += oprot->writeStructBegin("Airavata_updateUnicoreJobSubmissionDetails_result");
+
+ if (this->__isset.success) {
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ire) {
+ xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->ire.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ace) {
+ xfer += oprot->writeFieldBegin("ace", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->ace.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ } else if (this->__isset.ase) {
+ xfer += oprot->writeFieldBegin("ase", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->ase.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ xfer += oprot->writeFieldStop();
+ xfer += oprot->writeStructEnd();
+ return xfer;
+}
+
+uint32_t Airavata_updateUnicoreJobSubmissionDetails_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+
+ uint32_t xfer = 0;
+ std::string fname;
+ ::apache::thrift::protocol::TType ftype;
+ int16_t fid;
+
+ xfer += iprot->readStructBegin(fname);
+
+ using ::apache::thrift::protocol::TProtocolException;
+
+
+ while (true)
+ {
+ xfer += iprot->readFieldBegin(fname, ftype, fid);
+ if (ftype == ::apache::thrift::protocol::T_STOP) {
+ break;
+ }
+ switch (fid)
+ {
+ case 0:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
+ this->__isset.success = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ire.read(iprot);
+ this->__isset.ire = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ace.read(iprot);
+ this->__isset.ace = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->ase.read(iprot);
+ this->__isset.ase = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
+ xfer += iprot->readFieldEnd();
+ }
+
+ xfer += iprot->readStructEnd();
+
+ return xfer;
+}
+
uint32_t Airavata_addLocalDataMovementDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
@@ -17091,7 +17335,7 @@ uint32_t Airavata_getSCPDataMovement_presult::read(::apache::thrift::protocol::T
return xfer;
}
-uint32_t Airavata_addGridFTPDataMovementDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addUnicoreDataMovementDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17104,7 +17348,7 @@ uint32_t Airavata_addGridFTPDataMovementDetails_args::read(::apache::thrift::pro
bool isset_computeResourceId = false;
bool isset_priorityOrder = false;
- bool isset_gridFTPDataMovement = false;
+ bool isset_unicoreDataMovement = false;
while (true)
{
@@ -17132,8 +17376,8 @@ uint32_t Airavata_addGridFTPDataMovementDetails_args::read(::apache::thrift::pro
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->gridFTPDataMovement.read(iprot);
- isset_gridFTPDataMovement = true;
+ xfer += this->unicoreDataMovement.read(iprot);
+ isset_unicoreDataMovement = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -17151,14 +17395,14 @@ uint32_t Airavata_addGridFTPDataMovementDetails_args::read(::apache::thrift::pro
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_priorityOrder)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gridFTPDataMovement)
+ if (!isset_unicoreDataMovement)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_addGridFTPDataMovementDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addUnicoreDataMovementDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_addGridFTPDataMovementDetails_args");
+ xfer += oprot->writeStructBegin("Airavata_addUnicoreDataMovementDetails_args");
xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString(this->computeResourceId);
@@ -17168,8 +17412,8 @@ uint32_t Airavata_addGridFTPDataMovementDetails_args::write(::apache::thrift::pr
xfer += oprot->writeI32(this->priorityOrder);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gridFTPDataMovement", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += this->gridFTPDataMovement.write(oprot);
+ xfer += oprot->writeFieldBegin("unicoreDataMovement", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->unicoreDataMovement.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -17177,9 +17421,9 @@ uint32_t Airavata_addGridFTPDataMovementDetails_args::write(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_addGridFTPDataMovementDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addUnicoreDataMovementDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_addGridFTPDataMovementDetails_pargs");
+ xfer += oprot->writeStructBegin("Airavata_addUnicoreDataMovementDetails_pargs");
xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString((*(this->computeResourceId)));
@@ -17189,8 +17433,8 @@ uint32_t Airavata_addGridFTPDataMovementDetails_pargs::write(::apache::thrift::p
xfer += oprot->writeI32((*(this->priorityOrder)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("gridFTPDataMovement", ::apache::thrift::protocol::T_STRUCT, 3);
- xfer += (*(this->gridFTPDataMovement)).write(oprot);
+ xfer += oprot->writeFieldBegin("unicoreDataMovement", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += (*(this->unicoreDataMovement)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -17198,7 +17442,7 @@ uint32_t Airavata_addGridFTPDataMovementDetails_pargs::write(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_addGridFTPDataMovementDetails_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addUnicoreDataMovementDetails_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17262,11 +17506,11 @@ uint32_t Airavata_addGridFTPDataMovementDetails_result::read(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_addGridFTPDataMovementDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addUnicoreDataMovementDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_addGridFTPDataMovementDetails_result");
+ xfer += oprot->writeStructBegin("Airavata_addUnicoreDataMovementDetails_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
@@ -17290,7 +17534,7 @@ uint32_t Airavata_addGridFTPDataMovementDetails_result::write(::apache::thrift::
return xfer;
}
-uint32_t Airavata_addGridFTPDataMovementDetails_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addUnicoreDataMovementDetails_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17354,7 +17598,7 @@ uint32_t Airavata_addGridFTPDataMovementDetails_presult::read(::apache::thrift::
return xfer;
}
-uint32_t Airavata_updateGridFTPDataMovementDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateUnicoreDataMovementDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17366,7 +17610,7 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_args::read(::apache::thrift::
using ::apache::thrift::protocol::TProtocolException;
bool isset_dataMovementInterfaceId = false;
- bool isset_gridFTPDataMovement = false;
+ bool isset_unicoreDataMovement = false;
while (true)
{
@@ -17386,8 +17630,8 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_args::read(::apache::thrift::
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->gridFTPDataMovement.read(iprot);
- isset_gridFTPDataMovement = true;
+ xfer += this->unicoreDataMovement.read(iprot);
+ isset_unicoreDataMovement = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -17403,21 +17647,21 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_args::read(::apache::thrift::
if (!isset_dataMovementInterfaceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_gridFTPDataMovement)
+ if (!isset_unicoreDataMovement)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_updateGridFTPDataMovementDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateUnicoreDataMovementDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateGridFTPDataMovementDetails_args");
+ xfer += oprot->writeStructBegin("Airavata_updateUnicoreDataMovementDetails_args");
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);
- xfer += this->gridFTPDataMovement.write(oprot);
+ xfer += oprot->writeFieldBegin("unicoreDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->unicoreDataMovement.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -17425,16 +17669,16 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_args::write(::apache::thrift:
return xfer;
}
-uint32_t Airavata_updateGridFTPDataMovementDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateUnicoreDataMovementDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateGridFTPDataMovementDetails_pargs");
+ xfer += oprot->writeStructBegin("Airavata_updateUnicoreDataMovementDetails_pargs");
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);
- xfer += (*(this->gridFTPDataMovement)).write(oprot);
+ xfer += oprot->writeFieldBegin("unicoreDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += (*(this->unicoreDataMovement)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -17442,7 +17686,7 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_pargs::write(::apache::thrift
return xfer;
}
-uint32_t Airavata_updateGridFTPDataMovementDetails_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateUnicoreDataMovementDetails_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17506,11 +17750,11 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_result::read(::apache::thrift
return xfer;
}
-uint32_t Airavata_updateGridFTPDataMovementDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateUnicoreDataMovementDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateGridFTPDataMovementDetails_result");
+ xfer += oprot->writeStructBegin("Airavata_updateUnicoreDataMovementDetails_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -17534,7 +17778,7 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_result::write(::apache::thrif
return xfer;
}
-uint32_t Airavata_updateGridFTPDataMovementDetails_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateUnicoreDataMovementDetails_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17598,7 +17842,7 @@ uint32_t Airavata_updateGridFTPDataMovementDetails_presult::read(::apache::thrif
return xfer;
}
-uint32_t Airavata_getGridFTPDataMovement_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUnicoreDataMovement_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17641,9 +17885,9 @@ uint32_t Airavata_getGridFTPDataMovement_args::read(::apache::thrift::protocol::
return xfer;
}
-uint32_t Airavata_getGridFTPDataMovement_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUnicoreDataMovement_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getGridFTPDataMovement_args");
+ xfer += oprot->writeStructBegin("Airavata_getUnicoreDataMovement_args");
xfer += oprot->writeFieldBegin("dataMovementId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString(this->dataMovementId);
@@ -17654,9 +17898,9 @@ uint32_t Airavata_getGridFTPDataMovement_args::write(::apache::thrift::protocol:
return xfer;
}
-uint32_t Airavata_getGridFTPDataMovement_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUnicoreDataMovement_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getGridFTPDataMovement_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getUnicoreDataMovement_pargs");
xfer += oprot->writeFieldBegin("dataMovementId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString((*(this->dataMovementId)));
@@ -17667,7 +17911,7 @@ uint32_t Airavata_getGridFTPDataMovement_pargs::write(::apache::thrift::protocol
return xfer;
}
-uint32_t Airavata_getGridFTPDataMovement_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUnicoreDataMovement_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17731,11 +17975,11 @@ uint32_t Airavata_getGridFTPDataMovement_result::read(::apache::thrift::protocol
return xfer;
}
-uint32_t Airavata_getGridFTPDataMovement_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getUnicoreDataMovement_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getGridFTPDataMovement_result");
+ xfer += oprot->writeStructBegin("Airavata_getUnicoreDataMovement_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
@@ -17759,7 +18003,7 @@ uint32_t Airavata_getGridFTPDataMovement_result::write(::apache::thrift::protoco
return xfer;
}
-uint32_t Airavata_getGridFTPDataMovement_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getUnicoreDataMovement_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17823,7 +18067,7 @@ uint32_t Airavata_getGridFTPDataMovement_presult::read(::apache::thrift::protoco
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriority_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addGridFTPDataMovementDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17834,8 +18078,9 @@ uint32_t Airavata_changeJobSubmissionPriority_args::read(::apache::thrift::proto
using ::apache::thrift::protocol::TProtocolException;
- bool isset_jobSubmissionInterfaceId = false;
- bool isset_newPriorityOrder = false;
+ bool isset_computeResourceId = false;
+ bool isset_priorityOrder = false;
+ bool isset_gridFTPDataMovement = false;
while (true)
{
@@ -17847,16 +18092,24 @@ uint32_t Airavata_changeJobSubmissionPriority_args::read(::apache::thrift::proto
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->jobSubmissionInterfaceId);
- isset_jobSubmissionInterfaceId = true;
+ xfer += iprot->readString(this->computeResourceId);
+ isset_computeResourceId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- xfer += iprot->readI32(this->newPriorityOrder);
- isset_newPriorityOrder = true;
+ xfer += iprot->readI32(this->priorityOrder);
+ isset_priorityOrder = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 3:
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->gridFTPDataMovement.read(iprot);
+ isset_gridFTPDataMovement = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -17870,23 +18123,29 @@ uint32_t Airavata_changeJobSubmissionPriority_args::read(::apache::thrift::proto
xfer += iprot->readStructEnd();
- if (!isset_jobSubmissionInterfaceId)
+ if (!isset_computeResourceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_newPriorityOrder)
+ if (!isset_priorityOrder)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_gridFTPDataMovement)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriority_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addGridFTPDataMovementDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriority_args");
+ xfer += oprot->writeStructBegin("Airavata_addGridFTPDataMovementDetails_args");
- xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->jobSubmissionInterfaceId);
+ xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->computeResourceId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("newPriorityOrder", ::apache::thrift::protocol::T_I32, 2);
- xfer += oprot->writeI32(this->newPriorityOrder);
+ xfer += oprot->writeFieldBegin("priorityOrder", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32(this->priorityOrder);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gridFTPDataMovement", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += this->gridFTPDataMovement.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -17894,16 +18153,20 @@ uint32_t Airavata_changeJobSubmissionPriority_args::write(::apache::thrift::prot
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriority_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addGridFTPDataMovementDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriority_pargs");
+ xfer += oprot->writeStructBegin("Airavata_addGridFTPDataMovementDetails_pargs");
- xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
+ xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->computeResourceId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("newPriorityOrder", ::apache::thrift::protocol::T_I32, 2);
- xfer += oprot->writeI32((*(this->newPriorityOrder)));
+ xfer += oprot->writeFieldBegin("priorityOrder", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32((*(this->priorityOrder)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("gridFTPDataMovement", ::apache::thrift::protocol::T_STRUCT, 3);
+ xfer += (*(this->gridFTPDataMovement)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -17911,7 +18174,7 @@ uint32_t Airavata_changeJobSubmissionPriority_pargs::write(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriority_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addGridFTPDataMovementDetails_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -17932,8 +18195,8 @@ uint32_t Airavata_changeJobSubmissionPriority_result::read(::apache::thrift::pro
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -17975,15 +18238,15 @@ uint32_t Airavata_changeJobSubmissionPriority_result::read(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriority_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addGridFTPDataMovementDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriority_result");
+ xfer += oprot->writeStructBegin("Airavata_addGridFTPDataMovementDetails_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+ xfer += oprot->writeString(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -18003,7 +18266,7 @@ uint32_t Airavata_changeJobSubmissionPriority_result::write(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriority_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addGridFTPDataMovementDetails_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18024,8 +18287,8 @@ uint32_t Airavata_changeJobSubmissionPriority_presult::read(::apache::thrift::pr
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -18067,7 +18330,7 @@ uint32_t Airavata_changeJobSubmissionPriority_presult::read(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_changeDataMovementPriority_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGridFTPDataMovementDetails_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18079,7 +18342,7 @@ uint32_t Airavata_changeDataMovementPriority_args::read(::apache::thrift::protoc
using ::apache::thrift::protocol::TProtocolException;
bool isset_dataMovementInterfaceId = false;
- bool isset_newPriorityOrder = false;
+ bool isset_gridFTPDataMovement = false;
while (true)
{
@@ -18098,9 +18361,9 @@ uint32_t Airavata_changeDataMovementPriority_args::read(::apache::thrift::protoc
}
break;
case 2:
- if (ftype == ::apache::thrift::protocol::T_I32) {
- xfer += iprot->readI32(this->newPriorityOrder);
- isset_newPriorityOrder = true;
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->gridFTPDataMovement.read(iprot);
+ isset_gridFTPDataMovement = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -18116,21 +18379,21 @@ uint32_t Airavata_changeDataMovementPriority_args::read(::apache::thrift::protoc
if (!isset_dataMovementInterfaceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_newPriorityOrder)
+ if (!isset_gridFTPDataMovement)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_changeDataMovementPriority_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGridFTPDataMovementDetails_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriority_args");
+ xfer += oprot->writeStructBegin("Airavata_updateGridFTPDataMovementDetails_args");
xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString(this->dataMovementInterfaceId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("newPriorityOrder", ::apache::thrift::protocol::T_I32, 2);
- xfer += oprot->writeI32(this->newPriorityOrder);
+ xfer += oprot->writeFieldBegin("gridFTPDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->gridFTPDataMovement.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -18138,16 +18401,16 @@ uint32_t Airavata_changeDataMovementPriority_args::write(::apache::thrift::proto
return xfer;
}
-uint32_t Airavata_changeDataMovementPriority_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGridFTPDataMovementDetails_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriority_pargs");
+ xfer += oprot->writeStructBegin("Airavata_updateGridFTPDataMovementDetails_pargs");
xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
xfer += oprot->writeString((*(this->dataMovementInterfaceId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("newPriorityOrder", ::apache::thrift::protocol::T_I32, 2);
- xfer += oprot->writeI32((*(this->newPriorityOrder)));
+ xfer += oprot->writeFieldBegin("gridFTPDataMovement", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += (*(this->gridFTPDataMovement)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -18155,7 +18418,7 @@ uint32_t Airavata_changeDataMovementPriority_pargs::write(::apache::thrift::prot
return xfer;
}
-uint32_t Airavata_changeDataMovementPriority_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGridFTPDataMovementDetails_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18219,11 +18482,11 @@ uint32_t Airavata_changeDataMovementPriority_result::read(::apache::thrift::prot
return xfer;
}
-uint32_t Airavata_changeDataMovementPriority_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGridFTPDataMovementDetails_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriority_result");
+ xfer += oprot->writeStructBegin("Airavata_updateGridFTPDataMovementDetails_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -18247,7 +18510,7 @@ uint32_t Airavata_changeDataMovementPriority_result::write(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_changeDataMovementPriority_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGridFTPDataMovementDetails_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18311,7 +18574,7 @@ uint32_t Airavata_changeDataMovementPriority_presult::read(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriorities_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGridFTPDataMovement_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18322,7 +18585,7 @@ uint32_t Airavata_changeJobSubmissionPriorities_args::read(::apache::thrift::pro
using ::apache::thrift::protocol::TProtocolException;
- bool isset_jobSubmissionPriorityMap = false;
+ bool isset_dataMovementId = false;
while (true)
{
@@ -18333,24 +18596,9 @@ uint32_t Airavata_changeJobSubmissionPriorities_args::read(::apache::thrift::pro
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_MAP) {
- {
- this->jobSubmissionPriorityMap.clear();
- uint32_t _size270;
- ::apache::thrift::protocol::TType _ktype271;
- ::apache::thrift::protocol::TType _vtype272;
- xfer += iprot->readMapBegin(_ktype271, _vtype272, _size270);
- uint32_t _i274;
- for (_i274 = 0; _i274 < _size270; ++_i274)
- {
- std::string _key275;
- xfer += iprot->readString(_key275);
- int32_t& _val276 = this->jobSubmissionPriorityMap[_key275];
- xfer += iprot->readI32(_val276);
- }
- xfer += iprot->readMapEnd();
- }
- isset_jobSubmissionPriorityMap = true;
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->dataMovementId);
+ isset_dataMovementId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -18364,26 +18612,17 @@ uint32_t Airavata_changeJobSubmissionPriorities_args::read(::apache::thrift::pro
xfer += iprot->readStructEnd();
- if (!isset_jobSubmissionPriorityMap)
+ if (!isset_dataMovementId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriorities_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGridFTPDataMovement_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriorities_args");
+ xfer += oprot->writeStructBegin("Airavata_getGridFTPDataMovement_args");
- xfer += oprot->writeFieldBegin("jobSubmissionPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
- {
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->jobSubmissionPriorityMap.size()));
- std::map<std::string, int32_t> ::const_iterator _iter277;
- for (_iter277 = this->jobSubmissionPriorityMap.begin(); _iter277 != this->jobSubmissionPriorityMap.end(); ++_iter277)
- {
- xfer += oprot->writeString(_iter277->first);
- xfer += oprot->writeI32(_iter277->second);
- }
- xfer += oprot->writeMapEnd();
- }
+ xfer += oprot->writeFieldBegin("dataMovementId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->dataMovementId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -18391,21 +18630,12 @@ uint32_t Airavata_changeJobSubmissionPriorities_args::write(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriorities_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGridFTPDataMovement_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriorities_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getGridFTPDataMovement_pargs");
- xfer += oprot->writeFieldBegin("jobSubmissionPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
- {
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->jobSubmissionPriorityMap)).size()));
- std::map<std::string, int32_t> ::const_iterator _iter278;
- for (_iter278 = (*(this->jobSubmissionPriorityMap)).begin(); _iter278 != (*(this->jobSubmissionPriorityMap)).end(); ++_iter278)
- {
- xfer += oprot->writeString(_iter278->first);
- xfer += oprot->writeI32(_iter278->second);
- }
- xfer += oprot->writeMapEnd();
- }
+ xfer += oprot->writeFieldBegin("dataMovementId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->dataMovementId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -18413,7 +18643,7 @@ uint32_t Airavata_changeJobSubmissionPriorities_pargs::write(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriorities_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGridFTPDataMovement_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18434,8 +18664,8 @@ uint32_t Airavata_changeJobSubmissionPriorities_result::read(::apache::thrift::p
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->success.read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -18477,15 +18707,15 @@ uint32_t Airavata_changeJobSubmissionPriorities_result::read(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriorities_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGridFTPDataMovement_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriorities_result");
+ xfer += oprot->writeStructBegin("Airavata_getGridFTPDataMovement_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
+ xfer += this->success.write(oprot);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -18505,7 +18735,7 @@ uint32_t Airavata_changeJobSubmissionPriorities_result::write(::apache::thrift::
return xfer;
}
-uint32_t Airavata_changeJobSubmissionPriorities_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGridFTPDataMovement_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18526,8 +18756,8 @@ uint32_t Airavata_changeJobSubmissionPriorities_presult::read(::apache::thrift::
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += (*(this->success)).read(iprot);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -18569,7 +18799,7 @@ uint32_t Airavata_changeJobSubmissionPriorities_presult::read(::apache::thrift::
return xfer;
}
-uint32_t Airavata_changeDataMovementPriorities_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeJobSubmissionPriority_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18580,7 +18810,8 @@ uint32_t Airavata_changeDataMovementPriorities_args::read(::apache::thrift::prot
using ::apache::thrift::protocol::TProtocolException;
- bool isset_dataMovementPriorityMap = false;
+ bool isset_jobSubmissionInterfaceId = false;
+ bool isset_newPriorityOrder = false;
while (true)
{
@@ -18591,24 +18822,17 @@ uint32_t Airavata_changeDataMovementPriorities_args::read(::apache::thrift::prot
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_MAP) {
- {
- this->dataMovementPriorityMap.clear();
- uint32_t _size279;
- ::apache::thrift::protocol::TType _ktype280;
- ::apache::thrift::protocol::TType _vtype281;
- xfer += iprot->readMapBegin(_ktype280, _vtype281, _size279);
- uint32_t _i283;
- for (_i283 = 0; _i283 < _size279; ++_i283)
- {
- std::string _key284;
- xfer += iprot->readString(_key284);
- int32_t& _val285 = this->dataMovementPriorityMap[_key284];
- xfer += iprot->readI32(_val285);
- }
- xfer += iprot->readMapEnd();
- }
- isset_dataMovementPriorityMap = true;
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->jobSubmissionInterfaceId);
+ isset_jobSubmissionInterfaceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->newPriorityOrder);
+ isset_newPriorityOrder = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -18622,26 +18846,23 @@ uint32_t Airavata_changeDataMovementPriorities_args::read(::apache::thrift::prot
xfer += iprot->readStructEnd();
- if (!isset_dataMovementPriorityMap)
+ if (!isset_jobSubmissionInterfaceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_newPriorityOrder)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_changeDataMovementPriorities_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeJobSubmissionPriority_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriorities_args");
+ xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriority_args");
- xfer += oprot->writeFieldBegin("dataMovementPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
- {
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->dataMovementPriorityMap.size()));
- std::map<std::string, int32_t> ::const_iterator _iter286;
- for (_iter286 = this->dataMovementPriorityMap.begin(); _iter286 != this->dataMovementPriorityMap.end(); ++_iter286)
- {
- xfer += oprot->writeString(_iter286->first);
- xfer += oprot->writeI32(_iter286->second);
- }
- xfer += oprot->writeMapEnd();
- }
+ xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->jobSubmissionInterfaceId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("newPriorityOrder", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32(this->newPriorityOrder);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -18649,21 +18870,16 @@ uint32_t Airavata_changeDataMovementPriorities_args::write(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_changeDataMovementPriorities_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeJobSubmissionPriority_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriorities_pargs");
+ xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriority_pargs");
- xfer += oprot->writeFieldBegin("dataMovementPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
- {
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->dataMovementPriorityMap)).size()));
- std::map<std::string, int32_t> ::const_iterator _iter287;
- for (_iter287 = (*(this->dataMovementPriorityMap)).begin(); _iter287 != (*(this->dataMovementPriorityMap)).end(); ++_iter287)
- {
- xfer += oprot->writeString(_iter287->first);
- xfer += oprot->writeI32(_iter287->second);
- }
- xfer += oprot->writeMapEnd();
- }
+ xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("newPriorityOrder", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32((*(this->newPriorityOrder)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -18671,7 +18887,7 @@ uint32_t Airavata_changeDataMovementPriorities_pargs::write(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_changeDataMovementPriorities_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeJobSubmissionPriority_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18735,11 +18951,11 @@ uint32_t Airavata_changeDataMovementPriorities_result::read(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_changeDataMovementPriorities_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeJobSubmissionPriority_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriorities_result");
+ xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriority_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -18763,7 +18979,7 @@ uint32_t Airavata_changeDataMovementPriorities_result::write(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_changeDataMovementPriorities_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeJobSubmissionPriority_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18827,7 +19043,7 @@ uint32_t Airavata_changeDataMovementPriorities_presult::read(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_deleteJobSubmissionInterface_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeDataMovementPriority_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18838,8 +19054,8 @@ uint32_t Airavata_deleteJobSubmissionInterface_args::read(::apache::thrift::prot
using ::apache::thrift::protocol::TProtocolException;
- bool isset_computeResourceId = false;
- bool isset_jobSubmissionInterfaceId = false;
+ bool isset_dataMovementInterfaceId = false;
+ bool isset_newPriorityOrder = false;
while (true)
{
@@ -18851,16 +19067,16 @@ 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;
+ xfer += iprot->readString(this->dataMovementInterfaceId);
+ isset_dataMovementInterfaceId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 2:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->jobSubmissionInterfaceId);
- isset_jobSubmissionInterfaceId = true;
+ if (ftype == ::apache::thrift::protocol::T_I32) {
+ xfer += iprot->readI32(this->newPriorityOrder);
+ isset_newPriorityOrder = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -18874,23 +19090,23 @@ uint32_t Airavata_deleteJobSubmissionInterface_args::read(::apache::thrift::prot
xfer += iprot->readStructEnd();
- if (!isset_computeResourceId)
+ if (!isset_dataMovementInterfaceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_jobSubmissionInterfaceId)
+ if (!isset_newPriorityOrder)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_deleteJobSubmissionInterface_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeDataMovementPriority_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteJobSubmissionInterface_args");
+ xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriority_args");
- xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->computeResourceId);
+ xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->dataMovementInterfaceId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->jobSubmissionInterfaceId);
+ xfer += oprot->writeFieldBegin("newPriorityOrder", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32(this->newPriorityOrder);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -18898,16 +19114,16 @@ uint32_t Airavata_deleteJobSubmissionInterface_args::write(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_deleteJobSubmissionInterface_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeDataMovementPriority_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteJobSubmissionInterface_pargs");
+ xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriority_pargs");
- xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->computeResourceId)));
+ xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->dataMovementInterfaceId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
+ xfer += oprot->writeFieldBegin("newPriorityOrder", ::apache::thrift::protocol::T_I32, 2);
+ xfer += oprot->writeI32((*(this->newPriorityOrder)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -18915,7 +19131,7 @@ uint32_t Airavata_deleteJobSubmissionInterface_pargs::write(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_deleteJobSubmissionInterface_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeDataMovementPriority_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -18979,11 +19195,11 @@ uint32_t Airavata_deleteJobSubmissionInterface_result::read(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_deleteJobSubmissionInterface_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeDataMovementPriority_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteJobSubmissionInterface_result");
+ xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriority_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -19007,7 +19223,7 @@ uint32_t Airavata_deleteJobSubmissionInterface_result::write(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_deleteJobSubmissionInterface_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeDataMovementPriority_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19071,7 +19287,7 @@ uint32_t Airavata_deleteJobSubmissionInterface_presult::read(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeJobSubmissionPriorities_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19082,8 +19298,7 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
using ::apache::thrift::protocol::TProtocolException;
- bool isset_computeResourceId = false;
- bool isset_dataMovementInterfaceId = false;
+ bool isset_jobSubmissionPriorityMap = false;
while (true)
{
@@ -19094,17 +19309,24 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
switch (fid)
{
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;
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
+ {
+ this->jobSubmissionPriorityMap.clear();
+ uint32_t _size270;
+ ::apache::thrift::protocol::TType _ktype271;
+ ::apache::thrift::protocol::TType _vtype272;
+ xfer += iprot->readMapBegin(_ktype271, _vtype272, _size270);
+ uint32_t _i274;
+ for (_i274 = 0; _i274 < _size270; ++_i274)
+ {
+ std::string _key275;
+ xfer += iprot->readString(_key275);
+ int32_t& _val276 = this->jobSubmissionPriorityMap[_key275];
+ xfer += iprot->readI32(_val276);
+ }
+ xfer += iprot->readMapEnd();
+ }
+ isset_jobSubmissionPriorityMap = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -19118,23 +19340,26 @@ uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::proto
xfer += iprot->readStructEnd();
- if (!isset_computeResourceId)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_dataMovementInterfaceId)
+ if (!isset_jobSubmissionPriorityMap)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_deleteDataMovementInterface_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeJobSubmissionPriorities_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteDataMovementInterface_args");
-
- xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->computeResourceId);
- xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriorities_args");
- xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString(this->dataMovementInterfaceId);
+ xfer += oprot->writeFieldBegin("jobSubmissionPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->jobSubmissionPriorityMap.size()));
+ std::map<std::string, int32_t> ::const_iterator _iter277;
+ for (_iter277 = this->jobSubmissionPriorityMap.begin(); _iter277 != this->jobSubmissionPriorityMap.end(); ++_iter277)
+ {
+ xfer += oprot->writeString(_iter277->first);
+ xfer += oprot->writeI32(_iter277->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -19142,16 +19367,21 @@ uint32_t Airavata_deleteDataMovementInterface_args::write(::apache::thrift::prot
return xfer;
}
-uint32_t Airavata_deleteDataMovementInterface_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeJobSubmissionPriorities_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteDataMovementInterface_pargs");
-
- xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->computeResourceId)));
- xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriorities_pargs");
- xfer += oprot->writeFieldBegin("dataMovementInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
- xfer += oprot->writeString((*(this->dataMovementInterfaceId)));
+ xfer += oprot->writeFieldBegin("jobSubmissionPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->jobSubmissionPriorityMap)).size()));
+ std::map<std::string, int32_t> ::const_iterator _iter278;
+ for (_iter278 = (*(this->jobSubmissionPriorityMap)).begin(); _iter278 != (*(this->jobSubmissionPriorityMap)).end(); ++_iter278)
+ {
+ xfer += oprot->writeString(_iter278->first);
+ xfer += oprot->writeI32(_iter278->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -19159,7 +19389,7 @@ uint32_t Airavata_deleteDataMovementInterface_pargs::write(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_deleteDataMovementInterface_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeJobSubmissionPriorities_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19223,11 +19453,11 @@ uint32_t Airavata_deleteDataMovementInterface_result::read(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_deleteDataMovementInterface_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeJobSubmissionPriorities_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteDataMovementInterface_result");
+ xfer += oprot->writeStructBegin("Airavata_changeJobSubmissionPriorities_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -19251,7 +19481,7 @@ uint32_t Airavata_deleteDataMovementInterface_result::write(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_deleteDataMovementInterface_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeJobSubmissionPriorities_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19315,7 +19545,7 @@ uint32_t Airavata_deleteDataMovementInterface_presult::read(::apache::thrift::pr
return xfer;
}
-uint32_t Airavata_registerResourceJobManager_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeDataMovementPriorities_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19326,7 +19556,7 @@ uint32_t Airavata_registerResourceJobManager_args::read(::apache::thrift::protoc
using ::apache::thrift::protocol::TProtocolException;
- bool isset_resourceJobManager = false;
+ bool isset_dataMovementPriorityMap = false;
while (true)
{
@@ -19337,9 +19567,24 @@ uint32_t Airavata_registerResourceJobManager_args::read(::apache::thrift::protoc
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->resourceJobManager.read(iprot);
- isset_resourceJobManager = true;
+ if (ftype == ::apache::thrift::protocol::T_MAP) {
+ {
+ this->dataMovementPriorityMap.clear();
+ uint32_t _size279;
+ ::apache::thrift::protocol::TType _ktype280;
+ ::apache::thrift::protocol::TType _vtype281;
+ xfer += iprot->readMapBegin(_ktype280, _vtype281, _size279);
+ uint32_t _i283;
+ for (_i283 = 0; _i283 < _size279; ++_i283)
+ {
+ std::string _key284;
+ xfer += iprot->readString(_key284);
+ int32_t& _val285 = this->dataMovementPriorityMap[_key284];
+ xfer += iprot->readI32(_val285);
+ }
+ xfer += iprot->readMapEnd();
+ }
+ isset_dataMovementPriorityMap = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -19353,17 +19598,26 @@ uint32_t Airavata_registerResourceJobManager_args::read(::apache::thrift::protoc
xfer += iprot->readStructEnd();
- if (!isset_resourceJobManager)
+ if (!isset_dataMovementPriorityMap)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_registerResourceJobManager_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeDataMovementPriorities_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_registerResourceJobManager_args");
+ xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriorities_args");
- xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->resourceJobManager.write(oprot);
+ xfer += oprot->writeFieldBegin("dataMovementPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->dataMovementPriorityMap.size()));
+ std::map<std::string, int32_t> ::const_iterator _iter286;
+ for (_iter286 = this->dataMovementPriorityMap.begin(); _iter286 != this->dataMovementPriorityMap.end(); ++_iter286)
+ {
+ xfer += oprot->writeString(_iter286->first);
+ xfer += oprot->writeI32(_iter286->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -19371,12 +19625,21 @@ uint32_t Airavata_registerResourceJobManager_args::write(::apache::thrift::proto
return xfer;
}
-uint32_t Airavata_registerResourceJobManager_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeDataMovementPriorities_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_registerResourceJobManager_pargs");
+ xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriorities_pargs");
- xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += (*(this->resourceJobManager)).write(oprot);
+ xfer += oprot->writeFieldBegin("dataMovementPriorityMap", ::apache::thrift::protocol::T_MAP, 1);
+ {
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>((*(this->dataMovementPriorityMap)).size()));
+ std::map<std::string, int32_t> ::const_iterator _iter287;
+ for (_iter287 = (*(this->dataMovementPriorityMap)).begin(); _iter287 != (*(this->dataMovementPriorityMap)).end(); ++_iter287)
+ {
+ xfer += oprot->writeString(_iter287->first);
+ xfer += oprot->writeI32(_iter287->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -19384,7 +19647,7 @@ uint32_t Airavata_registerResourceJobManager_pargs::write(::apache::thrift::prot
return xfer;
}
-uint32_t Airavata_registerResourceJobManager_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeDataMovementPriorities_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19405,9 +19668,9 @@ uint32_t Airavata_registerResourceJobManager_result::read(::apache::thrift::prot
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->success);
- this->__isset.success = true;
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
+ this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -19448,15 +19711,15 @@ uint32_t Airavata_registerResourceJobManager_result::read(::apache::thrift::prot
return xfer;
}
-uint32_t Airavata_registerResourceJobManager_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_changeDataMovementPriorities_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_registerResourceJobManager_result");
+ xfer += oprot->writeStructBegin("Airavata_changeDataMovementPriorities_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
- xfer += oprot->writeString(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -19476,7 +19739,7 @@ uint32_t Airavata_registerResourceJobManager_result::write(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_registerResourceJobManager_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_changeDataMovementPriorities_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19497,8 +19760,8 @@ uint32_t Airavata_registerResourceJobManager_presult::read(::apache::thrift::pro
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -19540,7 +19803,7 @@ uint32_t Airavata_registerResourceJobManager_presult::read(::apache::thrift::pro
return xfer;
}
-uint32_t Airavata_updateResourceJobManager_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteJobSubmissionInterface_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19551,8 +19814,8 @@ uint32_t Airavata_updateResourceJobManager_args::read(::apache::thrift::protocol
using ::apache::thrift::protocol::TProtocolException;
- bool isset_resourceJobManagerId = false;
- bool isset_updatedResourceJobManager = false;
+ bool isset_computeResourceId = false;
+ bool isset_jobSubmissionInterfaceId = false;
while (true)
{
@@ -19564,16 +19827,16 @@ uint32_t Airavata_updateResourceJobManager_args::read(::apache::thrift::protocol
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->resourceJobManagerId);
- isset_resourceJobManagerId = true;
+ xfer += iprot->readString(this->computeResourceId);
+ isset_computeResourceId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 2:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->updatedResourceJobManager.read(iprot);
- isset_updatedResourceJobManager = true;
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->jobSubmissionInterfaceId);
+ isset_jobSubmissionInterfaceId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -19587,23 +19850,23 @@ uint32_t Airavata_updateResourceJobManager_args::read(::apache::thrift::protocol
xfer += iprot->readStructEnd();
- if (!isset_resourceJobManagerId)
+ if (!isset_computeResourceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_updatedResourceJobManager)
+ if (!isset_jobSubmissionInterfaceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_updateResourceJobManager_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteJobSubmissionInterface_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateResourceJobManager_args");
+ xfer += oprot->writeStructBegin("Airavata_deleteJobSubmissionInterface_args");
- xfer += oprot->writeFieldBegin("resourceJobManagerId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->resourceJobManagerId);
+ xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->computeResourceId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("updatedResourceJobManager", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->updatedResourceJobManager.write(oprot);
+ xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString(this->jobSubmissionInterfaceId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -19611,16 +19874,16 @@ uint32_t Airavata_updateResourceJobManager_args::write(::apache::thrift::protoco
return xfer;
}
-uint32_t Airavata_updateResourceJobManager_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteJobSubmissionInterface_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateResourceJobManager_pargs");
+ xfer += oprot->writeStructBegin("Airavata_deleteJobSubmissionInterface_pargs");
- xfer += oprot->writeFieldBegin("resourceJobManagerId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->resourceJobManagerId)));
+ xfer += oprot->writeFieldBegin("computeResourceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->computeResourceId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("updatedResourceJobManager", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += (*(this->updatedResourceJobManager)).write(oprot);
+ xfer += oprot->writeFieldBegin("jobSubmissionInterfaceId", ::apache::thrift::protocol::T_STRING, 2);
+ xfer += oprot->writeString((*(this->jobSubmissionInterfaceId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -19628,7 +19891,7 @@ uint32_t Airavata_updateResourceJobManager_pargs::write(::apache::thrift::protoc
return xfer;
}
-uint32_t Airavata_updateResourceJobManager_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteJobSubmissionInterface_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19692,11 +19955,11 @@ uint32_t Airavata_updateResourceJobManager_result::read(::apache::thrift::protoc
return xfer;
}
-uint32_t Airavata_updateResourceJobManager_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteJobSubmissionInterface_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateResourceJobManager_result");
+ xfer += oprot->writeStructBegin("Airavata_deleteJobSubmissionInterface_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -19720,7 +19983,7 @@ uint32_t Airavata_updateResourceJobManager_result::write(::apache::thrift::proto
return xfer;
}
-uint32_t Airavata_updateResourceJobManager_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteJobSubmissionInterface_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19784,7 +20047,7 @@ uint32_t Airavata_updateResourceJobManager_presult::read(::apache::thrift::proto
return xfer;
}
-uint32_t Airavata_getResourceJobManager_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteDataMovementInterface_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19795,7 +20058,8 @@ uint32_t Airavata_getResourceJobManager_args::read(::apache::thrift::protocol::T
using ::apache::thrift::protocol::TProtocolException;
- bool isset_resourceJobManagerId = false;
+ bool isset_computeResourceId = false;
+ bool isset_dataMovementInterfaceId = false;
while (true)
{
@@ -19807,8 +20071,16 @@ uint32_t Airavata_getResourceJobManager_args::read(::apache::thrift::protocol::T
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->resourceJobManagerId);
- isset_resourceJobManagerId = true;
+ 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 {
xfer += iprot->skip(ftype);
}
@@ -19822,17 +20094,23 @@ uint32_t Airavata_getResourceJobManager_args::read(::apache::thrift::protocol::T
xfer += iprot->readStructEnd();
- if (!isset_resourceJobManagerId)
+ if (!isset_computeResourceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
+ if (!isset_dataMovementInterfaceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_getResourceJobManager_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteDataMovementInterface_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getResourceJobManager_args");
+ xfer += oprot->writeStructBegin("Airavata_deleteDataMovementInterface_args");
- xfer += oprot->writeFieldBegin("resourceJobManagerId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->resourceJobManagerId);
+ 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();
xfer += oprot->writeFieldStop();
@@ -19840,12 +20118,16 @@ uint32_t Airavata_getResourceJobManager_args::write(::apache::thrift::protocol::
return xfer;
}
-uint32_t Airavata_getResourceJobManager_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteDataMovementInterface_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getResourceJobManager_pargs");
+ xfer += oprot->writeStructBegin("Airavata_deleteDataMovementInterface_pargs");
- xfer += oprot->writeFieldBegin("resourceJobManagerId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->resourceJobManagerId)));
+ 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();
xfer += oprot->writeFieldStop();
@@ -19853,7 +20135,7 @@ uint32_t Airavata_getResourceJobManager_pargs::write(::apache::thrift::protocol:
return xfer;
}
-uint32_t Airavata_getResourceJobManager_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteDataMovementInterface_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19874,8 +20156,8 @@ uint32_t Airavata_getResourceJobManager_result::read(::apache::thrift::protocol:
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->success.read(iprot);
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -19917,15 +20199,15 @@ uint32_t Airavata_getResourceJobManager_result::read(::apache::thrift::protocol:
return xfer;
}
-uint32_t Airavata_getResourceJobManager_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteDataMovementInterface_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getResourceJobManager_result");
+ xfer += oprot->writeStructBegin("Airavata_deleteDataMovementInterface_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
- xfer += this->success.write(oprot);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
+ xfer += oprot->writeBool(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -19945,7 +20227,7 @@ uint32_t Airavata_getResourceJobManager_result::write(::apache::thrift::protocol
return xfer;
}
-uint32_t Airavata_getResourceJobManager_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteDataMovementInterface_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -19966,8 +20248,8 @@ uint32_t Airavata_getResourceJobManager_presult::read(::apache::thrift::protocol
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += (*(this->success)).read(iprot);
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -20009,7 +20291,7 @@ uint32_t Airavata_getResourceJobManager_presult::read(::apache::thrift::protocol
return xfer;
}
-uint32_t Airavata_deleteResourceJobManager_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_registerResourceJobManager_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -20020,7 +20302,7 @@ uint32_t Airavata_deleteResourceJobManager_args::read(::apache::thrift::protocol
using ::apache::thrift::protocol::TProtocolException;
- bool isset_resourceJobManagerId = false;
+ bool isset_resourceJobManager = false;
while (true)
{
@@ -20031,9 +20313,9 @@ uint32_t Airavata_deleteResourceJobManager_args::read(::apache::thrift::protocol
switch (fid)
{
case 1:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->resourceJobManagerId);
- isset_resourceJobManagerId = true;
+ if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+ xfer += this->resourceJobManager.read(iprot);
+ isset_resourceJobManager = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -20047,17 +20329,17 @@ uint32_t Airavata_deleteResourceJobManager_args::read(::apache::thrift::protocol
xfer += iprot->readStructEnd();
- if (!isset_resourceJobManagerId)
+ if (!isset_resourceJobManager)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_deleteResourceJobManager_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_registerResourceJobManager_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteResourceJobManager_args");
+ xfer += oprot->writeStructBegin("Airavata_registerResourceJobManager_args");
- xfer += oprot->writeFieldBegin("resourceJobManagerId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->resourceJobManagerId);
+ xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->resourceJobManager.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -20065,12 +20347,12 @@ uint32_t Airavata_deleteResourceJobManager_args::write(::apache::thrift::protoco
return xfer;
}
-uint32_t Airavata_deleteResourceJobManager_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_registerResourceJobManager_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteResourceJobManager_pargs");
+ xfer += oprot->writeStructBegin("Airavata_registerResourceJobManager_pargs");
- xfer += oprot->writeFieldBegin("resourceJobManagerId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString((*(this->resourceJobManagerId)));
+ xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += (*(this->resourceJobManager)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -20078,7 +20360,7 @@ uint32_t Airavata_deleteResourceJobManager_pargs::write(::apache::thrift::protoc
return xfer;
}
-uint32_t Airavata_deleteResourceJobManager_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_registerResourceJobManager_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -20099,8 +20381,8 @@ uint32_t Airavata_deleteResourceJobManager_result::read(::apache::thrift::protoc
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->success);
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->success);
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -20142,15 +20424,15 @@ uint32_t Airavata_deleteResourceJobManager_result::read(::apache::thrift::protoc
return xfer;
}
-uint32_t Airavata_deleteResourceJobManager_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_registerResourceJobManager_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteResourceJobManager_result");
+ xfer += oprot->writeStructBegin("Airavata_registerResourceJobManager_result");
if (this->__isset.success) {
- xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
- xfer += oprot->writeBool(this->success);
+ xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
+ xfer += oprot->writeString(this->success);
xfer += oprot->writeFieldEnd();
} else if (this->__isset.ire) {
xfer += oprot->writeFieldBegin("ire", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -20170,7 +20452,7 @@ uint32_t Airavata_deleteResourceJobManager_result::write(::apache::thrift::proto
return xfer;
}
-uint32_t Airavata_deleteResourceJobManager_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_registerResourceJobManager_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -20191,8 +20473,8 @@ uint32_t Airavata_deleteResourceJobManager_presult::read(::apache::thrift::proto
switch (fid)
{
case 0:
- if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool((*(this->success)));
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString((*(this->success)));
this->__isset.success = true;
} else {
xfer += iprot->skip(ftype);
@@ -20234,7 +20516,7 @@ uint32_t Airavata_deleteResourceJobManager_presult::read(::apache::thrift::proto
return xfer;
}
-uint32_t Airavata_deleteBatchQueue_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateResourceJobManager_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
<TRUNCATED>