You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/11/18 01:57:55 UTC
[1/8] airavata git commit: adding data storage interfaces
Repository: airavata
Updated Branches:
refs/heads/develop c116140c8 -> 13b50f7a5
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageResource.java
index 51f0ec9..67469a2 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageResource.java
@@ -31,13 +31,10 @@ import java.sql.Timestamp;
@Entity
@Table(name = "STORAGE_RESOURCE")
public class StorageResource implements Serializable {
-
- @Column(name = "RESOURCE_DESCRIPTION")
- private String resourceDescription;
-
- @Id
- @Column(name = "RESOURCE_ID")
- private String resourceId;
+
+ @Id
+ @Column(name = "STORAGE_RESOURCE_ID")
+ private String storageResourceId;
@Column(name = "HOST_NAME")
private String hostName;
@@ -51,6 +48,9 @@ public class StorageResource implements Serializable {
@Column(name = "ENABLED")
private boolean enabled;
+ @Column(name = "DESCRIPTION")
+ private String description;
+
public Timestamp getCreationTime() {
return creationTime;
}
@@ -67,15 +67,31 @@ public class StorageResource implements Serializable {
this.updateTime = updateTime;
}
- public String getResourceDescription() {
- return resourceDescription;
- }
-
- public String getResourceId() {
- return resourceId;
- }
-
- public String getHostName() {
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getHostName() {
return hostName;
}
@@ -87,14 +103,6 @@ public class StorageResource implements Serializable {
this.enabled = enabled;
}
- public void setResourceDescription(String resourceDescription) {
- this.resourceDescription=resourceDescription;
- }
-
- public void setResourceId(String resourceId) {
- this.resourceId=resourceId;
- }
-
public void setHostName(String hostName) {
this.hostName=hostName;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
index 926bfae..3402afd 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/AppCatAbstractResource.java
@@ -25,6 +25,7 @@ public abstract class AppCatAbstractResource implements AppCatalogResource {
// table names
public static final String COMPUTE_RESOURCE = "ComputeResource";
public static final String STORAGE_RESOURCE = "StorageResource";
+ public static final String STORAGE_INTERFACE = "StorageInterface";
public static final String HOST_ALIAS = "HostAlias";
public static final String HOST_IPADDRESS = "HostIPAddress";
public static final String GSISSH_SUBMISSION = "GSISSHSubmission";
@@ -54,7 +55,7 @@ public abstract class AppCatAbstractResource implements AppCatalogResource {
public static final String WORKFLOW_OUTPUT = "WorkflowOutput";
public static final String GATEWAY_PROFILE = "GatewayProfile";
public static final String COMPUTE_RESOURCE_PREFERENCE = "ComputeResourcePreference";
- public static final String DATA_STORAGE_PREFERENCE = "DataStoragePreference";
+ public static final String STORAGE_PREFERENCE = "StoragePreference";
public static final String BATCH_QUEUE = "BatchQueue";
public static final String COMPUTE_RESOURCE_FILE_SYSTEM = "ComputeResourceFileSystem";
public static final String JOB_SUBMISSION_INTERFACE = "JobSubmissionInterface";
@@ -80,12 +81,7 @@ public abstract class AppCatAbstractResource implements AppCatalogResource {
public static final String HOST_NAME = "hostName";
}
- // Storage Resource Table
- public final class StorageResourceConstants {
- public static final String RESOURCE_DESCRIPTION = "resourceDescription";
- public static final String RESOURCE_ID = "resourceId";
- public static final String HOST_NAME = "hostName";
- }
+
// Host Alias Table
public final class HostAliasConstants {
@@ -293,11 +289,6 @@ public abstract class AppCatAbstractResource implements AppCatalogResource {
public static final String ALLOCATION_PROJECT_NUMBER = "projectNumber";
}
- public final class DataStoragePreferenceConstants {
- public static final String GATEWAY_ID = "gatewayId";
- public static final String DATA_MOVEMENT_ID = "dataMovementId";
- }
-
// Batch Queue Table
public final class BatchQueueConstants {
public static final String COMPUTE_RESOURCE_ID = "computeResourceId";
@@ -331,6 +322,24 @@ public abstract class AppCatAbstractResource implements AppCatalogResource {
public static final String DATA_MOVEMENT_INTERFACE_ID = "dataMovementInterfaceId";
public static final String PRIORITY_ORDER = "priorityOrder";
}
+
+ // Storage Resource Table
+ public final class StorageResourceConstants {
+ public static final String RESOURCE_DESCRIPTION = "resourceDescription";
+ public static final String RESOURCE_ID = "resourceId";
+ public static final String HOST_NAME = "hostName";
+ }
+
+ public final class StoragePreferenceConstants {
+ public static final String GATEWAY_ID = "gatewayId";
+ public static final String STORAGE_ID = "storageResourceId";
+ }
+
+ public final class StorageInterfaceConstants {
+ public static final String STORAGE_RESOURCE_ID = "storageResourceId";
+ public static final String DATA_MOVEMENT_PROTOCOL = "dataMovementProtocol";
+ public static final String DATA_MOVEMENT_ID = "dataMovementInterfaceId";
+ }
// Resource Job Manager Table
public final class ResourceJobManagerConstants {
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/DataStoragePreferenceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/DataStoragePreferenceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/DataStoragePreferenceResource.java
deleted file mode 100644
index 482589d..0000000
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/DataStoragePreferenceResource.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- *
- * 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.registry.core.app.catalog.resources;
-
-import org.apache.airavata.common.exception.ApplicationSettingsException;
-import org.apache.airavata.registry.core.app.catalog.model.*;
-import org.apache.airavata.registry.core.app.catalog.util.AppCatalogJPAUtils;
-import org.apache.airavata.registry.core.app.catalog.util.AppCatalogQueryGenerator;
-import org.apache.airavata.registry.core.app.catalog.util.AppCatalogResourceType;
-import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class DataStoragePreferenceResource extends AppCatAbstractResource {
- private final static Logger logger = LoggerFactory.getLogger(DataStoragePreferenceResource.class);
- private String gatewayId;
- private String dataMoveId;
- private String loginUserName;
- private String fsRootLocation;
- private String resourceCSToken;
-
- private GatewayProfileResource gatewayProfile;
-
- public String getLoginUserName() {
- return loginUserName;
- }
-
- public void setLoginUserName(String loginUserName) {
- this.loginUserName = loginUserName;
- }
-
- public String getGatewayId() {
- return gatewayId;
- }
-
- public void setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- }
-
- public GatewayProfileResource getGatewayProfile() {
- return gatewayProfile;
- }
-
- public void setGatewayProfile(GatewayProfileResource gatewayProfile) {
- this.gatewayProfile = gatewayProfile;
- }
-
- public String getResourceCSToken() {
- return resourceCSToken;
- }
-
- public void setResourceCSToken(String resourceCSToken) {
- this.resourceCSToken = resourceCSToken;
- }
-
- public String getDataMoveId() {
- return dataMoveId;
- }
-
- public void setDataMoveId(String dataMoveId) {
- this.dataMoveId = dataMoveId;
- }
-
- public String getFsRootLocation() {
- return fsRootLocation;
- }
-
- public void setFsRootLocation(String fsRootLocation) {
- this.fsRootLocation = fsRootLocation;
- }
-
- @Override
- public void remove(Object identifier) throws AppCatalogException {
- HashMap<String, String> ids;
- if (identifier instanceof Map) {
- ids = (HashMap) identifier;
- } else {
- logger.error("Identifier should be a map with the field name and it's value");
- throw new AppCatalogException("Identifier should be a map with the field name and it's value");
- }
-
- EntityManager em = null;
- try {
- em = AppCatalogJPAUtils.getEntityManager();
- em.getTransaction().begin();
- AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_STORAGE_PREFERENCE);
- generator.setParameter(DataStoragePreferenceConstants.DATA_MOVEMENT_ID, ids.get(DataStoragePreferenceConstants.DATA_MOVEMENT_ID));
- generator.setParameter(DataStoragePreferenceConstants.GATEWAY_ID, ids.get(DataStoragePreferenceConstants.GATEWAY_ID));
-
- 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();
- }
- }
- }
-
- @Override
- public AppCatalogResource get(Object identifier) throws AppCatalogException {
- HashMap<String, String> ids;
- if (identifier instanceof Map) {
- ids = (HashMap) identifier;
- } else {
- logger.error("Identifier should be a map with the field name and it's value");
- throw new AppCatalogException("Identifier should be a map with the field name and it's value");
- }
-
- EntityManager em = null;
- try {
- em = AppCatalogJPAUtils.getEntityManager();
- em.getTransaction().begin();
- AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_STORAGE_PREFERENCE);
- generator.setParameter(DataStoragePreferenceConstants.GATEWAY_ID, ids.get(DataStoragePreferenceConstants.GATEWAY_ID));
- generator.setParameter(DataStoragePreferenceConstants.DATA_MOVEMENT_ID, ids.get(DataStoragePreferenceConstants.DATA_MOVEMENT_ID));
- Query q = generator.selectQuery(em);
- DataStoragePreference preference = (DataStoragePreference) q.getSingleResult();
- DataStoragePreferenceResource preferenceResource =
- (DataStoragePreferenceResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.DATA_STORAGE_PREFERENCE, preference);
- em.getTransaction().commit();
- em.close();
- return preferenceResource;
- } 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();
- }
- }
- }
-
- @Override
- public List<AppCatalogResource> get(String fieldName, Object value) throws AppCatalogException {
- List<AppCatalogResource> preferenceResourceList = new ArrayList<AppCatalogResource>();
- EntityManager em = null;
- try {
- em = AppCatalogJPAUtils.getEntityManager();
- em.getTransaction().begin();
- Query q;
- AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_STORAGE_PREFERENCE);
- List results;
- if (fieldName.equals(DataStoragePreferenceConstants.DATA_MOVEMENT_ID)) {
- generator.setParameter(DataStoragePreferenceConstants.DATA_MOVEMENT_ID, value);
- q = generator.selectQuery(em);
- results = q.getResultList();
- if (results.size() != 0) {
- for (Object result : results) {
- DataStoragePreference preference = (DataStoragePreference) result;
- if (preference.getDataMovementID()!=null) {
- DataStoragePreferenceResource preferenceResource = (DataStoragePreferenceResource) AppCatalogJPAUtils
- .getResource(
- AppCatalogResourceType.DATA_STORAGE_PREFERENCE,
- preference);
- preferenceResourceList.add(preferenceResource);
- }
- }
- }
- } else if (fieldName.equals(DataStoragePreferenceConstants.GATEWAY_ID)) {
- generator.setParameter(DataStoragePreferenceConstants.GATEWAY_ID, value);
- q = generator.selectQuery(em);
- results = q.getResultList();
- if (results.size() != 0) {
- for (Object result : results) {
- DataStoragePreference preference = (DataStoragePreference) result;
- if (preference.getDataMovementID()!=null) {
- DataStoragePreferenceResource preferenceResource =
- (DataStoragePreferenceResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.DATA_STORAGE_PREFERENCE, preference);
- preferenceResourceList.add(preferenceResource);
- }
- }
- }
- } else {
- em.getTransaction().commit();
- em.close();
- logger.error("Unsupported field name for data storage preference Resource.", new IllegalArgumentException());
- throw new IllegalArgumentException("Unsupported field name for data storage preference 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 preferenceResourceList;
- }
-
- @Override
- public List<AppCatalogResource> getAll() throws AppCatalogException {
- return null;
- }
-
- @Override
- public List<String> getAllIds() throws AppCatalogException {
- return null;
- }
-
- @Override
- public List<String> getIds(String fieldName, Object value) throws AppCatalogException {
- logger.error("Unsupported for objects with a composite identifier");
- throw new AppCatalogException("Unsupported for objects with a composite identifier");
- }
-
- @Override
- public void save() throws AppCatalogException {
- EntityManager em = null;
- try {
- em = AppCatalogJPAUtils.getEntityManager();
- DataStoragePreference existingPreference = em.find(DataStoragePreference.class, new DataStoragePreferencePK(gatewayId, dataMoveId));
- em.close();
-
- em = AppCatalogJPAUtils.getEntityManager();
- em.getTransaction().begin();
- DataMovementInterface dataMovementInterface = em.find(DataMovementInterface.class, dataMoveId);
- GatewayProfile gatewayProf = em.find(GatewayProfile.class, gatewayId);
- if (existingPreference != null) {
- existingPreference.setDataMovementID(dataMoveId);
- existingPreference.setGatewayId(gatewayId);
- existingPreference.setGatewayProfile(gatewayProf);
- existingPreference.setLoginUserName(loginUserName);
- existingPreference.setComputeResourceCSToken(resourceCSToken);
- existingPreference.setFsRootLocation(fsRootLocation);
- em.merge(existingPreference);
- } else {
- DataStoragePreference resourcePreference = new DataStoragePreference();
- resourcePreference.setDataMovementID(dataMoveId);
- resourcePreference.setGatewayId(gatewayId);
- resourcePreference.setGatewayProfile(gatewayProf);
- resourcePreference.setLoginUserName(loginUserName);
- resourcePreference.setComputeResourceCSToken(resourceCSToken);
- resourcePreference.setFsRootLocation(fsRootLocation);
- em.persist(resourcePreference);
- }
- 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();
- }
- }
- }
-
- @Override
- public boolean isExists(Object identifier) throws AppCatalogException {
- HashMap<String, String> ids;
- if (identifier instanceof Map) {
- ids = (HashMap) identifier;
- } else {
- logger.error("Identifier should be a map with the field name and it's value");
- throw new AppCatalogException("Identifier should be a map with the field name and it's value");
- }
-
- EntityManager em = null;
- try {
- em = AppCatalogJPAUtils.getEntityManager();
- DataStoragePreference existingPreference = em.find(DataStoragePreference.class,
- new DataStoragePreferencePK(ids.get(DataStoragePreferenceConstants.GATEWAY_ID),
- ids.get(DataStoragePreferenceConstants.DATA_MOVEMENT_ID)));
- em.close();
- return existingPreference != null;
- }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();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java
new file mode 100644
index 0000000..20ece9e
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageInterfaceResource.java
@@ -0,0 +1,326 @@
+/*
+ *
+ * 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.registry.core.app.catalog.resources;
+
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.AiravataUtils;
+import org.apache.airavata.registry.core.app.catalog.model.*;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogJPAUtils;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogQueryGenerator;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogResourceType;
+import org.apache.airavata.registry.cpi.AppCatalogException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class StorageInterfaceResource extends AppCatAbstractResource {
+ private final static Logger logger = LoggerFactory.getLogger(StorageInterfaceResource.class);
+ private String storageResourceId;
+ private StorageResourceResource storageResourceResource;
+ private String dataMovementProtocol;
+ private String dataMovementInterfaceId;
+ private Timestamp createdTime;
+ private Timestamp updatedTime;
+
+ public Timestamp getCreatedTime() {
+ return createdTime;
+ }
+
+ public void setCreatedTime(Timestamp createdTime) {
+ this.createdTime = createdTime;
+ }
+
+ public Timestamp getUpdatedTime() {
+ return updatedTime;
+ }
+
+ public void setUpdatedTime(Timestamp updatedTime) {
+ this.updatedTime = updatedTime;
+ }
+
+ @Override
+ public void remove(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap<String, String>) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_MOVEMENT_INTERFACE);
+ generator.setParameter(StorageInterfaceConstants.STORAGE_RESOURCE_ID, ids.get(StorageInterfaceConstants.STORAGE_RESOURCE_ID));
+ generator.setParameter(StorageInterfaceConstants.DATA_MOVEMENT_ID, ids.get(StorageInterfaceConstants.DATA_MOVEMENT_ID));
+ 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();
+ }
+ }
+ }
+
+ @Override
+ public AppCatalogResource get(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap<String, String>) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(DATA_MOVEMENT_INTERFACE);
+ generator.setParameter(StorageInterfaceConstants.STORAGE_RESOURCE_ID, ids.get(StorageInterfaceConstants.STORAGE_RESOURCE_ID));
+ generator.setParameter(StorageInterfaceConstants.DATA_MOVEMENT_ID, ids.get(StorageInterfaceConstants.DATA_MOVEMENT_ID));
+ Query q = generator.selectQuery(em);
+ StorageInterface storageInterface = (StorageInterface) q.getSingleResult();
+ StorageInterfaceResource storageInterfaceResource = (StorageInterfaceResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.STORAGE_INTERFACE, storageInterface);
+ em.getTransaction().commit();
+ em.close();
+ return storageInterfaceResource;
+ } 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();
+ }
+ }
+ }
+
+ @Override
+ public List<AppCatalogResource> get(String fieldName, Object value) throws AppCatalogException {
+ List<AppCatalogResource> storageInterfaceResources = new ArrayList<AppCatalogResource>();
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(STORAGE_INTERFACE);
+ Query q;
+ if ((fieldName.equals(StorageInterfaceConstants.STORAGE_RESOURCE_ID)) || (fieldName.equals(StorageInterfaceConstants.DATA_MOVEMENT_PROTOCOL)) || (fieldName.equals(StorageInterfaceConstants.DATA_MOVEMENT_ID))) {
+ generator.setParameter(fieldName, value);
+ q = generator.selectQuery(em);
+ List<?> results = q.getResultList();
+ for (Object result : results) {
+ StorageInterface storageInterface = (StorageInterface) result;
+ StorageInterfaceResource storageInterfaceResource = (StorageInterfaceResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.STORAGE_INTERFACE, storageInterface);
+ storageInterfaceResources.add(storageInterfaceResource);
+ }
+ } else {
+ em.getTransaction().commit();
+ em.close();
+ logger.error("Unsupported field name for Data Movement Interface Resource.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Unsupported field name for Data Movement Interface Resource.");
+ }
+ 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();
+ }
+ }
+ return storageInterfaceResources;
+ }
+
+ @Override
+ public List<AppCatalogResource> getAll() throws AppCatalogException {
+ return null;
+ }
+
+ @Override
+ public List<String> getAllIds() throws AppCatalogException {
+ return null;
+ }
+
+ @Override
+ public List<String> getIds(String fieldName, Object value) throws AppCatalogException {
+ List<String> storageInterfaceResourceIDs = new ArrayList<String>();
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(STORAGE_INTERFACE);
+ Query q;
+ if ((fieldName.equals(StorageInterfaceConstants.STORAGE_RESOURCE_ID)) || (fieldName.equals(StorageInterfaceConstants.DATA_MOVEMENT_PROTOCOL)) || (fieldName.equals(StorageInterfaceConstants.DATA_MOVEMENT_ID))) {
+ generator.setParameter(fieldName, value);
+ q = generator.selectQuery(em);
+ List<?> results = q.getResultList();
+ for (Object result : results) {
+ StorageInterface storageInterface = (StorageInterface) result;
+ StorageInterfaceResource storageInterfaceResource = (StorageInterfaceResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.STORAGE_INTERFACE, storageInterface);
+ storageInterfaceResourceIDs.add(storageInterfaceResource.getStorageResourceId());
+ }
+ } else {
+ em.getTransaction().commit();
+ em.close();
+ logger.error("Unsupported field name for Storage Interface Resource.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Unsupported field name for Storage Interface Resource.");
+ }
+ 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();
+ }
+ }
+ return storageInterfaceResourceIDs;
+ }
+
+ @Override
+ public void save() throws AppCatalogException {
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ StorageInterface existingStorageInterface = em.find(StorageInterface.class, new StorageInterface_PK(storageResourceId, dataMovementInterfaceId));
+ em.close();
+ StorageInterface storageInterface;
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ if (existingStorageInterface == null) {
+ storageInterface = new StorageInterface();
+ storageInterface.setCreationTime(AiravataUtils.getCurrentTimestamp());
+ } else {
+ storageInterface = existingStorageInterface;
+ storageInterface.setUpdateTime(AiravataUtils.getCurrentTimestamp());
+ }
+ storageInterface.setStorageResourceId(getStorageResourceId());
+ StorageResource storageResource = em.find(StorageResource.class, getStorageResourceId());
+ storageInterface.setStorageResource(storageResource);
+ storageInterface.setDataMovementProtocol(getDataMovementProtocol());
+ storageInterface.setDataMovementInterfaceId(getDataMovementInterfaceId());
+ if (existingStorageInterface == null) {
+ em.persist(storageInterface);
+ } else {
+ em.merge(storageInterface);
+ }
+ 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();
+ }
+ }
+ }
+
+ @Override
+ public boolean isExists(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap<String, String>) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ StorageInterface storageInterface = em.find(StorageInterface.class, new StorageInterface_PK(ids.get(StorageInterfaceConstants.STORAGE_RESOURCE_ID), ids.get(StorageInterfaceConstants.DATA_MOVEMENT_ID)));
+ em.close();
+ return storageInterface != 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 getDataMovementProtocol() {
+ return dataMovementProtocol;
+ }
+
+ public String getDataMovementInterfaceId() {
+ return dataMovementInterfaceId;
+ }
+
+ public void setDataMovementProtocol(String dataMovementProtocol) {
+ this.dataMovementProtocol=dataMovementProtocol;
+ }
+
+ public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
+ this.dataMovementInterfaceId=dataMovementInterfaceId;
+ }
+
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ public StorageResourceResource getStorageResourceResource() {
+ return storageResourceResource;
+ }
+
+ public void setStorageResourceResource(StorageResourceResource storageResourceResource) {
+ this.storageResourceResource = storageResourceResource;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StoragePreferenceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StoragePreferenceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StoragePreferenceResource.java
new file mode 100644
index 0000000..ae32eca
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StoragePreferenceResource.java
@@ -0,0 +1,322 @@
+/*
+ *
+ * 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.registry.core.app.catalog.resources;
+
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.registry.core.app.catalog.model.*;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogJPAUtils;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogQueryGenerator;
+import org.apache.airavata.registry.core.app.catalog.util.AppCatalogResourceType;
+import org.apache.airavata.registry.cpi.AppCatalogException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class StoragePreferenceResource extends AppCatAbstractResource {
+ private final static Logger logger = LoggerFactory.getLogger(StoragePreferenceResource.class);
+ private String gatewayId;
+ private String storageResourceId;
+ private String loginUserName;
+ private String fsRootLocation;
+ private String resourceCSToken;
+
+ private GatewayProfileResource gatewayProfile;
+
+ public String getLoginUserName() {
+ return loginUserName;
+ }
+
+ public void setLoginUserName(String loginUserName) {
+ this.loginUserName = loginUserName;
+ }
+
+ public String getGatewayId() {
+ return gatewayId;
+ }
+
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
+ }
+
+ public GatewayProfileResource getGatewayProfile() {
+ return gatewayProfile;
+ }
+
+ public void setGatewayProfile(GatewayProfileResource gatewayProfile) {
+ this.gatewayProfile = gatewayProfile;
+ }
+
+ public String getResourceCSToken() {
+ return resourceCSToken;
+ }
+
+ public void setResourceCSToken(String resourceCSToken) {
+ this.resourceCSToken = resourceCSToken;
+ }
+
+ public String getFsRootLocation() {
+ return fsRootLocation;
+ }
+
+ public void setFsRootLocation(String fsRootLocation) {
+ this.fsRootLocation = fsRootLocation;
+ }
+
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ @Override
+ public void remove(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(STORAGE_PREFERENCE);
+ generator.setParameter(StoragePreferenceConstants.STORAGE_ID, ids.get(StoragePreferenceConstants.STORAGE_ID));
+ generator.setParameter(StoragePreferenceConstants.GATEWAY_ID, ids.get(StoragePreferenceConstants.GATEWAY_ID));
+
+ 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();
+ }
+ }
+ }
+
+ @Override
+ public AppCatalogResource get(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(STORAGE_PREFERENCE);
+ generator.setParameter(StoragePreferenceConstants.GATEWAY_ID, ids.get(StoragePreferenceConstants.GATEWAY_ID));
+ generator.setParameter(StoragePreferenceConstants.STORAGE_ID, ids.get(StoragePreferenceConstants.STORAGE_ID));
+ Query q = generator.selectQuery(em);
+ StoragePreference preference = (StoragePreference) q.getSingleResult();
+ StoragePreferenceResource preferenceResource =
+ (StoragePreferenceResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.STORAGE_PREFERENCE, preference);
+ em.getTransaction().commit();
+ em.close();
+ return preferenceResource;
+ } 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();
+ }
+ }
+ }
+
+ @Override
+ public List<AppCatalogResource> get(String fieldName, Object value) throws AppCatalogException {
+ List<AppCatalogResource> preferenceResourceList = new ArrayList<AppCatalogResource>();
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ Query q;
+ AppCatalogQueryGenerator generator = new AppCatalogQueryGenerator(STORAGE_PREFERENCE);
+ List results;
+ if (fieldName.equals(StoragePreferenceConstants.STORAGE_ID)) {
+ generator.setParameter(StoragePreferenceConstants.STORAGE_ID, value);
+ q = generator.selectQuery(em);
+ results = q.getResultList();
+ if (results.size() != 0) {
+ for (Object result : results) {
+ StoragePreference preference = (StoragePreference) result;
+ if (preference.getStorageResourceId()!=null) {
+ StoragePreferenceResource preferenceResource = (StoragePreferenceResource) AppCatalogJPAUtils
+ .getResource(
+ AppCatalogResourceType.STORAGE_PREFERENCE,
+ preference);
+ preferenceResourceList.add(preferenceResource);
+ }
+ }
+ }
+ } else if (fieldName.equals(StoragePreferenceConstants.GATEWAY_ID)) {
+ generator.setParameter(StoragePreferenceConstants.GATEWAY_ID, value);
+ q = generator.selectQuery(em);
+ results = q.getResultList();
+ if (results.size() != 0) {
+ for (Object result : results) {
+ StoragePreference preference = (StoragePreference) result;
+ if (preference.getStorageResourceId()!=null) {
+ StoragePreferenceResource preferenceResource =
+ (StoragePreferenceResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.STORAGE_PREFERENCE, preference);
+ preferenceResourceList.add(preferenceResource);
+ }
+ }
+ }
+ } else {
+ em.getTransaction().commit();
+ em.close();
+ logger.error("Unsupported field name for data storage preference Resource.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Unsupported field name for data storage preference 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 preferenceResourceList;
+ }
+
+ @Override
+ public List<AppCatalogResource> getAll() throws AppCatalogException {
+ return null;
+ }
+
+ @Override
+ public List<String> getAllIds() throws AppCatalogException {
+ return null;
+ }
+
+ @Override
+ public List<String> getIds(String fieldName, Object value) throws AppCatalogException {
+ logger.error("Unsupported for objects with a composite identifier");
+ throw new AppCatalogException("Unsupported for objects with a composite identifier");
+ }
+
+ @Override
+ public void save() throws AppCatalogException {
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ StoragePreference existingPreference = em.find(StoragePreference.class, new StoragePreferencePK(gatewayId, storageResourceId));
+ em.close();
+
+ em = AppCatalogJPAUtils.getEntityManager();
+ em.getTransaction().begin();
+ GatewayProfile gatewayProf = em.find(GatewayProfile.class, gatewayId);
+ if (existingPreference != null) {
+ existingPreference.setStorageResourceId(storageResourceId);
+ existingPreference.setGatewayId(gatewayId);
+ existingPreference.setGatewayProfile(gatewayProf);
+ existingPreference.setLoginUserName(loginUserName);
+ existingPreference.setComputeResourceCSToken(resourceCSToken);
+ existingPreference.setFsRootLocation(fsRootLocation);
+ em.merge(existingPreference);
+ } else {
+ StoragePreference resourcePreference = new StoragePreference();
+ resourcePreference.setStorageResourceId(storageResourceId);
+ resourcePreference.setGatewayId(gatewayId);
+ resourcePreference.setGatewayProfile(gatewayProf);
+ resourcePreference.setLoginUserName(loginUserName);
+ resourcePreference.setComputeResourceCSToken(resourceCSToken);
+ resourcePreference.setFsRootLocation(fsRootLocation);
+ em.persist(resourcePreference);
+ }
+ 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();
+ }
+ }
+ }
+
+ @Override
+ public boolean isExists(Object identifier) throws AppCatalogException {
+ HashMap<String, String> ids;
+ if (identifier instanceof Map) {
+ ids = (HashMap) identifier;
+ } else {
+ logger.error("Identifier should be a map with the field name and it's value");
+ throw new AppCatalogException("Identifier should be a map with the field name and it's value");
+ }
+
+ EntityManager em = null;
+ try {
+ em = AppCatalogJPAUtils.getEntityManager();
+ StoragePreference existingPreference = em.find(StoragePreference.class,
+ new StoragePreferencePK(ids.get(StoragePreferenceConstants.GATEWAY_ID),
+ ids.get(StoragePreferenceConstants.STORAGE_ID)));
+ em.close();
+ return existingPreference != null;
+ }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();
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageResourceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageResourceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageResourceResource.java
index 868c5ab..1d7039a 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageResourceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/StorageResourceResource.java
@@ -40,7 +40,7 @@ import java.util.List;
public class StorageResourceResource extends AppCatAbstractResource {
private final static Logger logger = LoggerFactory.getLogger(StorageResourceResource.class);
private String resourceDescription;
- private String resourceId;
+ private String storageResourceId;
private String hostName;
private Timestamp createdTime;
private Timestamp updatedTime;
@@ -204,7 +204,7 @@ public class StorageResourceResource extends AppCatAbstractResource {
List<?> results = q.getResultList();
for (Object result : results) {
StorageResource storageResource = (StorageResource) result;
- storageResourceResources.add(storageResource.getResourceId());
+ storageResourceResources.add(storageResource.getStorageResourceId());
}
em.getTransaction().commit();
em.close();
@@ -238,7 +238,7 @@ public class StorageResourceResource extends AppCatAbstractResource {
for (Object result : results) {
StorageResource storageResource = (StorageResource) result;
StorageResourceResource storageResourceResource = (StorageResourceResource) AppCatalogJPAUtils.getResource(AppCatalogResourceType.STORAGE_RESOURCE, storageResource);
- storageResourceResourceIDs.add(storageResourceResource.getResourceId());
+ storageResourceResourceIDs.add(storageResourceResource.getStorageResourceId());
}
} else {
em.getTransaction().commit();
@@ -267,7 +267,7 @@ public class StorageResourceResource extends AppCatAbstractResource {
EntityManager em = null;
try {
em = AppCatalogJPAUtils.getEntityManager();
- StorageResource existingStorageResource = em.find(StorageResource.class, resourceId);
+ StorageResource existingStorageResource = em.find(StorageResource.class, storageResourceId);
em.close();
StorageResource storageResource;
em = AppCatalogJPAUtils.getEntityManager();
@@ -279,8 +279,8 @@ public class StorageResourceResource extends AppCatAbstractResource {
storageResource = existingStorageResource;
storageResource.setUpdateTime(AiravataUtils.getCurrentTimestamp());
}
- storageResource.setResourceDescription(getResourceDescription());
- storageResource.setResourceId(getResourceId());
+ storageResource.setDescription(getResourceDescription());
+ storageResource.setStorageResourceId(getStorageResourceId());
storageResource.setHostName(getHostName());
storageResource.setEnabled(isEnabled());
if (existingStorageResource == null) {
@@ -328,10 +328,6 @@ public class StorageResourceResource extends AppCatAbstractResource {
return resourceDescription;
}
- public String getResourceId() {
- return resourceId;
- }
-
public String getHostName() {
return hostName;
}
@@ -340,11 +336,15 @@ public class StorageResourceResource extends AppCatAbstractResource {
this.resourceDescription=resourceDescription;
}
- public void setResourceId(String resourceId) {
- this.resourceId=resourceId;
- }
-
public void setHostName(String hostName) {
this.hostName=hostName;
}
+
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index 59a4c25..50af371 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -280,13 +280,27 @@ public class AppCatalogJPAUtils {
logger.error("Object should be a Compute Resource Preference.", new IllegalArgumentException());
throw new IllegalArgumentException("Object should be a Compute Resource Preference.");
}
- case DATA_STORAGE_PREFERENCE:
- if (o instanceof DataStoragePreference){
- return createDataStoragePref((DataStoragePreference) o);
+ case STORAGE_PREFERENCE:
+ if (o instanceof StoragePreference){
+ return createStoragePref((StoragePreference) o);
}else {
logger.error("Object should be a data storage Preference.", new IllegalArgumentException());
throw new IllegalArgumentException("Object should be a data storage Preference.");
}
+ case STORAGE_RESOURCE:
+ if (o instanceof StorageResource){
+ return createStorageResource((StorageResource) o);
+ }else {
+ logger.error("Object should be a storage resource.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Object should be a storage resource.");
+ }
+ case STORAGE_INTERFACE:
+ if (o instanceof StorageInterface){
+ return createStorageInterface((StorageInterface) o);
+ }else {
+ logger.error("Object should be a storage interface.", new IllegalArgumentException());
+ throw new IllegalArgumentException("Object should be a storage interface.");
+ }
case APPLICATION_INPUT:
if (o instanceof ApplicationIntInput){
return createApplicationInput((ApplicationIntInput) o);
@@ -898,11 +912,11 @@ public class AppCatalogJPAUtils {
return resource;
}
- private static AppCatalogResource createDataStoragePref(DataStoragePreference o) {
- DataStoragePreferenceResource resource = new DataStoragePreferenceResource();
+ private static AppCatalogResource createStoragePref(StoragePreference o) {
+ StoragePreferenceResource resource = new StoragePreferenceResource();
if (o != null) {
resource.setGatewayId(o.getGatewayId());
- resource.setDataMoveId(o.getDataMovementID());
+ resource.setStorageResourceId(o.getStorageResourceId());
resource.setLoginUserName(o.getLoginUserName());
resource.setResourceCSToken(o.getComputeResourceCSToken());
resource.setFsRootLocation(o.getFsRootLocation());
@@ -911,6 +925,28 @@ public class AppCatalogJPAUtils {
return resource;
}
+ private static AppCatalogResource createStorageResource(StorageResource o) {
+ StorageResourceResource resource = new StorageResourceResource();
+ if (o != null) {
+ resource.setStorageResourceId(o.getStorageResourceId());
+ resource.setHostName(o.getHostName());
+ resource.setEnabled(o.getEnabled());
+ resource.setResourceDescription(o.getDescription());
+ }
+ return resource;
+ }
+
+ private static AppCatalogResource createStorageInterface(StorageInterface o) {
+ StorageInterfaceResource resource = new StorageInterfaceResource();
+ if (o != null) {
+ resource.setStorageResourceId(o.getStorageResourceId());
+ resource.setDataMovementInterfaceId(o.getDataMovementInterfaceId());
+ resource.setDataMovementInterfaceId(o.getDataMovementInterfaceId());
+ resource.setStorageResourceResource((StorageResourceResource)createStorageResource(o.getStorageResource()));
+ }
+ return resource;
+ }
+
private static AppCatalogResource createModuleLoadCmd(ModuleLoadCmd o) {
ModuleLoadCmdResource moduleLoadCmdResource = new ModuleLoadCmdResource();
if (o != null){
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java
index 0f31464..3f5193c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogResourceType.java
@@ -23,7 +23,6 @@ package org.apache.airavata.registry.core.app.catalog.util;
public enum AppCatalogResourceType {
COMPUTE_RESOURCE,
- STORAGE_RESOURCE,
HOST_ALIAS,
HOST_IPADDRESS,
GSISSH_SUBMISSION,
@@ -51,7 +50,9 @@ public enum AppCatalogResourceType {
APPLICATION_OUTPUT,
GATEWAY_PROFILE,
COMPUTE_RESOURCE_PREFERENCE,
- DATA_STORAGE_PREFERENCE,
+ STORAGE_PREFERENCE,
+ STORAGE_RESOURCE,
+ STORAGE_INTERFACE,
BATCH_QUEUE,
COMPUTE_RESOURCE_FILE_SYSTEM,
JOB_SUBMISSION_INTERFACE,
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index aa681be..e096a0d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -34,8 +34,8 @@ import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
import org.apache.airavata.model.appcatalog.computeresource.UnicoreDataMovement;
import org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
-import org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
+import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription;
import org.apache.airavata.model.application.io.DataType;
import org.apache.airavata.model.application.io.InputDataObjectType;
@@ -60,7 +60,7 @@ public class AppCatalogThriftConversion {
StorageResourceResource resource = new StorageResourceResource();
resource.setHostName(description.getHostName());
resource.setResourceDescription(description.getStorageResourceDescription());
- resource.setResourceId(description.getStorageResourceId());
+ resource.setStorageResourceId(description.getStorageResourceId());
resource.setEnabled(description.isEnabled());
return resource;
}
@@ -115,7 +115,7 @@ public class AppCatalogThriftConversion {
public static StorageResourceDescription getStorageDescription (StorageResourceResource resource) throws AppCatalogException {
StorageResourceDescription description = new StorageResourceDescription();
- description.setStorageResourceId(resource.getResourceId());
+ description.setStorageResourceId(resource.getStorageResourceId());
description.setHostName(resource.getHostName());
description.setStorageResourceDescription(resource.getResourceDescription());
description.setEnabled(resource.isEnabled());
@@ -798,20 +798,20 @@ public class AppCatalogThriftConversion {
return preferences;
}
- public static DataStoragePreference getDataStoragePreference (DataStoragePreferenceResource resource){
- DataStoragePreference preference = new DataStoragePreference();
- preference.setDataMovememtResourceId(resource.getDataMoveId());
+ public static StoragePreference getDataStoragePreference (StoragePreferenceResource resource){
+ StoragePreference preference = new StoragePreference();
+ preference.setStorageResourceId(resource.getStorageResourceId());
preference.setFileSystemRootLocation(resource.getFsRootLocation());
preference.setLoginUserName(resource.getLoginUserName());
preference.setResourceSpecificCredentialStoreToken(resource.getResourceCSToken());
return preference;
}
- public static List<DataStoragePreference> getDataStoragePreferences (List<AppCatalogResource> resources){
- List<DataStoragePreference> preferences = new ArrayList<DataStoragePreference>();
+ public static List<StoragePreference> getDataStoragePreferences (List<AppCatalogResource> resources){
+ List<StoragePreference> preferences = new ArrayList<StoragePreference>();
if (resources != null && !resources.isEmpty()){
for (AppCatalogResource resource : resources){
- preferences.add(getDataStoragePreference((DataStoragePreferenceResource)resource));
+ preferences.add(getDataStoragePreference((StoragePreferenceResource)resource));
}
}
return preferences;
@@ -841,12 +841,12 @@ public class AppCatalogThriftConversion {
return inputResources;
}
- public static GatewayResourceProfile getGatewayResourceProfile(GatewayProfileResource gw, List<ComputeResourcePreference> preferences, List<DataStoragePreference> storagePreferences){
+ public static GatewayResourceProfile getGatewayResourceProfile(GatewayProfileResource gw, List<ComputeResourcePreference> preferences, List<StoragePreference> storagePreferences){
GatewayResourceProfile gatewayProfile = new GatewayResourceProfile();
gatewayProfile.setGatewayID(gw.getGatewayID());
gatewayProfile.setCredentialStoreToken(gw.getCredentialStoreToken());
gatewayProfile.setComputeResourcePreferences(preferences);
- gatewayProfile.setDataStoragePreferences(storagePreferences);
+ gatewayProfile.setStoragePreferences(storagePreferences);
return gatewayProfile;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
index 092ce1d..f867e93 100644
--- a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
+++ b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml
@@ -54,7 +54,7 @@
<class>org.apache.airavata.registry.core.app.catalog.model.ComputeResourceFileSystem</class>
<class>org.apache.airavata.registry.core.app.catalog.model.JobSubmissionInterface</class>
<class>org.apache.airavata.registry.core.app.catalog.model.DataMovementInterface</class>
- <class>org.apache.airavata.registry.core.app.catalog.model.DataStoragePreference</class>
+ <class>org.apache.airavata.registry.core.app.catalog.model.StoragePreference</class>
<class>org.apache.airavata.registry.core.app.catalog.model.ResourceJobManager</class>
<class>org.apache.airavata.registry.core.app.catalog.model.JobManagerCommand</class>
<class>org.apache.airavata.registry.core.app.catalog.model.LocalSubmission</class>
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
index 6de76d6..cdea976 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -398,12 +398,11 @@ CREATE TABLE STORAGE_RESOURCE
PRIMARY KEY (STORAGE_RESOURCE_ID)
);
-CREATE TABLE DATA_STORAGE_INTERFACE
+CREATE TABLE STORAGE_INTERFACE
(
STORAGE_RESOURCE_ID VARCHAR (255) NOT NULL,
- DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL,
DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
- PRIORITY_ORDER INTEGER,
+ DATA_MOVEMENT_PROTOCOL VARCHAR (255) NOT NULL,
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
UPDATE_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (STORAGE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
@@ -429,14 +428,14 @@ CREATE TABLE LOCAL_SUBMISSION
FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
);
-CREATE TABLE DATA_STORAGE_PREFERENCE
+CREATE TABLE STORAGE_PREFERENCE
(
GATEWAY_ID VARCHAR(255),
- DATA_MOVEMENT_ID VARCHAR(255),
+ STORAGE_RESOURCE_ID VARCHAR(255),
LOGIN_USERNAME VARCHAR(255),
FS_ROOT_LOCATION VARCHAR(255),
RESOURCE_CS_TOKEN VARCHAR(255),
- PRIMARY KEY(GATEWAY_ID,DATA_MOVEMENT_ID),
+ PRIMARY KEY(GATEWAY_ID,STORAGE_RESOURCE_ID),
FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java
index aeee0fc..7e32663 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/GwyResourceProfile.java
@@ -20,8 +20,8 @@
package org.apache.airavata.registry.cpi;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
-import org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
+import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
import java.util.List;
@@ -70,7 +70,7 @@ public interface GwyResourceProfile {
* @return ComputeResourcePreference
*/
ComputeResourcePreference getComputeResourcePreference (String gatewayId, String hostId) throws AppCatalogException;
- DataStoragePreference getDataStoragePreference (String gatewayId, String dataMoveId) throws AppCatalogException;
+ StoragePreference getStoragePreference(String gatewayId, String dataMoveId) throws AppCatalogException;
/**
*
@@ -78,7 +78,7 @@ public interface GwyResourceProfile {
* @return
*/
List<ComputeResourcePreference> getAllComputeResourcePreferences (String gatewayId) throws AppCatalogException;
- List<DataStoragePreference> getAllDataStoragePreferences (String gatewayId) throws AppCatalogException;
+ List<StoragePreference> getAllStoragePreferences(String gatewayId) throws AppCatalogException;
List<String> getGatewayProfileIds (String gatewayName) throws AppCatalogException;
List<GatewayResourceProfile> getAllGatewayProfiles () throws AppCatalogException;
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
index 7bce41a..1129d1d 100644
--- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
@@ -2138,9 +2138,9 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- bool addGatewayDataStoragePreference(1: required security_model.AuthzToken authzToken, 2: required string gatewayID,
+ bool addGatewayStoragePreference(1: required security_model.AuthzToken authzToken, 2: required string gatewayID,
3: required string dataMoveId,
- 4: required gateway_resource_profile_model.DataStoragePreference dataStoragePreference)
+ 4: required gateway_resource_profile_model.StoragePreference storagePreference)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -2166,7 +2166,7 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- gateway_resource_profile_model.DataStoragePreference getGatewayDataStoragePreference(1: required security_model.AuthzToken authzToken,
+ gateway_resource_profile_model.StoragePreference getGatewayStoragePreference(1: required security_model.AuthzToken authzToken,
2: required string gatewayID,
3: required string dataMoveId)
throws (1: airavata_errors.InvalidRequestException ire,
@@ -2192,8 +2192,8 @@ service Airavata {
4: airavata_errors.AuthorizationException ae)
- list<gateway_resource_profile_model.DataStoragePreference>
- getAllGatewayDataStoragePreferences(1: required security_model.AuthzToken authzToken, 2: required string gatewayID)
+ list<gateway_resource_profile_model.StoragePreference>
+ getAllGatewayStoragePreferences(1: required security_model.AuthzToken authzToken, 2: required string gatewayID)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -2233,9 +2233,9 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- bool updateGatewayDataStoragePreference(1: required security_model.AuthzToken authzToken, 2: required string gatewayID,
- 3: required string dataMoveId,
- 4: required gateway_resource_profile_model.DataStoragePreference dataStoragePreference)
+ bool updateGatewayStoragePreference(1: required security_model.AuthzToken authzToken, 2: required string gatewayID,
+ 3: required string storageId,
+ 4: required gateway_resource_profile_model.StoragePreference storagePreference)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
@@ -2261,8 +2261,8 @@ service Airavata {
3: airavata_errors.AiravataSystemException ase,
4: airavata_errors.AuthorizationException ae)
- bool deleteGatewayDataStoragePreference(1: required security_model.AuthzToken authzToken, 2: required string gatewayID,
- 3: required string dataMoveId)
+ bool deleteGatewayStoragePreference(1: required security_model.AuthzToken authzToken, 2: required string gatewayID,
+ 3: required string storageId)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.AiravataClientException ace,
3: airavata_errors.AiravataSystemException ase,
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift b/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift
index df78e5f..36474e0 100644
--- a/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/gateway_resource_profile_model.thrift
@@ -71,8 +71,8 @@ struct ComputeResourcePreference {
9: optional string resourceSpecificCredentialStoreToken
}
-struct DataStoragePreference {
- 1: required string dataMovememtResourceId,
+struct StoragePreference {
+ 1: required string storageResourceId,
2: optional string loginUserName,
3: optional string fileSystemRootLocation,
4: optional string resourceSpecificCredentialStoreToken
@@ -95,5 +95,5 @@ struct GatewayResourceProfile {
1: required string gatewayID,
2: optional string credentialStoreToken,
3: optional list<ComputeResourcePreference> computeResourcePreferences
- 4: optional list<DataStoragePreference> dataStoragePreferences
+ 4: optional list<StoragePreference> storagePreferences
}
[4/8] airavata git commit: adding data storage interfaces
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
index 6da0cfa..01e1e67 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
@@ -305,33 +305,33 @@ std::ostream& operator<<(std::ostream& out, const ComputeResourcePreference& obj
}
-DataStoragePreference::~DataStoragePreference() throw() {
+StoragePreference::~StoragePreference() throw() {
}
-void DataStoragePreference::__set_dataMovememtResourceId(const std::string& val) {
- this->dataMovememtResourceId = val;
+void StoragePreference::__set_storageResourceId(const std::string& val) {
+ this->storageResourceId = val;
}
-void DataStoragePreference::__set_loginUserName(const std::string& val) {
+void StoragePreference::__set_loginUserName(const std::string& val) {
this->loginUserName = val;
__isset.loginUserName = true;
}
-void DataStoragePreference::__set_fileSystemRootLocation(const std::string& val) {
+void StoragePreference::__set_fileSystemRootLocation(const std::string& val) {
this->fileSystemRootLocation = val;
__isset.fileSystemRootLocation = true;
}
-void DataStoragePreference::__set_resourceSpecificCredentialStoreToken(const std::string& val) {
+void StoragePreference::__set_resourceSpecificCredentialStoreToken(const std::string& val) {
this->resourceSpecificCredentialStoreToken = val;
__isset.resourceSpecificCredentialStoreToken = true;
}
-const char* DataStoragePreference::ascii_fingerprint = "6BA700CA2E5FC52A8DA5ADCF811DC8DA";
-const uint8_t DataStoragePreference::binary_fingerprint[16] = {0x6B,0xA7,0x00,0xCA,0x2E,0x5F,0xC5,0x2A,0x8D,0xA5,0xAD,0xCF,0x81,0x1D,0xC8,0xDA};
+const char* StoragePreference::ascii_fingerprint = "6BA700CA2E5FC52A8DA5ADCF811DC8DA";
+const uint8_t StoragePreference::binary_fingerprint[16] = {0x6B,0xA7,0x00,0xCA,0x2E,0x5F,0xC5,0x2A,0x8D,0xA5,0xAD,0xCF,0x81,0x1D,0xC8,0xDA};
-uint32_t DataStoragePreference::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t StoragePreference::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -342,7 +342,7 @@ uint32_t DataStoragePreference::read(::apache::thrift::protocol::TProtocol* ipro
using ::apache::thrift::protocol::TProtocolException;
- bool isset_dataMovememtResourceId = false;
+ bool isset_storageResourceId = false;
while (true)
{
@@ -354,8 +354,8 @@ uint32_t DataStoragePreference::read(::apache::thrift::protocol::TProtocol* ipro
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->dataMovememtResourceId);
- isset_dataMovememtResourceId = true;
+ xfer += iprot->readString(this->storageResourceId);
+ isset_storageResourceId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -393,18 +393,18 @@ uint32_t DataStoragePreference::read(::apache::thrift::protocol::TProtocol* ipro
xfer += iprot->readStructEnd();
- if (!isset_dataMovememtResourceId)
+ if (!isset_storageResourceId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t DataStoragePreference::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t StoragePreference::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("DataStoragePreference");
+ xfer += oprot->writeStructBegin("StoragePreference");
- xfer += oprot->writeFieldBegin("dataMovememtResourceId", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->dataMovememtResourceId);
+ xfer += oprot->writeFieldBegin("storageResourceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->storageResourceId);
xfer += oprot->writeFieldEnd();
if (this->__isset.loginUserName) {
@@ -428,34 +428,34 @@ uint32_t DataStoragePreference::write(::apache::thrift::protocol::TProtocol* opr
return xfer;
}
-void swap(DataStoragePreference &a, DataStoragePreference &b) {
+void swap(StoragePreference &a, StoragePreference &b) {
using ::std::swap;
- swap(a.dataMovememtResourceId, b.dataMovememtResourceId);
+ swap(a.storageResourceId, b.storageResourceId);
swap(a.loginUserName, b.loginUserName);
swap(a.fileSystemRootLocation, b.fileSystemRootLocation);
swap(a.resourceSpecificCredentialStoreToken, b.resourceSpecificCredentialStoreToken);
swap(a.__isset, b.__isset);
}
-DataStoragePreference::DataStoragePreference(const DataStoragePreference& other4) {
- dataMovememtResourceId = other4.dataMovememtResourceId;
+StoragePreference::StoragePreference(const StoragePreference& other4) {
+ storageResourceId = other4.storageResourceId;
loginUserName = other4.loginUserName;
fileSystemRootLocation = other4.fileSystemRootLocation;
resourceSpecificCredentialStoreToken = other4.resourceSpecificCredentialStoreToken;
__isset = other4.__isset;
}
-DataStoragePreference& DataStoragePreference::operator=(const DataStoragePreference& other5) {
- dataMovememtResourceId = other5.dataMovememtResourceId;
+StoragePreference& StoragePreference::operator=(const StoragePreference& other5) {
+ storageResourceId = other5.storageResourceId;
loginUserName = other5.loginUserName;
fileSystemRootLocation = other5.fileSystemRootLocation;
resourceSpecificCredentialStoreToken = other5.resourceSpecificCredentialStoreToken;
__isset = other5.__isset;
return *this;
}
-std::ostream& operator<<(std::ostream& out, const DataStoragePreference& obj) {
+std::ostream& operator<<(std::ostream& out, const StoragePreference& obj) {
using apache::thrift::to_string;
- out << "DataStoragePreference(";
- out << "dataMovememtResourceId=" << to_string(obj.dataMovememtResourceId);
+ out << "StoragePreference(";
+ out << "storageResourceId=" << to_string(obj.storageResourceId);
out << ", " << "loginUserName="; (obj.__isset.loginUserName ? (out << to_string(obj.loginUserName)) : (out << "<null>"));
out << ", " << "fileSystemRootLocation="; (obj.__isset.fileSystemRootLocation ? (out << to_string(obj.fileSystemRootLocation)) : (out << "<null>"));
out << ", " << "resourceSpecificCredentialStoreToken="; (obj.__isset.resourceSpecificCredentialStoreToken ? (out << to_string(obj.resourceSpecificCredentialStoreToken)) : (out << "<null>"));
@@ -482,9 +482,9 @@ void GatewayResourceProfile::__set_computeResourcePreferences(const std::vector<
__isset.computeResourcePreferences = true;
}
-void GatewayResourceProfile::__set_dataStoragePreferences(const std::vector<DataStoragePreference> & val) {
- this->dataStoragePreferences = val;
-__isset.dataStoragePreferences = true;
+void GatewayResourceProfile::__set_storagePreferences(const std::vector<StoragePreference> & val) {
+ this->storagePreferences = val;
+__isset.storagePreferences = true;
}
const char* GatewayResourceProfile::ascii_fingerprint = "A4BF6D60A7DE5979505C0E7F00278F12";
@@ -550,19 +550,19 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
case 4:
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
- this->dataStoragePreferences.clear();
+ this->storagePreferences.clear();
uint32_t _size11;
::apache::thrift::protocol::TType _etype14;
xfer += iprot->readListBegin(_etype14, _size11);
- this->dataStoragePreferences.resize(_size11);
+ this->storagePreferences.resize(_size11);
uint32_t _i15;
for (_i15 = 0; _i15 < _size11; ++_i15)
{
- xfer += this->dataStoragePreferences[_i15].read(iprot);
+ xfer += this->storagePreferences[_i15].read(iprot);
}
xfer += iprot->readListEnd();
}
- this->__isset.dataStoragePreferences = true;
+ this->__isset.storagePreferences = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -608,12 +608,12 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
}
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.dataStoragePreferences) {
- xfer += oprot->writeFieldBegin("dataStoragePreferences", ::apache::thrift::protocol::T_LIST, 4);
+ if (this->__isset.storagePreferences) {
+ xfer += oprot->writeFieldBegin("storagePreferences", ::apache::thrift::protocol::T_LIST, 4);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataStoragePreferences.size()));
- std::vector<DataStoragePreference> ::const_iterator _iter17;
- for (_iter17 = this->dataStoragePreferences.begin(); _iter17 != this->dataStoragePreferences.end(); ++_iter17)
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->storagePreferences.size()));
+ std::vector<StoragePreference> ::const_iterator _iter17;
+ for (_iter17 = this->storagePreferences.begin(); _iter17 != this->storagePreferences.end(); ++_iter17)
{
xfer += (*_iter17).write(oprot);
}
@@ -632,7 +632,7 @@ void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
swap(a.gatewayID, b.gatewayID);
swap(a.credentialStoreToken, b.credentialStoreToken);
swap(a.computeResourcePreferences, b.computeResourcePreferences);
- swap(a.dataStoragePreferences, b.dataStoragePreferences);
+ swap(a.storagePreferences, b.storagePreferences);
swap(a.__isset, b.__isset);
}
@@ -640,14 +640,14 @@ GatewayResourceProfile::GatewayResourceProfile(const GatewayResourceProfile& oth
gatewayID = other18.gatewayID;
credentialStoreToken = other18.credentialStoreToken;
computeResourcePreferences = other18.computeResourcePreferences;
- dataStoragePreferences = other18.dataStoragePreferences;
+ storagePreferences = other18.storagePreferences;
__isset = other18.__isset;
}
GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceProfile& other19) {
gatewayID = other19.gatewayID;
credentialStoreToken = other19.credentialStoreToken;
computeResourcePreferences = other19.computeResourcePreferences;
- dataStoragePreferences = other19.dataStoragePreferences;
+ storagePreferences = other19.storagePreferences;
__isset = other19.__isset;
return *this;
}
@@ -657,7 +657,7 @@ std::ostream& operator<<(std::ostream& out, const GatewayResourceProfile& obj) {
out << "gatewayID=" << to_string(obj.gatewayID);
out << ", " << "credentialStoreToken="; (obj.__isset.credentialStoreToken ? (out << to_string(obj.credentialStoreToken)) : (out << "<null>"));
out << ", " << "computeResourcePreferences="; (obj.__isset.computeResourcePreferences ? (out << to_string(obj.computeResourcePreferences)) : (out << "<null>"));
- out << ", " << "dataStoragePreferences="; (obj.__isset.dataStoragePreferences ? (out << to_string(obj.dataStoragePreferences)) : (out << "<null>"));
+ out << ", " << "storagePreferences="; (obj.__isset.storagePreferences ? (out << to_string(obj.storagePreferences)) : (out << "<null>"));
out << ")";
return out;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
index 59fbbef..db23b4e 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
@@ -39,7 +39,7 @@ namespace apache { namespace airavata { namespace model { namespace appcatalog {
class ComputeResourcePreference;
-class DataStoragePreference;
+class StoragePreference;
class GatewayResourceProfile;
@@ -146,33 +146,33 @@ class ComputeResourcePreference {
void swap(ComputeResourcePreference &a, ComputeResourcePreference &b);
-typedef struct _DataStoragePreference__isset {
- _DataStoragePreference__isset() : loginUserName(false), fileSystemRootLocation(false), resourceSpecificCredentialStoreToken(false) {}
+typedef struct _StoragePreference__isset {
+ _StoragePreference__isset() : loginUserName(false), fileSystemRootLocation(false), resourceSpecificCredentialStoreToken(false) {}
bool loginUserName :1;
bool fileSystemRootLocation :1;
bool resourceSpecificCredentialStoreToken :1;
-} _DataStoragePreference__isset;
+} _StoragePreference__isset;
-class DataStoragePreference {
+class StoragePreference {
public:
static const char* ascii_fingerprint; // = "6BA700CA2E5FC52A8DA5ADCF811DC8DA";
static const uint8_t binary_fingerprint[16]; // = {0x6B,0xA7,0x00,0xCA,0x2E,0x5F,0xC5,0x2A,0x8D,0xA5,0xAD,0xCF,0x81,0x1D,0xC8,0xDA};
- DataStoragePreference(const DataStoragePreference&);
- DataStoragePreference& operator=(const DataStoragePreference&);
- DataStoragePreference() : dataMovememtResourceId(), loginUserName(), fileSystemRootLocation(), resourceSpecificCredentialStoreToken() {
+ StoragePreference(const StoragePreference&);
+ StoragePreference& operator=(const StoragePreference&);
+ StoragePreference() : storageResourceId(), loginUserName(), fileSystemRootLocation(), resourceSpecificCredentialStoreToken() {
}
- virtual ~DataStoragePreference() throw();
- std::string dataMovememtResourceId;
+ virtual ~StoragePreference() throw();
+ std::string storageResourceId;
std::string loginUserName;
std::string fileSystemRootLocation;
std::string resourceSpecificCredentialStoreToken;
- _DataStoragePreference__isset __isset;
+ _StoragePreference__isset __isset;
- void __set_dataMovememtResourceId(const std::string& val);
+ void __set_storageResourceId(const std::string& val);
void __set_loginUserName(const std::string& val);
@@ -180,9 +180,9 @@ class DataStoragePreference {
void __set_resourceSpecificCredentialStoreToken(const std::string& val);
- bool operator == (const DataStoragePreference & rhs) const
+ bool operator == (const StoragePreference & rhs) const
{
- if (!(dataMovememtResourceId == rhs.dataMovememtResourceId))
+ if (!(storageResourceId == rhs.storageResourceId))
return false;
if (__isset.loginUserName != rhs.__isset.loginUserName)
return false;
@@ -198,25 +198,25 @@ class DataStoragePreference {
return false;
return true;
}
- bool operator != (const DataStoragePreference &rhs) const {
+ bool operator != (const StoragePreference &rhs) const {
return !(*this == rhs);
}
- bool operator < (const DataStoragePreference & ) const;
+ bool operator < (const StoragePreference & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const DataStoragePreference& obj);
+ friend std::ostream& operator<<(std::ostream& out, const StoragePreference& obj);
};
-void swap(DataStoragePreference &a, DataStoragePreference &b);
+void swap(StoragePreference &a, StoragePreference &b);
typedef struct _GatewayResourceProfile__isset {
- _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), dataStoragePreferences(false) {}
+ _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false) {}
bool credentialStoreToken :1;
bool computeResourcePreferences :1;
- bool dataStoragePreferences :1;
+ bool storagePreferences :1;
} _GatewayResourceProfile__isset;
class GatewayResourceProfile {
@@ -234,7 +234,7 @@ class GatewayResourceProfile {
std::string gatewayID;
std::string credentialStoreToken;
std::vector<ComputeResourcePreference> computeResourcePreferences;
- std::vector<DataStoragePreference> dataStoragePreferences;
+ std::vector<StoragePreference> storagePreferences;
_GatewayResourceProfile__isset __isset;
@@ -244,7 +244,7 @@ class GatewayResourceProfile {
void __set_computeResourcePreferences(const std::vector<ComputeResourcePreference> & val);
- void __set_dataStoragePreferences(const std::vector<DataStoragePreference> & val);
+ void __set_storagePreferences(const std::vector<StoragePreference> & val);
bool operator == (const GatewayResourceProfile & rhs) const
{
@@ -258,9 +258,9 @@ class GatewayResourceProfile {
return false;
else if (__isset.computeResourcePreferences && !(computeResourcePreferences == rhs.computeResourcePreferences))
return false;
- if (__isset.dataStoragePreferences != rhs.__isset.dataStoragePreferences)
+ if (__isset.storagePreferences != rhs.__isset.storagePreferences)
return false;
- else if (__isset.dataStoragePreferences && !(dataStoragePreferences == rhs.dataStoragePreferences))
+ else if (__isset.storagePreferences && !(storagePreferences == rhs.storagePreferences))
return false;
return true;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/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 0b73e12..3f55ee1 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
@@ -2530,14 +2530,14 @@ interface AiravataIf {
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayID
* @param string $dataMoveId
- * @param \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference
+ * @param \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference);
+ public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
/**
* Fetch a Compute Resource Preference of a registered gateway profile.
*
@@ -2597,13 +2597,13 @@ interface AiravataIf {
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayID
* @param string $dataMoveId
- * @return \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference
+ * @return \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId);
+ public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId);
/**
* Fetch all Compute Resource Preferences of a registered gateway profile.
*
@@ -2626,13 +2626,13 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayID
- * @return \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[]
+ * @return \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID);
+ public function getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID);
/**
* Fetch all gateway profiles registered
*
@@ -2675,15 +2675,15 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayID
- * @param string $dataMoveId
- * @param \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference
+ * @param string $storageId
+ * @param \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference);
+ public function updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference);
/**
* Delete the Compute Resource Preference of a registered gateway profile.
*
@@ -2710,14 +2710,14 @@ interface AiravataIf {
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayID
- * @param string $dataMoveId
+ * @param string $storageId
* @return bool
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId);
+ public function deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $gatewayId
@@ -10127,37 +10127,37 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("addGatewayComputeResourcePreference failed: unknown result");
}
- public function addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference)
+ public function addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
{
- $this->send_addGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId, $dataStoragePreference);
- return $this->recv_addGatewayDataStoragePreference();
+ $this->send_addGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId, $storagePreference);
+ return $this->recv_addGatewayStoragePreference();
}
- public function send_addGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference)
+ public function send_addGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
{
- $args = new \Airavata\API\Airavata_addGatewayDataStoragePreference_args();
+ $args = new \Airavata\API\Airavata_addGatewayStoragePreference_args();
$args->authzToken = $authzToken;
$args->gatewayID = $gatewayID;
$args->dataMoveId = $dataMoveId;
- $args->dataStoragePreference = $dataStoragePreference;
+ $args->storagePreference = $storagePreference;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'addGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'addGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('addGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('addGatewayStoragePreference', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_addGatewayDataStoragePreference()
+ public function recv_addGatewayStoragePreference()
{
$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_addGatewayDataStoragePreference_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_addGatewayStoragePreference_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -10171,7 +10171,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_addGatewayDataStoragePreference_result();
+ $result = new \Airavata\API\Airavata_addGatewayStoragePreference_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -10190,7 +10190,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("addGatewayDataStoragePreference failed: unknown result");
+ throw new \Exception("addGatewayStoragePreference failed: unknown result");
}
public function getGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId)
@@ -10258,36 +10258,36 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getGatewayComputeResourcePreference failed: unknown result");
}
- public function getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+ public function getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
{
- $this->send_getGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId);
- return $this->recv_getGatewayDataStoragePreference();
+ $this->send_getGatewayStoragePreference($authzToken, $gatewayID, $dataMoveId);
+ return $this->recv_getGatewayStoragePreference();
}
- public function send_getGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+ public function send_getGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
{
- $args = new \Airavata\API\Airavata_getGatewayDataStoragePreference_args();
+ $args = new \Airavata\API\Airavata_getGatewayStoragePreference_args();
$args->authzToken = $authzToken;
$args->gatewayID = $gatewayID;
$args->dataMoveId = $dataMoveId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getGatewayStoragePreference', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getGatewayDataStoragePreference()
+ public function recv_getGatewayStoragePreference()
{
$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_getGatewayDataStoragePreference_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getGatewayStoragePreference_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -10301,7 +10301,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getGatewayDataStoragePreference_result();
+ $result = new \Airavata\API\Airavata_getGatewayStoragePreference_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -10320,7 +10320,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getGatewayDataStoragePreference failed: unknown result");
+ throw new \Exception("getGatewayStoragePreference failed: unknown result");
}
public function getAllGatewayComputeResourcePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
@@ -10387,35 +10387,35 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("getAllGatewayComputeResourcePreferences failed: unknown result");
}
- public function getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
+ public function getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
{
- $this->send_getAllGatewayDataStoragePreferences($authzToken, $gatewayID);
- return $this->recv_getAllGatewayDataStoragePreferences();
+ $this->send_getAllGatewayStoragePreferences($authzToken, $gatewayID);
+ return $this->recv_getAllGatewayStoragePreferences();
}
- public function send_getAllGatewayDataStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
+ public function send_getAllGatewayStoragePreferences(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID)
{
- $args = new \Airavata\API\Airavata_getAllGatewayDataStoragePreferences_args();
+ $args = new \Airavata\API\Airavata_getAllGatewayStoragePreferences_args();
$args->authzToken = $authzToken;
$args->gatewayID = $gatewayID;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'getAllGatewayDataStoragePreferences', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'getAllGatewayStoragePreferences', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('getAllGatewayDataStoragePreferences', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('getAllGatewayStoragePreferences', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_getAllGatewayDataStoragePreferences()
+ public function recv_getAllGatewayStoragePreferences()
{
$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_getAllGatewayDataStoragePreferences_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_getAllGatewayStoragePreferences_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -10429,7 +10429,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_getAllGatewayDataStoragePreferences_result();
+ $result = new \Airavata\API\Airavata_getAllGatewayStoragePreferences_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -10448,7 +10448,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("getAllGatewayDataStoragePreferences failed: unknown result");
+ throw new \Exception("getAllGatewayStoragePreferences failed: unknown result");
}
public function getAllGatewayResourceProfiles(\Airavata\Model\Security\AuthzToken $authzToken)
@@ -10580,37 +10580,37 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("updateGatewayComputeResourcePreference failed: unknown result");
}
- public function updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference)
+ public function updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
{
- $this->send_updateGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId, $dataStoragePreference);
- return $this->recv_updateGatewayDataStoragePreference();
+ $this->send_updateGatewayStoragePreference($authzToken, $gatewayID, $storageId, $storagePreference);
+ return $this->recv_updateGatewayStoragePreference();
}
- public function send_updateGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId, \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference $dataStoragePreference)
+ public function send_updateGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId, \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference $storagePreference)
{
- $args = new \Airavata\API\Airavata_updateGatewayDataStoragePreference_args();
+ $args = new \Airavata\API\Airavata_updateGatewayStoragePreference_args();
$args->authzToken = $authzToken;
$args->gatewayID = $gatewayID;
- $args->dataMoveId = $dataMoveId;
- $args->dataStoragePreference = $dataStoragePreference;
+ $args->storageId = $storageId;
+ $args->storagePreference = $storagePreference;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'updateGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'updateGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('updateGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('updateGatewayStoragePreference', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_updateGatewayDataStoragePreference()
+ public function recv_updateGatewayStoragePreference()
{
$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_updateGatewayDataStoragePreference_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_updateGatewayStoragePreference_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -10624,7 +10624,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_updateGatewayDataStoragePreference_result();
+ $result = new \Airavata\API\Airavata_updateGatewayStoragePreference_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -10643,7 +10643,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("updateGatewayDataStoragePreference failed: unknown result");
+ throw new \Exception("updateGatewayStoragePreference failed: unknown result");
}
public function deleteGatewayComputeResourcePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $computeResourceId)
@@ -10711,36 +10711,36 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("deleteGatewayComputeResourcePreference failed: unknown result");
}
- public function deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+ public function deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId)
{
- $this->send_deleteGatewayDataStoragePreference($authzToken, $gatewayID, $dataMoveId);
- return $this->recv_deleteGatewayDataStoragePreference();
+ $this->send_deleteGatewayStoragePreference($authzToken, $gatewayID, $storageId);
+ return $this->recv_deleteGatewayStoragePreference();
}
- public function send_deleteGatewayDataStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $dataMoveId)
+ public function send_deleteGatewayStoragePreference(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayID, $storageId)
{
- $args = new \Airavata\API\Airavata_deleteGatewayDataStoragePreference_args();
+ $args = new \Airavata\API\Airavata_deleteGatewayStoragePreference_args();
$args->authzToken = $authzToken;
$args->gatewayID = $gatewayID;
- $args->dataMoveId = $dataMoveId;
+ $args->storageId = $storageId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
- thrift_protocol_write_binary($this->output_, 'deleteGatewayDataStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
+ thrift_protocol_write_binary($this->output_, 'deleteGatewayStoragePreference', TMessageType::CALL, $args, $this->seqid_, $this->output_->isStrictWrite());
}
else
{
- $this->output_->writeMessageBegin('deleteGatewayDataStoragePreference', TMessageType::CALL, $this->seqid_);
+ $this->output_->writeMessageBegin('deleteGatewayStoragePreference', TMessageType::CALL, $this->seqid_);
$args->write($this->output_);
$this->output_->writeMessageEnd();
$this->output_->getTransport()->flush();
}
}
- public function recv_deleteGatewayDataStoragePreference()
+ public function recv_deleteGatewayStoragePreference()
{
$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_deleteGatewayDataStoragePreference_result', $this->input_->isStrictRead());
+ if ($bin_accel) $result = thrift_protocol_read_binary($this->input_, '\Airavata\API\Airavata_deleteGatewayStoragePreference_result', $this->input_->isStrictRead());
else
{
$rseqid = 0;
@@ -10754,7 +10754,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
$this->input_->readMessageEnd();
throw $x;
}
- $result = new \Airavata\API\Airavata_deleteGatewayDataStoragePreference_result();
+ $result = new \Airavata\API\Airavata_deleteGatewayStoragePreference_result();
$result->read($this->input_);
$this->input_->readMessageEnd();
}
@@ -10773,7 +10773,7 @@ class AiravataClient implements \Airavata\API\AiravataIf {
if ($result->ae !== null) {
throw $result->ae;
}
- throw new \Exception("deleteGatewayDataStoragePreference failed: unknown result");
+ throw new \Exception("deleteGatewayStoragePreference failed: unknown result");
}
public function getAllWorkflows(\Airavata\Model\Security\AuthzToken $authzToken, $gatewayId)
@@ -46013,7 +46013,7 @@ class Airavata_addGatewayComputeResourcePreference_result {
}
-class Airavata_addGatewayDataStoragePreference_args {
+class Airavata_addGatewayStoragePreference_args {
static $_TSPEC;
/**
@@ -46029,9 +46029,9 @@ class Airavata_addGatewayDataStoragePreference_args {
*/
public $dataMoveId = null;
/**
- * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference
+ * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
*/
- public $dataStoragePreference = null;
+ public $storagePreference = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -46050,9 +46050,9 @@ class Airavata_addGatewayDataStoragePreference_args {
'type' => TType::STRING,
),
4 => array(
- 'var' => 'dataStoragePreference',
+ 'var' => 'storagePreference',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+ 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
);
}
@@ -46066,14 +46066,14 @@ class Airavata_addGatewayDataStoragePreference_args {
if (isset($vals['dataMoveId'])) {
$this->dataMoveId = $vals['dataMoveId'];
}
- if (isset($vals['dataStoragePreference'])) {
- $this->dataStoragePreference = $vals['dataStoragePreference'];
+ if (isset($vals['storagePreference'])) {
+ $this->storagePreference = $vals['storagePreference'];
}
}
}
public function getName() {
- return 'Airavata_addGatewayDataStoragePreference_args';
+ return 'Airavata_addGatewayStoragePreference_args';
}
public function read($input)
@@ -46115,8 +46115,8 @@ class Airavata_addGatewayDataStoragePreference_args {
break;
case 4:
if ($ftype == TType::STRUCT) {
- $this->dataStoragePreference = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
- $xfer += $this->dataStoragePreference->read($input);
+ $this->storagePreference = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
+ $xfer += $this->storagePreference->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -46133,7 +46133,7 @@ class Airavata_addGatewayDataStoragePreference_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGatewayDataStoragePreference_args');
+ $xfer += $output->writeStructBegin('Airavata_addGatewayStoragePreference_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -46152,12 +46152,12 @@ class Airavata_addGatewayDataStoragePreference_args {
$xfer += $output->writeString($this->dataMoveId);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataStoragePreference !== null) {
- if (!is_object($this->dataStoragePreference)) {
+ if ($this->storagePreference !== null) {
+ if (!is_object($this->storagePreference)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreference', TType::STRUCT, 4);
- $xfer += $this->dataStoragePreference->write($output);
+ $xfer += $output->writeFieldBegin('storagePreference', TType::STRUCT, 4);
+ $xfer += $this->storagePreference->write($output);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -46167,7 +46167,7 @@ class Airavata_addGatewayDataStoragePreference_args {
}
-class Airavata_addGatewayDataStoragePreference_result {
+class Airavata_addGatewayStoragePreference_result {
static $_TSPEC;
/**
@@ -46240,7 +46240,7 @@ class Airavata_addGatewayDataStoragePreference_result {
}
public function getName() {
- return 'Airavata_addGatewayDataStoragePreference_result';
+ return 'Airavata_addGatewayStoragePreference_result';
}
public function read($input)
@@ -46309,7 +46309,7 @@ class Airavata_addGatewayDataStoragePreference_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_addGatewayDataStoragePreference_result');
+ $xfer += $output->writeStructBegin('Airavata_addGatewayStoragePreference_result');
if ($this->success !== null) {
$xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
$xfer += $output->writeBool($this->success);
@@ -46648,7 +46648,7 @@ class Airavata_getGatewayComputeResourcePreference_result {
}
-class Airavata_getGatewayDataStoragePreference_args {
+class Airavata_getGatewayStoragePreference_args {
static $_TSPEC;
/**
@@ -46696,7 +46696,7 @@ class Airavata_getGatewayDataStoragePreference_args {
}
public function getName() {
- return 'Airavata_getGatewayDataStoragePreference_args';
+ return 'Airavata_getGatewayStoragePreference_args';
}
public function read($input)
@@ -46748,7 +46748,7 @@ class Airavata_getGatewayDataStoragePreference_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getGatewayDataStoragePreference_args');
+ $xfer += $output->writeStructBegin('Airavata_getGatewayStoragePreference_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -46774,11 +46774,11 @@ class Airavata_getGatewayDataStoragePreference_args {
}
-class Airavata_getGatewayDataStoragePreference_result {
+class Airavata_getGatewayStoragePreference_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference
+ * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
*/
public $success = null;
/**
@@ -46804,7 +46804,7 @@ class Airavata_getGatewayDataStoragePreference_result {
0 => array(
'var' => 'success',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+ 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
1 => array(
'var' => 'ire',
@@ -46848,7 +46848,7 @@ class Airavata_getGatewayDataStoragePreference_result {
}
public function getName() {
- return 'Airavata_getGatewayDataStoragePreference_result';
+ return 'Airavata_getGatewayStoragePreference_result';
}
public function read($input)
@@ -46868,7 +46868,7 @@ class Airavata_getGatewayDataStoragePreference_result {
{
case 0:
if ($ftype == TType::STRUCT) {
- $this->success = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
+ $this->success = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
$xfer += $this->success->read($input);
} else {
$xfer += $input->skip($ftype);
@@ -46918,7 +46918,7 @@ class Airavata_getGatewayDataStoragePreference_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getGatewayDataStoragePreference_result');
+ $xfer += $output->writeStructBegin('Airavata_getGatewayStoragePreference_result');
if ($this->success !== null) {
if (!is_object($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -47260,7 +47260,7 @@ class Airavata_getAllGatewayComputeResourcePreferences_result {
}
-class Airavata_getAllGatewayDataStoragePreferences_args {
+class Airavata_getAllGatewayStoragePreferences_args {
static $_TSPEC;
/**
@@ -47297,7 +47297,7 @@ class Airavata_getAllGatewayDataStoragePreferences_args {
}
public function getName() {
- return 'Airavata_getAllGatewayDataStoragePreferences_args';
+ return 'Airavata_getAllGatewayStoragePreferences_args';
}
public function read($input)
@@ -47342,7 +47342,7 @@ class Airavata_getAllGatewayDataStoragePreferences_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGatewayDataStoragePreferences_args');
+ $xfer += $output->writeStructBegin('Airavata_getAllGatewayStoragePreferences_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -47363,11 +47363,11 @@ class Airavata_getAllGatewayDataStoragePreferences_args {
}
-class Airavata_getAllGatewayDataStoragePreferences_result {
+class Airavata_getAllGatewayStoragePreferences_result {
static $_TSPEC;
/**
- * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[]
+ * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
public $success = null;
/**
@@ -47396,7 +47396,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+ 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
1 => array(
@@ -47441,7 +47441,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
}
public function getName() {
- return 'Airavata_getAllGatewayDataStoragePreferences_result';
+ return 'Airavata_getAllGatewayStoragePreferences_result';
}
public function read($input)
@@ -47468,7 +47468,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
for ($_i239 = 0; $_i239 < $_size235; ++$_i239)
{
$elem240 = null;
- $elem240 = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
+ $elem240 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
$xfer += $elem240->read($input);
$this->success []= $elem240;
}
@@ -47521,7 +47521,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_getAllGatewayDataStoragePreferences_result');
+ $xfer += $output->writeStructBegin('Airavata_getAllGatewayStoragePreferences_result');
if ($this->success !== null) {
if (!is_array($this->success)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -48178,7 +48178,7 @@ class Airavata_updateGatewayComputeResourcePreference_result {
}
-class Airavata_updateGatewayDataStoragePreference_args {
+class Airavata_updateGatewayStoragePreference_args {
static $_TSPEC;
/**
@@ -48192,11 +48192,11 @@ class Airavata_updateGatewayDataStoragePreference_args {
/**
* @var string
*/
- public $dataMoveId = null;
+ public $storageId = null;
/**
- * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference
+ * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference
*/
- public $dataStoragePreference = null;
+ public $storagePreference = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -48211,13 +48211,13 @@ class Airavata_updateGatewayDataStoragePreference_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'dataMoveId',
+ 'var' => 'storageId',
'type' => TType::STRING,
),
4 => array(
- 'var' => 'dataStoragePreference',
+ 'var' => 'storagePreference',
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+ 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
);
}
@@ -48228,17 +48228,17 @@ class Airavata_updateGatewayDataStoragePreference_args {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
- if (isset($vals['dataMoveId'])) {
- $this->dataMoveId = $vals['dataMoveId'];
+ if (isset($vals['storageId'])) {
+ $this->storageId = $vals['storageId'];
}
- if (isset($vals['dataStoragePreference'])) {
- $this->dataStoragePreference = $vals['dataStoragePreference'];
+ if (isset($vals['storagePreference'])) {
+ $this->storagePreference = $vals['storagePreference'];
}
}
}
public function getName() {
- return 'Airavata_updateGatewayDataStoragePreference_args';
+ return 'Airavata_updateGatewayStoragePreference_args';
}
public function read($input)
@@ -48273,15 +48273,15 @@ class Airavata_updateGatewayDataStoragePreference_args {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMoveId);
+ $xfer += $input->readString($this->storageId);
} else {
$xfer += $input->skip($ftype);
}
break;
case 4:
if ($ftype == TType::STRUCT) {
- $this->dataStoragePreference = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
- $xfer += $this->dataStoragePreference->read($input);
+ $this->storagePreference = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
+ $xfer += $this->storagePreference->read($input);
} else {
$xfer += $input->skip($ftype);
}
@@ -48298,7 +48298,7 @@ class Airavata_updateGatewayDataStoragePreference_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateGatewayDataStoragePreference_args');
+ $xfer += $output->writeStructBegin('Airavata_updateGatewayStoragePreference_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -48312,17 +48312,17 @@ class Airavata_updateGatewayDataStoragePreference_args {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataMoveId !== null) {
- $xfer += $output->writeFieldBegin('dataMoveId', TType::STRING, 3);
- $xfer += $output->writeString($this->dataMoveId);
+ if ($this->storageId !== null) {
+ $xfer += $output->writeFieldBegin('storageId', TType::STRING, 3);
+ $xfer += $output->writeString($this->storageId);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataStoragePreference !== null) {
- if (!is_object($this->dataStoragePreference)) {
+ if ($this->storagePreference !== null) {
+ if (!is_object($this->storagePreference)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreference', TType::STRUCT, 4);
- $xfer += $this->dataStoragePreference->write($output);
+ $xfer += $output->writeFieldBegin('storagePreference', TType::STRUCT, 4);
+ $xfer += $this->storagePreference->write($output);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -48332,7 +48332,7 @@ class Airavata_updateGatewayDataStoragePreference_args {
}
-class Airavata_updateGatewayDataStoragePreference_result {
+class Airavata_updateGatewayStoragePreference_result {
static $_TSPEC;
/**
@@ -48405,7 +48405,7 @@ class Airavata_updateGatewayDataStoragePreference_result {
}
public function getName() {
- return 'Airavata_updateGatewayDataStoragePreference_result';
+ return 'Airavata_updateGatewayStoragePreference_result';
}
public function read($input)
@@ -48474,7 +48474,7 @@ class Airavata_updateGatewayDataStoragePreference_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_updateGatewayDataStoragePreference_result');
+ $xfer += $output->writeStructBegin('Airavata_updateGatewayStoragePreference_result');
if ($this->success !== null) {
$xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
$xfer += $output->writeBool($this->success);
@@ -48808,7 +48808,7 @@ class Airavata_deleteGatewayComputeResourcePreference_result {
}
-class Airavata_deleteGatewayDataStoragePreference_args {
+class Airavata_deleteGatewayStoragePreference_args {
static $_TSPEC;
/**
@@ -48822,7 +48822,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
/**
* @var string
*/
- public $dataMoveId = null;
+ public $storageId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -48837,7 +48837,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'dataMoveId',
+ 'var' => 'storageId',
'type' => TType::STRING,
),
);
@@ -48849,14 +48849,14 @@ class Airavata_deleteGatewayDataStoragePreference_args {
if (isset($vals['gatewayID'])) {
$this->gatewayID = $vals['gatewayID'];
}
- if (isset($vals['dataMoveId'])) {
- $this->dataMoveId = $vals['dataMoveId'];
+ if (isset($vals['storageId'])) {
+ $this->storageId = $vals['storageId'];
}
}
}
public function getName() {
- return 'Airavata_deleteGatewayDataStoragePreference_args';
+ return 'Airavata_deleteGatewayStoragePreference_args';
}
public function read($input)
@@ -48891,7 +48891,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMoveId);
+ $xfer += $input->readString($this->storageId);
} else {
$xfer += $input->skip($ftype);
}
@@ -48908,7 +48908,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteGatewayDataStoragePreference_args');
+ $xfer += $output->writeStructBegin('Airavata_deleteGatewayStoragePreference_args');
if ($this->authzToken !== null) {
if (!is_object($this->authzToken)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
@@ -48922,9 +48922,9 @@ class Airavata_deleteGatewayDataStoragePreference_args {
$xfer += $output->writeString($this->gatewayID);
$xfer += $output->writeFieldEnd();
}
- if ($this->dataMoveId !== null) {
- $xfer += $output->writeFieldBegin('dataMoveId', TType::STRING, 3);
- $xfer += $output->writeString($this->dataMoveId);
+ if ($this->storageId !== null) {
+ $xfer += $output->writeFieldBegin('storageId', TType::STRING, 3);
+ $xfer += $output->writeString($this->storageId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -48934,7 +48934,7 @@ class Airavata_deleteGatewayDataStoragePreference_args {
}
-class Airavata_deleteGatewayDataStoragePreference_result {
+class Airavata_deleteGatewayStoragePreference_result {
static $_TSPEC;
/**
@@ -49007,7 +49007,7 @@ class Airavata_deleteGatewayDataStoragePreference_result {
}
public function getName() {
- return 'Airavata_deleteGatewayDataStoragePreference_result';
+ return 'Airavata_deleteGatewayStoragePreference_result';
}
public function read($input)
@@ -49076,7 +49076,7 @@ class Airavata_deleteGatewayDataStoragePreference_result {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('Airavata_deleteGatewayDataStoragePreference_result');
+ $xfer += $output->writeStructBegin('Airavata_deleteGatewayStoragePreference_result');
if ($this->success !== null) {
$xfer += $output->writeFieldBegin('success', TType::BOOL, 0);
$xfer += $output->writeBool($this->success);
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index f63f2f0..9152391 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -310,13 +310,13 @@ class ComputeResourcePreference {
}
-class DataStoragePreference {
+class StoragePreference {
static $_TSPEC;
/**
* @var string
*/
- public $dataMovememtResourceId = null;
+ public $storageResourceId = null;
/**
* @var string
*/
@@ -334,7 +334,7 @@ class DataStoragePreference {
if (!isset(self::$_TSPEC)) {
self::$_TSPEC = array(
1 => array(
- 'var' => 'dataMovememtResourceId',
+ 'var' => 'storageResourceId',
'type' => TType::STRING,
),
2 => array(
@@ -352,8 +352,8 @@ class DataStoragePreference {
);
}
if (is_array($vals)) {
- if (isset($vals['dataMovememtResourceId'])) {
- $this->dataMovememtResourceId = $vals['dataMovememtResourceId'];
+ if (isset($vals['storageResourceId'])) {
+ $this->storageResourceId = $vals['storageResourceId'];
}
if (isset($vals['loginUserName'])) {
$this->loginUserName = $vals['loginUserName'];
@@ -368,7 +368,7 @@ class DataStoragePreference {
}
public function getName() {
- return 'DataStoragePreference';
+ return 'StoragePreference';
}
public function read($input)
@@ -388,7 +388,7 @@ class DataStoragePreference {
{
case 1:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->dataMovememtResourceId);
+ $xfer += $input->readString($this->storageResourceId);
} else {
$xfer += $input->skip($ftype);
}
@@ -426,10 +426,10 @@ class DataStoragePreference {
public function write($output) {
$xfer = 0;
- $xfer += $output->writeStructBegin('DataStoragePreference');
- if ($this->dataMovememtResourceId !== null) {
- $xfer += $output->writeFieldBegin('dataMovememtResourceId', TType::STRING, 1);
- $xfer += $output->writeString($this->dataMovememtResourceId);
+ $xfer += $output->writeStructBegin('StoragePreference');
+ if ($this->storageResourceId !== null) {
+ $xfer += $output->writeFieldBegin('storageResourceId', TType::STRING, 1);
+ $xfer += $output->writeString($this->storageResourceId);
$xfer += $output->writeFieldEnd();
}
if ($this->loginUserName !== null) {
@@ -483,9 +483,9 @@ class GatewayResourceProfile {
*/
public $computeResourcePreferences = null;
/**
- * @var \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference[]
+ * @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
- public $dataStoragePreferences = null;
+ public $storagePreferences = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -508,12 +508,12 @@ class GatewayResourceProfile {
),
),
4 => array(
- 'var' => 'dataStoragePreferences',
+ 'var' => 'storagePreferences',
'type' => TType::LST,
'etype' => TType::STRUCT,
'elem' => array(
'type' => TType::STRUCT,
- 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference',
+ 'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
);
@@ -528,8 +528,8 @@ class GatewayResourceProfile {
if (isset($vals['computeResourcePreferences'])) {
$this->computeResourcePreferences = $vals['computeResourcePreferences'];
}
- if (isset($vals['dataStoragePreferences'])) {
- $this->dataStoragePreferences = $vals['dataStoragePreferences'];
+ if (isset($vals['storagePreferences'])) {
+ $this->storagePreferences = $vals['storagePreferences'];
}
}
}
@@ -587,16 +587,16 @@ class GatewayResourceProfile {
break;
case 4:
if ($ftype == TType::LST) {
- $this->dataStoragePreferences = array();
+ $this->storagePreferences = array();
$_size6 = 0;
$_etype9 = 0;
$xfer += $input->readListBegin($_etype9, $_size6);
for ($_i10 = 0; $_i10 < $_size6; ++$_i10)
{
$elem11 = null;
- $elem11 = new \Airavata\Model\AppCatalog\GatewayProfile\DataStoragePreference();
+ $elem11 = new \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference();
$xfer += $elem11->read($input);
- $this->dataStoragePreferences []= $elem11;
+ $this->storagePreferences []= $elem11;
}
$xfer += $input->readListEnd();
} else {
@@ -643,15 +643,15 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->dataStoragePreferences !== null) {
- if (!is_array($this->dataStoragePreferences)) {
+ if ($this->storagePreferences !== null) {
+ if (!is_array($this->storagePreferences)) {
throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
}
- $xfer += $output->writeFieldBegin('dataStoragePreferences', TType::LST, 4);
+ $xfer += $output->writeFieldBegin('storagePreferences', TType::LST, 4);
{
- $output->writeListBegin(TType::STRUCT, count($this->dataStoragePreferences));
+ $output->writeListBegin(TType::STRUCT, count($this->storagePreferences));
{
- foreach ($this->dataStoragePreferences as $iter13)
+ foreach ($this->storagePreferences as $iter13)
{
$xfer += $iter13->write($output);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index 96cf8bd..42dbfd2 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -137,16 +137,16 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' bool updateGatewayResourceProfile(AuthzToken authzToken, string gatewayID, GatewayResourceProfile gatewayResourceProfile)')
print(' bool deleteGatewayResourceProfile(AuthzToken authzToken, string gatewayID)')
print(' bool addGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId, ComputeResourcePreference computeResourcePreference)')
- print(' bool addGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId, DataStoragePreference dataStoragePreference)')
+ print(' bool addGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId, StoragePreference storagePreference)')
print(' ComputeResourcePreference getGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId)')
- print(' DataStoragePreference getGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId)')
+ print(' StoragePreference getGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId)')
print(' getAllGatewayComputeResourcePreferences(AuthzToken authzToken, string gatewayID)')
- print(' getAllGatewayDataStoragePreferences(AuthzToken authzToken, string gatewayID)')
+ print(' getAllGatewayStoragePreferences(AuthzToken authzToken, string gatewayID)')
print(' getAllGatewayResourceProfiles(AuthzToken authzToken)')
print(' bool updateGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId, ComputeResourcePreference computeResourcePreference)')
- print(' bool updateGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId, DataStoragePreference dataStoragePreference)')
+ print(' bool updateGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string storageId, StoragePreference storagePreference)')
print(' bool deleteGatewayComputeResourcePreference(AuthzToken authzToken, string gatewayID, string computeResourceId)')
- print(' bool deleteGatewayDataStoragePreference(AuthzToken authzToken, string gatewayID, string dataMoveId)')
+ print(' bool deleteGatewayStoragePreference(AuthzToken authzToken, string gatewayID, string storageId)')
print(' getAllWorkflows(AuthzToken authzToken, string gatewayId)')
print(' Workflow getWorkflow(AuthzToken authzToken, string workflowTemplateId)')
print(' void deleteWorkflow(AuthzToken authzToken, string workflowTemplateId)')
@@ -888,11 +888,11 @@ elif cmd == 'addGatewayComputeResourcePreference':
sys.exit(1)
pp.pprint(client.addGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
-elif cmd == 'addGatewayDataStoragePreference':
+elif cmd == 'addGatewayStoragePreference':
if len(args) != 4:
- print('addGatewayDataStoragePreference requires 4 args')
+ print('addGatewayStoragePreference requires 4 args')
sys.exit(1)
- pp.pprint(client.addGatewayDataStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
+ pp.pprint(client.addGatewayStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
elif cmd == 'getGatewayComputeResourcePreference':
if len(args) != 3:
@@ -900,11 +900,11 @@ elif cmd == 'getGatewayComputeResourcePreference':
sys.exit(1)
pp.pprint(client.getGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],))
-elif cmd == 'getGatewayDataStoragePreference':
+elif cmd == 'getGatewayStoragePreference':
if len(args) != 3:
- print('getGatewayDataStoragePreference requires 3 args')
+ print('getGatewayStoragePreference requires 3 args')
sys.exit(1)
- pp.pprint(client.getGatewayDataStoragePreference(eval(args[0]),args[1],args[2],))
+ pp.pprint(client.getGatewayStoragePreference(eval(args[0]),args[1],args[2],))
elif cmd == 'getAllGatewayComputeResourcePreferences':
if len(args) != 2:
@@ -912,11 +912,11 @@ elif cmd == 'getAllGatewayComputeResourcePreferences':
sys.exit(1)
pp.pprint(client.getAllGatewayComputeResourcePreferences(eval(args[0]),args[1],))
-elif cmd == 'getAllGatewayDataStoragePreferences':
+elif cmd == 'getAllGatewayStoragePreferences':
if len(args) != 2:
- print('getAllGatewayDataStoragePreferences requires 2 args')
+ print('getAllGatewayStoragePreferences requires 2 args')
sys.exit(1)
- pp.pprint(client.getAllGatewayDataStoragePreferences(eval(args[0]),args[1],))
+ pp.pprint(client.getAllGatewayStoragePreferences(eval(args[0]),args[1],))
elif cmd == 'getAllGatewayResourceProfiles':
if len(args) != 1:
@@ -930,11 +930,11 @@ elif cmd == 'updateGatewayComputeResourcePreference':
sys.exit(1)
pp.pprint(client.updateGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
-elif cmd == 'updateGatewayDataStoragePreference':
+elif cmd == 'updateGatewayStoragePreference':
if len(args) != 4:
- print('updateGatewayDataStoragePreference requires 4 args')
+ print('updateGatewayStoragePreference requires 4 args')
sys.exit(1)
- pp.pprint(client.updateGatewayDataStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
+ pp.pprint(client.updateGatewayStoragePreference(eval(args[0]),args[1],args[2],eval(args[3]),))
elif cmd == 'deleteGatewayComputeResourcePreference':
if len(args) != 3:
@@ -942,11 +942,11 @@ elif cmd == 'deleteGatewayComputeResourcePreference':
sys.exit(1)
pp.pprint(client.deleteGatewayComputeResourcePreference(eval(args[0]),args[1],args[2],))
-elif cmd == 'deleteGatewayDataStoragePreference':
+elif cmd == 'deleteGatewayStoragePreference':
if len(args) != 3:
- print('deleteGatewayDataStoragePreference requires 3 args')
+ print('deleteGatewayStoragePreference requires 3 args')
sys.exit(1)
- pp.pprint(client.deleteGatewayDataStoragePreference(eval(args[0]),args[1],args[2],))
+ pp.pprint(client.deleteGatewayStoragePreference(eval(args[0]),args[1],args[2],))
elif cmd == 'getAllWorkflows':
if len(args) != 2:
[2/8] airavata git commit: adding data storage interfaces
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
index 6cc454d..7c1766f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -71,7 +71,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayID", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("credentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourcePreferences", org.apache.thrift.protocol.TType.LIST, (short)3);
- private static final org.apache.thrift.protocol.TField DATA_STORAGE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("dataStoragePreferences", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField STORAGE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("storagePreferences", org.apache.thrift.protocol.TType.LIST, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -82,14 +82,14 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
private String gatewayID; // required
private String credentialStoreToken; // optional
private List<ComputeResourcePreference> computeResourcePreferences; // optional
- private List<DataStoragePreference> dataStoragePreferences; // optional
+ private List<StoragePreference> storagePreferences; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
GATEWAY_ID((short)1, "gatewayID"),
CREDENTIAL_STORE_TOKEN((short)2, "credentialStoreToken"),
COMPUTE_RESOURCE_PREFERENCES((short)3, "computeResourcePreferences"),
- DATA_STORAGE_PREFERENCES((short)4, "dataStoragePreferences");
+ STORAGE_PREFERENCES((short)4, "storagePreferences");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -110,8 +110,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return CREDENTIAL_STORE_TOKEN;
case 3: // COMPUTE_RESOURCE_PREFERENCES
return COMPUTE_RESOURCE_PREFERENCES;
- case 4: // DATA_STORAGE_PREFERENCES
- return DATA_STORAGE_PREFERENCES;
+ case 4: // STORAGE_PREFERENCES
+ return STORAGE_PREFERENCES;
default:
return null;
}
@@ -152,7 +152,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.DATA_STORAGE_PREFERENCES};
+ private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES};
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);
@@ -163,9 +163,9 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
tmpMap.put(_Fields.COMPUTE_RESOURCE_PREFERENCES, new org.apache.thrift.meta_data.FieldMetaData("computeResourcePreferences", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComputeResourcePreference.class))));
- tmpMap.put(_Fields.DATA_STORAGE_PREFERENCES, new org.apache.thrift.meta_data.FieldMetaData("dataStoragePreferences", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.STORAGE_PREFERENCES, new org.apache.thrift.meta_data.FieldMetaData("storagePreferences", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
- new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DataStoragePreference.class))));
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoragePreference.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GatewayResourceProfile.class, metaDataMap);
}
@@ -197,12 +197,12 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
this.computeResourcePreferences = __this__computeResourcePreferences;
}
- if (other.isSetDataStoragePreferences()) {
- List<DataStoragePreference> __this__dataStoragePreferences = new ArrayList<DataStoragePreference>(other.dataStoragePreferences.size());
- for (DataStoragePreference other_element : other.dataStoragePreferences) {
- __this__dataStoragePreferences.add(new DataStoragePreference(other_element));
+ if (other.isSetStoragePreferences()) {
+ List<StoragePreference> __this__storagePreferences = new ArrayList<StoragePreference>(other.storagePreferences.size());
+ for (StoragePreference other_element : other.storagePreferences) {
+ __this__storagePreferences.add(new StoragePreference(other_element));
}
- this.dataStoragePreferences = __this__dataStoragePreferences;
+ this.storagePreferences = __this__storagePreferences;
}
}
@@ -215,7 +215,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
this.gatewayID = null;
this.credentialStoreToken = null;
this.computeResourcePreferences = null;
- this.dataStoragePreferences = null;
+ this.storagePreferences = null;
}
public String getGatewayID() {
@@ -302,41 +302,41 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
- public int getDataStoragePreferencesSize() {
- return (this.dataStoragePreferences == null) ? 0 : this.dataStoragePreferences.size();
+ public int getStoragePreferencesSize() {
+ return (this.storagePreferences == null) ? 0 : this.storagePreferences.size();
}
- public java.util.Iterator<DataStoragePreference> getDataStoragePreferencesIterator() {
- return (this.dataStoragePreferences == null) ? null : this.dataStoragePreferences.iterator();
+ public java.util.Iterator<StoragePreference> getStoragePreferencesIterator() {
+ return (this.storagePreferences == null) ? null : this.storagePreferences.iterator();
}
- public void addToDataStoragePreferences(DataStoragePreference elem) {
- if (this.dataStoragePreferences == null) {
- this.dataStoragePreferences = new ArrayList<DataStoragePreference>();
+ public void addToStoragePreferences(StoragePreference elem) {
+ if (this.storagePreferences == null) {
+ this.storagePreferences = new ArrayList<StoragePreference>();
}
- this.dataStoragePreferences.add(elem);
+ this.storagePreferences.add(elem);
}
- public List<DataStoragePreference> getDataStoragePreferences() {
- return this.dataStoragePreferences;
+ public List<StoragePreference> getStoragePreferences() {
+ return this.storagePreferences;
}
- public void setDataStoragePreferences(List<DataStoragePreference> dataStoragePreferences) {
- this.dataStoragePreferences = dataStoragePreferences;
+ public void setStoragePreferences(List<StoragePreference> storagePreferences) {
+ this.storagePreferences = storagePreferences;
}
- public void unsetDataStoragePreferences() {
- this.dataStoragePreferences = null;
+ public void unsetStoragePreferences() {
+ this.storagePreferences = null;
}
- /** Returns true if field dataStoragePreferences is set (has been assigned a value) and false otherwise */
- public boolean isSetDataStoragePreferences() {
- return this.dataStoragePreferences != null;
+ /** Returns true if field storagePreferences is set (has been assigned a value) and false otherwise */
+ public boolean isSetStoragePreferences() {
+ return this.storagePreferences != null;
}
- public void setDataStoragePreferencesIsSet(boolean value) {
+ public void setStoragePreferencesIsSet(boolean value) {
if (!value) {
- this.dataStoragePreferences = null;
+ this.storagePreferences = null;
}
}
@@ -366,11 +366,11 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
break;
- case DATA_STORAGE_PREFERENCES:
+ case STORAGE_PREFERENCES:
if (value == null) {
- unsetDataStoragePreferences();
+ unsetStoragePreferences();
} else {
- setDataStoragePreferences((List<DataStoragePreference>)value);
+ setStoragePreferences((List<StoragePreference>)value);
}
break;
@@ -388,8 +388,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
case COMPUTE_RESOURCE_PREFERENCES:
return getComputeResourcePreferences();
- case DATA_STORAGE_PREFERENCES:
- return getDataStoragePreferences();
+ case STORAGE_PREFERENCES:
+ return getStoragePreferences();
}
throw new IllegalStateException();
@@ -408,8 +408,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return isSetCredentialStoreToken();
case COMPUTE_RESOURCE_PREFERENCES:
return isSetComputeResourcePreferences();
- case DATA_STORAGE_PREFERENCES:
- return isSetDataStoragePreferences();
+ case STORAGE_PREFERENCES:
+ return isSetStoragePreferences();
}
throw new IllegalStateException();
}
@@ -454,12 +454,12 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return false;
}
- boolean this_present_dataStoragePreferences = true && this.isSetDataStoragePreferences();
- boolean that_present_dataStoragePreferences = true && that.isSetDataStoragePreferences();
- if (this_present_dataStoragePreferences || that_present_dataStoragePreferences) {
- if (!(this_present_dataStoragePreferences && that_present_dataStoragePreferences))
+ boolean this_present_storagePreferences = true && this.isSetStoragePreferences();
+ boolean that_present_storagePreferences = true && that.isSetStoragePreferences();
+ if (this_present_storagePreferences || that_present_storagePreferences) {
+ if (!(this_present_storagePreferences && that_present_storagePreferences))
return false;
- if (!this.dataStoragePreferences.equals(that.dataStoragePreferences))
+ if (!this.storagePreferences.equals(that.storagePreferences))
return false;
}
@@ -485,10 +485,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (present_computeResourcePreferences)
list.add(computeResourcePreferences);
- boolean present_dataStoragePreferences = true && (isSetDataStoragePreferences());
- list.add(present_dataStoragePreferences);
- if (present_dataStoragePreferences)
- list.add(dataStoragePreferences);
+ boolean present_storagePreferences = true && (isSetStoragePreferences());
+ list.add(present_storagePreferences);
+ if (present_storagePreferences)
+ list.add(storagePreferences);
return list.hashCode();
}
@@ -531,12 +531,12 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetDataStoragePreferences()).compareTo(other.isSetDataStoragePreferences());
+ lastComparison = Boolean.valueOf(isSetStoragePreferences()).compareTo(other.isSetStoragePreferences());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetDataStoragePreferences()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataStoragePreferences, other.dataStoragePreferences);
+ if (isSetStoragePreferences()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storagePreferences, other.storagePreferences);
if (lastComparison != 0) {
return lastComparison;
}
@@ -588,13 +588,13 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
first = false;
}
- if (isSetDataStoragePreferences()) {
+ if (isSetStoragePreferences()) {
if (!first) sb.append(", ");
- sb.append("dataStoragePreferences:");
- if (this.dataStoragePreferences == null) {
+ sb.append("storagePreferences:");
+ if (this.storagePreferences == null) {
sb.append("null");
} else {
- sb.append(this.dataStoragePreferences);
+ sb.append(this.storagePreferences);
}
first = false;
}
@@ -680,21 +680,21 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // DATA_STORAGE_PREFERENCES
+ case 4: // STORAGE_PREFERENCES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
- struct.dataStoragePreferences = new ArrayList<DataStoragePreference>(_list3.size);
- DataStoragePreference _elem4;
+ struct.storagePreferences = new ArrayList<StoragePreference>(_list3.size);
+ StoragePreference _elem4;
for (int _i5 = 0; _i5 < _list3.size; ++_i5)
{
- _elem4 = new DataStoragePreference();
+ _elem4 = new StoragePreference();
_elem4.read(iprot);
- struct.dataStoragePreferences.add(_elem4);
+ struct.storagePreferences.add(_elem4);
}
iprot.readListEnd();
}
- struct.setDataStoragePreferencesIsSet(true);
+ struct.setStoragePreferencesIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -738,12 +738,12 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
oprot.writeFieldEnd();
}
}
- if (struct.dataStoragePreferences != null) {
- if (struct.isSetDataStoragePreferences()) {
- oprot.writeFieldBegin(DATA_STORAGE_PREFERENCES_FIELD_DESC);
+ if (struct.storagePreferences != null) {
+ if (struct.isSetStoragePreferences()) {
+ oprot.writeFieldBegin(STORAGE_PREFERENCES_FIELD_DESC);
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.dataStoragePreferences.size()));
- for (DataStoragePreference _iter7 : struct.dataStoragePreferences)
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.storagePreferences.size()));
+ for (StoragePreference _iter7 : struct.storagePreferences)
{
_iter7.write(oprot);
}
@@ -777,7 +777,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (struct.isSetComputeResourcePreferences()) {
optionals.set(1);
}
- if (struct.isSetDataStoragePreferences()) {
+ if (struct.isSetStoragePreferences()) {
optionals.set(2);
}
oprot.writeBitSet(optionals, 3);
@@ -793,10 +793,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
}
- if (struct.isSetDataStoragePreferences()) {
+ if (struct.isSetStoragePreferences()) {
{
- oprot.writeI32(struct.dataStoragePreferences.size());
- for (DataStoragePreference _iter9 : struct.dataStoragePreferences)
+ oprot.writeI32(struct.storagePreferences.size());
+ for (StoragePreference _iter9 : struct.storagePreferences)
{
_iter9.write(oprot);
}
@@ -831,16 +831,16 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (incoming.get(2)) {
{
org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.dataStoragePreferences = new ArrayList<DataStoragePreference>(_list13.size);
- DataStoragePreference _elem14;
+ struct.storagePreferences = new ArrayList<StoragePreference>(_list13.size);
+ StoragePreference _elem14;
for (int _i15 = 0; _i15 < _list13.size; ++_i15)
{
- _elem14 = new DataStoragePreference();
+ _elem14 = new StoragePreference();
_elem14.read(iprot);
- struct.dataStoragePreferences.add(_elem14);
+ struct.storagePreferences.add(_elem14);
}
}
- struct.setDataStoragePreferencesIsSet(true);
+ struct.setStoragePreferencesIsSet(true);
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
new file mode 100644
index 0000000..269cb6d
--- /dev/null
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
@@ -0,0 +1,728 @@
+/**
+ * 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.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.2)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.airavata.model.appcatalog.gatewayprofile;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javax.annotation.Generated;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
+public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
+
+ private static final org.apache.thrift.protocol.TField STORAGE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("storageResourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField LOGIN_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("loginUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField FILE_SYSTEM_ROOT_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSystemRootLocation", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSpecificCredentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)4);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new StoragePreferenceStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new StoragePreferenceTupleSchemeFactory());
+ }
+
+ private String storageResourceId; // required
+ private String loginUserName; // optional
+ private String fileSystemRootLocation; // optional
+ private String resourceSpecificCredentialStoreToken; // optional
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ STORAGE_RESOURCE_ID((short)1, "storageResourceId"),
+ LOGIN_USER_NAME((short)2, "loginUserName"),
+ FILE_SYSTEM_ROOT_LOCATION((short)3, "fileSystemRootLocation"),
+ RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)4, "resourceSpecificCredentialStoreToken");
+
+ 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 1: // STORAGE_RESOURCE_ID
+ return STORAGE_RESOURCE_ID;
+ case 2: // LOGIN_USER_NAME
+ return LOGIN_USER_NAME;
+ case 3: // FILE_SYSTEM_ROOT_LOCATION
+ return FILE_SYSTEM_ROOT_LOCATION;
+ case 4: // RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN
+ return RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN;
+ 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 _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.FILE_SYSTEM_ROOT_LOCATION,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN};
+ 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.STORAGE_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("storageResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.LOGIN_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("loginUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.FILE_SYSTEM_ROOT_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("fileSystemRootLocation", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("resourceSpecificCredentialStoreToken", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StoragePreference.class, metaDataMap);
+ }
+
+ public StoragePreference() {
+ }
+
+ public StoragePreference(
+ String storageResourceId)
+ {
+ this();
+ this.storageResourceId = storageResourceId;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public StoragePreference(StoragePreference other) {
+ if (other.isSetStorageResourceId()) {
+ this.storageResourceId = other.storageResourceId;
+ }
+ if (other.isSetLoginUserName()) {
+ this.loginUserName = other.loginUserName;
+ }
+ if (other.isSetFileSystemRootLocation()) {
+ this.fileSystemRootLocation = other.fileSystemRootLocation;
+ }
+ if (other.isSetResourceSpecificCredentialStoreToken()) {
+ this.resourceSpecificCredentialStoreToken = other.resourceSpecificCredentialStoreToken;
+ }
+ }
+
+ public StoragePreference deepCopy() {
+ return new StoragePreference(this);
+ }
+
+ @Override
+ public void clear() {
+ this.storageResourceId = null;
+ this.loginUserName = null;
+ this.fileSystemRootLocation = null;
+ this.resourceSpecificCredentialStoreToken = null;
+ }
+
+ public String getStorageResourceId() {
+ return this.storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ public void unsetStorageResourceId() {
+ this.storageResourceId = null;
+ }
+
+ /** Returns true if field storageResourceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetStorageResourceId() {
+ return this.storageResourceId != null;
+ }
+
+ public void setStorageResourceIdIsSet(boolean value) {
+ if (!value) {
+ this.storageResourceId = null;
+ }
+ }
+
+ public String getLoginUserName() {
+ return this.loginUserName;
+ }
+
+ public void setLoginUserName(String loginUserName) {
+ this.loginUserName = loginUserName;
+ }
+
+ public void unsetLoginUserName() {
+ this.loginUserName = null;
+ }
+
+ /** Returns true if field loginUserName is set (has been assigned a value) and false otherwise */
+ public boolean isSetLoginUserName() {
+ return this.loginUserName != null;
+ }
+
+ public void setLoginUserNameIsSet(boolean value) {
+ if (!value) {
+ this.loginUserName = null;
+ }
+ }
+
+ public String getFileSystemRootLocation() {
+ return this.fileSystemRootLocation;
+ }
+
+ public void setFileSystemRootLocation(String fileSystemRootLocation) {
+ this.fileSystemRootLocation = fileSystemRootLocation;
+ }
+
+ public void unsetFileSystemRootLocation() {
+ this.fileSystemRootLocation = null;
+ }
+
+ /** Returns true if field fileSystemRootLocation is set (has been assigned a value) and false otherwise */
+ public boolean isSetFileSystemRootLocation() {
+ return this.fileSystemRootLocation != null;
+ }
+
+ public void setFileSystemRootLocationIsSet(boolean value) {
+ if (!value) {
+ this.fileSystemRootLocation = null;
+ }
+ }
+
+ public String getResourceSpecificCredentialStoreToken() {
+ return this.resourceSpecificCredentialStoreToken;
+ }
+
+ public void setResourceSpecificCredentialStoreToken(String resourceSpecificCredentialStoreToken) {
+ this.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken;
+ }
+
+ public void unsetResourceSpecificCredentialStoreToken() {
+ this.resourceSpecificCredentialStoreToken = null;
+ }
+
+ /** Returns true if field resourceSpecificCredentialStoreToken is set (has been assigned a value) and false otherwise */
+ public boolean isSetResourceSpecificCredentialStoreToken() {
+ return this.resourceSpecificCredentialStoreToken != null;
+ }
+
+ public void setResourceSpecificCredentialStoreTokenIsSet(boolean value) {
+ if (!value) {
+ this.resourceSpecificCredentialStoreToken = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case STORAGE_RESOURCE_ID:
+ if (value == null) {
+ unsetStorageResourceId();
+ } else {
+ setStorageResourceId((String)value);
+ }
+ break;
+
+ case LOGIN_USER_NAME:
+ if (value == null) {
+ unsetLoginUserName();
+ } else {
+ setLoginUserName((String)value);
+ }
+ break;
+
+ case FILE_SYSTEM_ROOT_LOCATION:
+ if (value == null) {
+ unsetFileSystemRootLocation();
+ } else {
+ setFileSystemRootLocation((String)value);
+ }
+ break;
+
+ case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
+ if (value == null) {
+ unsetResourceSpecificCredentialStoreToken();
+ } else {
+ setResourceSpecificCredentialStoreToken((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case STORAGE_RESOURCE_ID:
+ return getStorageResourceId();
+
+ case LOGIN_USER_NAME:
+ return getLoginUserName();
+
+ case FILE_SYSTEM_ROOT_LOCATION:
+ return getFileSystemRootLocation();
+
+ case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
+ return getResourceSpecificCredentialStoreToken();
+
+ }
+ 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 STORAGE_RESOURCE_ID:
+ return isSetStorageResourceId();
+ case LOGIN_USER_NAME:
+ return isSetLoginUserName();
+ case FILE_SYSTEM_ROOT_LOCATION:
+ return isSetFileSystemRootLocation();
+ case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
+ return isSetResourceSpecificCredentialStoreToken();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof StoragePreference)
+ return this.equals((StoragePreference)that);
+ return false;
+ }
+
+ public boolean equals(StoragePreference that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_storageResourceId = true && this.isSetStorageResourceId();
+ boolean that_present_storageResourceId = true && that.isSetStorageResourceId();
+ if (this_present_storageResourceId || that_present_storageResourceId) {
+ if (!(this_present_storageResourceId && that_present_storageResourceId))
+ return false;
+ if (!this.storageResourceId.equals(that.storageResourceId))
+ return false;
+ }
+
+ boolean this_present_loginUserName = true && this.isSetLoginUserName();
+ boolean that_present_loginUserName = true && that.isSetLoginUserName();
+ if (this_present_loginUserName || that_present_loginUserName) {
+ if (!(this_present_loginUserName && that_present_loginUserName))
+ return false;
+ if (!this.loginUserName.equals(that.loginUserName))
+ return false;
+ }
+
+ boolean this_present_fileSystemRootLocation = true && this.isSetFileSystemRootLocation();
+ boolean that_present_fileSystemRootLocation = true && that.isSetFileSystemRootLocation();
+ if (this_present_fileSystemRootLocation || that_present_fileSystemRootLocation) {
+ if (!(this_present_fileSystemRootLocation && that_present_fileSystemRootLocation))
+ return false;
+ if (!this.fileSystemRootLocation.equals(that.fileSystemRootLocation))
+ return false;
+ }
+
+ boolean this_present_resourceSpecificCredentialStoreToken = true && this.isSetResourceSpecificCredentialStoreToken();
+ boolean that_present_resourceSpecificCredentialStoreToken = true && that.isSetResourceSpecificCredentialStoreToken();
+ if (this_present_resourceSpecificCredentialStoreToken || that_present_resourceSpecificCredentialStoreToken) {
+ if (!(this_present_resourceSpecificCredentialStoreToken && that_present_resourceSpecificCredentialStoreToken))
+ return false;
+ if (!this.resourceSpecificCredentialStoreToken.equals(that.resourceSpecificCredentialStoreToken))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_storageResourceId = true && (isSetStorageResourceId());
+ list.add(present_storageResourceId);
+ if (present_storageResourceId)
+ list.add(storageResourceId);
+
+ boolean present_loginUserName = true && (isSetLoginUserName());
+ list.add(present_loginUserName);
+ if (present_loginUserName)
+ list.add(loginUserName);
+
+ boolean present_fileSystemRootLocation = true && (isSetFileSystemRootLocation());
+ list.add(present_fileSystemRootLocation);
+ if (present_fileSystemRootLocation)
+ list.add(fileSystemRootLocation);
+
+ boolean present_resourceSpecificCredentialStoreToken = true && (isSetResourceSpecificCredentialStoreToken());
+ list.add(present_resourceSpecificCredentialStoreToken);
+ if (present_resourceSpecificCredentialStoreToken)
+ list.add(resourceSpecificCredentialStoreToken);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(StoragePreference other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetStorageResourceId()).compareTo(other.isSetStorageResourceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetStorageResourceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storageResourceId, other.storageResourceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetLoginUserName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loginUserName, other.loginUserName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetFileSystemRootLocation()).compareTo(other.isSetFileSystemRootLocation());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetFileSystemRootLocation()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSystemRootLocation, other.fileSystemRootLocation);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetResourceSpecificCredentialStoreToken()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceSpecificCredentialStoreToken, other.resourceSpecificCredentialStoreToken);
+ 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("StoragePreference(");
+ boolean first = true;
+
+ sb.append("storageResourceId:");
+ if (this.storageResourceId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.storageResourceId);
+ }
+ first = false;
+ if (isSetLoginUserName()) {
+ if (!first) sb.append(", ");
+ sb.append("loginUserName:");
+ if (this.loginUserName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.loginUserName);
+ }
+ first = false;
+ }
+ if (isSetFileSystemRootLocation()) {
+ if (!first) sb.append(", ");
+ sb.append("fileSystemRootLocation:");
+ if (this.fileSystemRootLocation == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.fileSystemRootLocation);
+ }
+ first = false;
+ }
+ if (isSetResourceSpecificCredentialStoreToken()) {
+ if (!first) sb.append(", ");
+ sb.append("resourceSpecificCredentialStoreToken:");
+ if (this.resourceSpecificCredentialStoreToken == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.resourceSpecificCredentialStoreToken);
+ }
+ first = false;
+ }
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ if (!isSetStorageResourceId()) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'storageResourceId' is unset! Struct:" + toString());
+ }
+
+ // 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 {
+ 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 StoragePreferenceStandardSchemeFactory implements SchemeFactory {
+ public StoragePreferenceStandardScheme getScheme() {
+ return new StoragePreferenceStandardScheme();
+ }
+ }
+
+ private static class StoragePreferenceStandardScheme extends StandardScheme<StoragePreference> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, StoragePreference 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: // STORAGE_RESOURCE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.storageResourceId = iprot.readString();
+ struct.setStorageResourceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // LOGIN_USER_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.loginUserName = iprot.readString();
+ struct.setLoginUserNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 3: // FILE_SYSTEM_ROOT_LOCATION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.fileSystemRootLocation = iprot.readString();
+ struct.setFileSystemRootLocationIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 4: // RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.resourceSpecificCredentialStoreToken = iprot.readString();
+ struct.setResourceSpecificCredentialStoreTokenIsSet(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();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, StoragePreference struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.storageResourceId != null) {
+ oprot.writeFieldBegin(STORAGE_RESOURCE_ID_FIELD_DESC);
+ oprot.writeString(struct.storageResourceId);
+ oprot.writeFieldEnd();
+ }
+ if (struct.loginUserName != null) {
+ if (struct.isSetLoginUserName()) {
+ oprot.writeFieldBegin(LOGIN_USER_NAME_FIELD_DESC);
+ oprot.writeString(struct.loginUserName);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.fileSystemRootLocation != null) {
+ if (struct.isSetFileSystemRootLocation()) {
+ oprot.writeFieldBegin(FILE_SYSTEM_ROOT_LOCATION_FIELD_DESC);
+ oprot.writeString(struct.fileSystemRootLocation);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.resourceSpecificCredentialStoreToken != null) {
+ if (struct.isSetResourceSpecificCredentialStoreToken()) {
+ oprot.writeFieldBegin(RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC);
+ oprot.writeString(struct.resourceSpecificCredentialStoreToken);
+ oprot.writeFieldEnd();
+ }
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class StoragePreferenceTupleSchemeFactory implements SchemeFactory {
+ public StoragePreferenceTupleScheme getScheme() {
+ return new StoragePreferenceTupleScheme();
+ }
+ }
+
+ private static class StoragePreferenceTupleScheme extends TupleScheme<StoragePreference> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, StoragePreference struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.storageResourceId);
+ BitSet optionals = new BitSet();
+ if (struct.isSetLoginUserName()) {
+ optionals.set(0);
+ }
+ if (struct.isSetFileSystemRootLocation()) {
+ optionals.set(1);
+ }
+ if (struct.isSetResourceSpecificCredentialStoreToken()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.isSetLoginUserName()) {
+ oprot.writeString(struct.loginUserName);
+ }
+ if (struct.isSetFileSystemRootLocation()) {
+ oprot.writeString(struct.fileSystemRootLocation);
+ }
+ if (struct.isSetResourceSpecificCredentialStoreToken()) {
+ oprot.writeString(struct.resourceSpecificCredentialStoreToken);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, StoragePreference struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.storageResourceId = iprot.readString();
+ struct.setStorageResourceIdIsSet(true);
+ BitSet incoming = iprot.readBitSet(3);
+ if (incoming.get(0)) {
+ struct.loginUserName = iprot.readString();
+ struct.setLoginUserNameIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.fileSystemRootLocation = iprot.readString();
+ struct.setFileSystemRootLocationIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.resourceSpecificCredentialStoreToken = iprot.readString();
+ struct.setResourceSpecificCredentialStoreTokenIsSet(true);
+ }
+ }
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
index 01dd216..14a5712 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
@@ -25,20 +25,17 @@ import java.util.*;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.gfac.core.context.ProcessContext;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface;
import org.apache.airavata.model.appcatalog.computeresource.JobSubmissionInterface;
import org.apache.airavata.model.appcatalog.computeresource.UnicoreJobSubmission;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
-import org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference;
+import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.orchestrator.core.OrchestratorConfiguration;
import org.apache.airavata.orchestrator.core.context.OrchestratorContext;
import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
-import org.apache.airavata.registry.core.app.catalog.model.*;
-import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
import org.apache.airavata.registry.cpi.*;
import org.apache.airavata.registry.cpi.ApplicationInterface;
import org.slf4j.Logger;
@@ -110,11 +107,11 @@ public class OrchestratorUtils {
}
}
- public static DataStoragePreference getDateStoragePreference(OrchestratorContext context, ProcessModel processModel, String gatewayId) throws RegistryException {
+ public static StoragePreference getStoragePreference(OrchestratorContext context, ProcessModel processModel, String gatewayId) throws RegistryException {
try {
GwyResourceProfile gatewayProfile = context.getRegistry().getAppCatalog().getGatewayProfile();
String resourceHostId = processModel.getComputeResourceId();
- return gatewayProfile.getDataStoragePreference(gatewayId, resourceHostId);
+ return gatewayProfile.getStoragePreference(gatewayId, resourceHostId);
} catch (AppCatalogException e) {
logger.error("Error occurred while initializing app catalog", e);
throw new RegistryException("Error occurred while initializing app catalog", e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
index a72ebff..925073f 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
@@ -22,8 +22,8 @@
package org.apache.airavata.registry.core.app.catalog.impl;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
-import org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
+import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
import org.apache.airavata.registry.core.app.catalog.resources.*;
import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion;
import org.apache.airavata.registry.cpi.AppCatalogException;
@@ -75,11 +75,11 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
resource.save();
}
}
- List<DataStoragePreference> dataStoragePreferences = gatewayProfile.getDataStoragePreferences();
+ List<StoragePreference> dataStoragePreferences = gatewayProfile.getStoragePreferences();
if (dataStoragePreferences != null && !dataStoragePreferences.isEmpty()){
- for (DataStoragePreference storagePreference : dataStoragePreferences){
- DataStoragePreferenceResource resource = new DataStoragePreferenceResource();
- resource.setDataMoveId(storagePreference.getDataMovememtResourceId());
+ for (StoragePreference storagePreference : dataStoragePreferences){
+ StoragePreferenceResource resource = new StoragePreferenceResource();
+ resource.setStorageResourceId(storagePreference.getStorageResourceId());
resource.setGatewayId(profileResource.getGatewayID());
resource.setFsRootLocation(storagePreference.getFileSystemRootLocation());
resource.setLoginUserName(storagePreference.getLoginUserName());
@@ -128,11 +128,11 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
resource.save();
}
}
- List<DataStoragePreference> dataStoragePreferences = updatedProfile.getDataStoragePreferences();
+ List<StoragePreference> dataStoragePreferences = updatedProfile.getStoragePreferences();
if (dataStoragePreferences != null && !dataStoragePreferences.isEmpty()){
- for (DataStoragePreference storagePreference : dataStoragePreferences){
- DataStoragePreferenceResource resource = new DataStoragePreferenceResource();
- resource.setDataMoveId(storagePreference.getDataMovememtResourceId());
+ for (StoragePreference storagePreference : dataStoragePreferences){
+ StoragePreferenceResource resource = new StoragePreferenceResource();
+ resource.setStorageResourceId(storagePreference.getStorageResourceId());
resource.setGatewayId(profileResource.getGatewayID());
resource.setFsRootLocation(storagePreference.getFileSystemRootLocation());
resource.setLoginUserName(storagePreference.getLoginUserName());
@@ -155,7 +155,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
ComputeHostPreferenceResource prefResource = new ComputeHostPreferenceResource();
List<AppCatalogResource> computePrefList = prefResource.get(AppCatAbstractResource.ComputeResourcePreferenceConstants.GATEWAY_ID, gatewayId);
List<ComputeResourcePreference> computeResourcePreferences = AppCatalogThriftConversion.getComputeResourcePreferences(computePrefList);
- List<DataStoragePreference> dataStoragePreferences = getAllDataStoragePreferences(gatewayId);
+ List<StoragePreference> dataStoragePreferences = getAllStoragePreferences(gatewayId);
return AppCatalogThriftConversion.getGatewayResourceProfile(gwresource, computeResourcePreferences, dataStoragePreferences);
}catch (Exception e) {
logger.error("Error while retrieving gateway profile...", e);
@@ -193,10 +193,10 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
@Override
public boolean removeDataStoragePreferenceFromGateway(String gatewayId, String preferenceId) throws AppCatalogException {
try {
- DataStoragePreferenceResource resource = new DataStoragePreferenceResource();
+ StoragePreferenceResource resource = new StoragePreferenceResource();
Map<String, String> ids = new HashMap<String, String>();
- ids.put(AppCatAbstractResource.DataStoragePreferenceConstants.GATEWAY_ID, gatewayId);
- ids.put(AppCatAbstractResource.DataStoragePreferenceConstants.DATA_MOVEMENT_ID, preferenceId);
+ ids.put(AppCatAbstractResource.StoragePreferenceConstants.GATEWAY_ID, gatewayId);
+ ids.put(AppCatAbstractResource.StoragePreferenceConstants.STORAGE_ID, preferenceId);
resource.remove(ids);
return true;
}catch (Exception e) {
@@ -242,14 +242,14 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
}
@Override
- public DataStoragePreference getDataStoragePreference(String gatewayId, String dataMoveId) throws AppCatalogException {
+ public StoragePreference getStoragePreference(String gatewayId, String dataMoveId) throws AppCatalogException {
try {
- DataStoragePreferenceResource prefResource = new DataStoragePreferenceResource();
+ StoragePreferenceResource prefResource = new StoragePreferenceResource();
List<AppCatalogResource> computePrefList = prefResource.get(AppCatAbstractResource.ComputeResourcePreferenceConstants.GATEWAY_ID, gatewayId);
for (AppCatalogResource resource : computePrefList){
- DataStoragePreferenceResource dsP = (DataStoragePreferenceResource) resource;
- if (dsP.getDataMoveId() != null && !dsP.getDataMoveId().equals("")){
- if (dsP.getDataMoveId().equals(dataMoveId)){
+ StoragePreferenceResource dsP = (StoragePreferenceResource) resource;
+ if (dsP.getStorageResourceId() != null && !dsP.getStorageResourceId().equals("")){
+ if (dsP.getStorageResourceId().equals(dataMoveId)){
return AppCatalogThriftConversion.getDataStoragePreference(dsP);
}
}
@@ -278,10 +278,10 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
}
@Override
- public List<DataStoragePreference> getAllDataStoragePreferences(String gatewayId) throws AppCatalogException {
+ public List<StoragePreference> getAllStoragePreferences(String gatewayId) throws AppCatalogException {
try {
- DataStoragePreferenceResource prefResource = new DataStoragePreferenceResource();
- List<AppCatalogResource> dataStoragePrefList = prefResource.get(AppCatAbstractResource.DataStoragePreferenceConstants.GATEWAY_ID, gatewayId);
+ StoragePreferenceResource prefResource = new StoragePreferenceResource();
+ List<AppCatalogResource> dataStoragePrefList = prefResource.get(AppCatAbstractResource.StoragePreferenceConstants.GATEWAY_ID, gatewayId);
return AppCatalogThriftConversion.getDataStoragePreferences(dataStoragePrefList);
}catch (Exception e) {
logger.error("Error while retrieving data storage preference...", e);
@@ -317,7 +317,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
for (AppCatalogResource resource : resourceList){
GatewayProfileResource gatewayProfileResource = (GatewayProfileResource)resource;
List<ComputeResourcePreference> computeResourcePreferences = getAllComputeResourcePreferences(gatewayProfileResource.getGatewayID());
- List<DataStoragePreference> dataStoragePreferences = getAllDataStoragePreferences(gatewayProfileResource.getGatewayID());
+ List<StoragePreference> dataStoragePreferences = getAllStoragePreferences(gatewayProfileResource.getGatewayID());
GatewayResourceProfile gatewayResourceProfile = AppCatalogThriftConversion.getGatewayResourceProfile(gatewayProfileResource, computeResourcePreferences, dataStoragePreferences);
gatewayResourceProfileList.add(gatewayResourceProfile);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
index 64b9e73..0c3a6be 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/StorageResourceImpl.java
@@ -46,7 +46,7 @@ public class StorageResourceImpl implements StorageResource {
StorageResourceDescription description) throws AppCatalogException {
//TODO remove existing one
StorageResourceResource storageResourceResource = saveStorageResource(description);
- return storageResourceResource.getResourceId();
+ return storageResourceResource.getStorageResourceId();
}
protected StorageResourceResource saveStorageResource(
@@ -176,7 +176,7 @@ public class StorageResourceImpl implements StorageResource {
if (allStorageResources != null && !allStorageResources.isEmpty()){
for (AppCatalogResource sr : allStorageResources){
StorageResourceResource srr = (StorageResourceResource)allStorageResources;
- storageResourceMap.put(srr.getResourceId(), srr.getHostName());
+ storageResourceMap.put(srr.getStorageResourceId(), srr.getHostName());
}
}
return storageResourceMap;
@@ -202,7 +202,7 @@ public class StorageResourceImpl implements StorageResource {
for (AppCatalogResource sr : allStorageResources){
StorageResourceResource srr = (StorageResourceResource)sr;
if(srr.isEnabled()) {
- storageResourceMap.put(srr.getResourceId(), srr.getHostName());
+ storageResourceMap.put(srr.getStorageResourceId(), srr.getHostName());
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageInterface.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageInterface.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageInterface.java
deleted file mode 100644
index 624ba07..0000000
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageInterface.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *
- * 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.registry.core.app.catalog.model;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.sql.Timestamp;
-
-@Entity
-@Table(name = "DATA_STORAGE_INTERFACE")
-@IdClass(DataStorageInterface_PK.class)
-public class DataStorageInterface implements Serializable {
-
- @Id
- @Column(name = "STORAGE_RESOURCE_ID")
- private String computeResourceId;
-
- @ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "COMPUTE_RESOURCE_ID")
- private ComputeResource computeResource;
-
- @Column(name = "DATA_MOVEMENT_PROTOCOL")
- private String dataMovementProtocol;
-
- @Id
- @Column(name = "DATA_MOVEMENT_INTERFACE_ID")
- private String dataMovementInterfaceId;
-
- @Column(name = "PRIORITY_ORDER")
- private int priorityOrder;
-
- @Column(name = "CREATION_TIME")
- private Timestamp creationTime;
-
- @Column(name = "UPDATE_TIME")
- private Timestamp updateTime;
-
- public Timestamp getCreationTime() {
- return creationTime;
- }
-
- public void setCreationTime(Timestamp creationTime) {
- this.creationTime = creationTime;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
-
- public String getComputeResourceId() {
- return computeResourceId;
- }
-
- public ComputeResource getComputeResource() {
- return computeResource;
- }
-
- public String getDataMovementProtocol() {
- return dataMovementProtocol;
- }
-
- public String getDataMovementInterfaceId() {
- return dataMovementInterfaceId;
- }
-
- public int getPriorityOrder() {
- return priorityOrder;
- }
-
- public void setComputeResourceId(String computeResourceId) {
- this.computeResourceId=computeResourceId;
- }
-
- public void setComputeResource(ComputeResource computeResource) {
- this.computeResource=computeResource;
- }
-
- public void setDataMovementProtocol(String dataMovementProtocol) {
- this.dataMovementProtocol=dataMovementProtocol;
- }
-
- public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
- this.dataMovementInterfaceId=dataMovementInterfaceId;
- }
-
- public void setPriorityOrder(int priorityOrder) {
- this.priorityOrder=priorityOrder;
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageInterface_PK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageInterface_PK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageInterface_PK.java
deleted file mode 100644
index e1c164e..0000000
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageInterface_PK.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * 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.registry.core.app.catalog.model;
-
-import java.io.Serializable;
-
-public class DataStorageInterface_PK implements Serializable {
- private String storageResourceId;
- private String dataMovementInterfaceId;
- public DataStorageInterface_PK(String storageResourceId, String dataMovementInterfaceId){
- this.storageResourceId = storageResourceId;
- this.dataMovementInterfaceId = dataMovementInterfaceId;
- }
-
- public DataStorageInterface_PK() {
- }
-
- @Override
- public boolean equals(Object o) {
- return false;
- }
-
- @Override
- public int hashCode() {
- return 1;
- }
-
- public String getStorageResourceId() {
- return storageResourceId;
- }
-
- public void setStorageResourceId(String storageResourceId) {
- this.storageResourceId = storageResourceId;
- }
-
- public String getDataMovementInterfaceId() {
- return dataMovementInterfaceId;
- }
-
- public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
- this.dataMovementInterfaceId=dataMovementInterfaceId;
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStoragePreference.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStoragePreference.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStoragePreference.java
deleted file mode 100644
index 601f0db..0000000
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStoragePreference.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *
- * 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.registry.core.app.catalog.model;
-
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "DATA_STORAGE_PREFERENCE")
-@IdClass(DataStoragePreferencePK.class)
-public class DataStoragePreference {
- @Id
- @Column(name = "GATEWAY_ID")
- private String gatewayId;
- @Id
- @Column(name = "DATA_MOVEMENT_ID")
- private String dataMovementId;
- @Column(name = "LOGIN_USERNAME")
- private String loginUserName;
- @Column(name = "FS_ROOT_LOCATION")
- private String fsRootLocation;
- @Column(name = "RESOURCE_CS_TOKEN")
- private String computeResourceCSToken;
-
- @ManyToOne(cascade= CascadeType.MERGE)
- @JoinColumn(name = "GATEWAY_ID")
- private GatewayProfile gatewayProfile;
-
- public String getGatewayId() {
- return gatewayId;
- }
-
- public void setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- }
-
- public GatewayProfile getGatewayProfile() {
- return gatewayProfile;
- }
-
- public void setGatewayProfile(GatewayProfile gatewayProfile) {
- this.gatewayProfile = gatewayProfile;
- }
-
- public String getLoginUserName() {
- return loginUserName;
- }
-
- public void setLoginUserName(String loginUserName) {
- this.loginUserName = loginUserName;
- }
-
- public String getComputeResourceCSToken() {
- return computeResourceCSToken;
- }
-
- public void setComputeResourceCSToken(String computeResourceCSToken) {
- this.computeResourceCSToken = computeResourceCSToken;
- }
-
- public String getDataMovementID() {
- return dataMovementId;
- }
-
- public void setDataMovementID(String dataMovementId) {
- this.dataMovementId = dataMovementId;
- }
-
- public String getFsRootLocation() {
- return fsRootLocation;
- }
-
- public void setFsRootLocation(String fsRootLocation) {
- this.fsRootLocation = fsRootLocation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStoragePreferencePK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStoragePreferencePK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStoragePreferencePK.java
deleted file mode 100644
index b33f221..0000000
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStoragePreferencePK.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *
- * 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.registry.core.app.catalog.model;
-
-import java.io.Serializable;
-
-public class DataStoragePreferencePK implements Serializable {
- private String gatewayId;
- private String dataMovementId;
-
- public DataStoragePreferencePK(String gatewayId, String dataMoveId) {
- this.gatewayId = gatewayId;
- this.dataMovementId = dataMoveId;
- }
-
- public DataStoragePreferencePK() {
- ;
- }
-
- @Override
- public boolean equals(Object o) {
- return false;
- }
-
- @Override
- public int hashCode() {
- return 1;
- }
-
- public String getGatewayId() {
- return gatewayId;
- }
-
- public void setGatewayId(String gatewayId) {
- this.gatewayId = gatewayId;
- }
-
- public String getDataMoveId() {
- return dataMovementId;
- }
-
- public void setDataMoveId(String dataMoveId) {
- this.dataMovementId = dataMoveId;
- }
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java
index 7179360..3ecbe29 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/DataStorageResource.java
@@ -27,7 +27,7 @@ import java.sql.Timestamp;
@Entity
@Table(name = "DATA_STORAGE_INTERFACE")
-@IdClass(DataStorageInterface_PK.class)
+@IdClass(StorageInterface_PK.class)
public class DataStorageResource implements Serializable {
@Id
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageInterface.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageInterface.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageInterface.java
new file mode 100644
index 0000000..f509dfd
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageInterface.java
@@ -0,0 +1,102 @@
+/*
+ *
+ * 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.registry.core.app.catalog.model;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "STORAGE_INTERFACE")
+@IdClass(StorageInterface_PK.class)
+public class StorageInterface implements Serializable {
+
+ @Id
+ @Column(name = "STORAGE_RESOURCE_ID")
+ private String storageResourceId;
+
+ @ManyToOne(cascade = CascadeType.MERGE)
+ @JoinColumn(name = "STORAGE_RESOURCE_ID")
+ private StorageResource storageResource;
+
+ @Column(name = "DATA_MOVEMENT_PROTOCOL")
+ private String dataMovementProtocol;
+
+ @Id
+ @Column(name = "DATA_MOVEMENT_INTERFACE_ID")
+ private String dataMovementInterfaceId;
+
+ @Column(name = "CREATION_TIME")
+ private Timestamp creationTime;
+
+ @Column(name = "UPDATE_TIME")
+ private Timestamp updateTime;
+
+ public Timestamp getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(Timestamp creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ public Timestamp getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Timestamp updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getDataMovementProtocol() {
+ return dataMovementProtocol;
+ }
+
+ public String getDataMovementInterfaceId() {
+ return dataMovementInterfaceId;
+ }
+
+ public void setDataMovementProtocol(String dataMovementProtocol) {
+ this.dataMovementProtocol = dataMovementProtocol;
+ }
+
+ public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
+ this.dataMovementInterfaceId = dataMovementInterfaceId;
+ }
+
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ public StorageResource getStorageResource() {
+ return storageResource;
+ }
+
+ public void setStorageResource(StorageResource storageResource) {
+ this.storageResource = storageResource;
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageInterface_PK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageInterface_PK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageInterface_PK.java
new file mode 100644
index 0000000..def0ba2
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StorageInterface_PK.java
@@ -0,0 +1,62 @@
+/*
+ *
+ * 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.registry.core.app.catalog.model;
+
+import java.io.Serializable;
+
+public class StorageInterface_PK implements Serializable {
+ private String storageResourceId;
+ private String dataMovementInterfaceId;
+ public StorageInterface_PK(String storageResourceId, String dataMovementInterfaceId){
+ this.storageResourceId = storageResourceId;
+ this.dataMovementInterfaceId = dataMovementInterfaceId;
+ }
+
+ public StorageInterface_PK() {
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return 1;
+ }
+
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+
+ public String getDataMovementInterfaceId() {
+ return dataMovementInterfaceId;
+ }
+
+ public void setDataMovementInterfaceId(String dataMovementInterfaceId) {
+ this.dataMovementInterfaceId=dataMovementInterfaceId;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StoragePreference.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StoragePreference.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StoragePreference.java
new file mode 100644
index 0000000..0aafa66
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StoragePreference.java
@@ -0,0 +1,95 @@
+/*
+ *
+ * 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.registry.core.app.catalog.model;
+
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "STORAGE_PREFERENCE")
+@IdClass(StoragePreferencePK.class)
+public class StoragePreference {
+ @Id
+ @Column(name = "GATEWAY_ID")
+ private String gatewayId;
+ @Id
+ @Column(name = "STORAGE_RESOURCE_ID")
+ private String storageResourceId;
+ @Column(name = "LOGIN_USERNAME")
+ private String loginUserName;
+ @Column(name = "FS_ROOT_LOCATION")
+ private String fsRootLocation;
+ @Column(name = "RESOURCE_CS_TOKEN")
+ private String computeResourceCSToken;
+
+ @ManyToOne(cascade= CascadeType.MERGE)
+ @JoinColumn(name = "GATEWAY_ID")
+ private GatewayProfile gatewayProfile;
+
+ public String getGatewayId() {
+ return gatewayId;
+ }
+
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
+ }
+
+ public GatewayProfile getGatewayProfile() {
+ return gatewayProfile;
+ }
+
+ public void setGatewayProfile(GatewayProfile gatewayProfile) {
+ this.gatewayProfile = gatewayProfile;
+ }
+
+ public String getLoginUserName() {
+ return loginUserName;
+ }
+
+ public void setLoginUserName(String loginUserName) {
+ this.loginUserName = loginUserName;
+ }
+
+ public String getComputeResourceCSToken() {
+ return computeResourceCSToken;
+ }
+
+ public void setComputeResourceCSToken(String computeResourceCSToken) {
+ this.computeResourceCSToken = computeResourceCSToken;
+ }
+
+ public String getFsRootLocation() {
+ return fsRootLocation;
+ }
+
+ public void setFsRootLocation(String fsRootLocation) {
+ this.fsRootLocation = fsRootLocation;
+ }
+
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StoragePreferencePK.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StoragePreferencePK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StoragePreferencePK.java
new file mode 100644
index 0000000..aff3912
--- /dev/null
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/StoragePreferencePK.java
@@ -0,0 +1,64 @@
+/*
+ *
+ * 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.registry.core.app.catalog.model;
+
+import java.io.Serializable;
+
+public class StoragePreferencePK implements Serializable {
+ private String gatewayId;
+ private String storageResourceId;
+
+ public StoragePreferencePK(String gatewayId, String storageResourceId) {
+ this.gatewayId = gatewayId;
+ this.storageResourceId = storageResourceId;
+ }
+
+ public StoragePreferencePK() {
+ ;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return 1;
+ }
+
+ public String getGatewayId() {
+ return gatewayId;
+ }
+
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
+ }
+
+ public String getStorageResourceId() {
+ return storageResourceId;
+ }
+
+ public void setStorageResourceId(String storageResourceId) {
+ this.storageResourceId = storageResourceId;
+ }
+}
[6/8] airavata git commit: adding data storage interfaces
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/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 8fa23b8..9f2099a 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
@@ -35350,11 +35350,11 @@ uint32_t Airavata_addGatewayComputeResourcePreference_presult::read(::apache::th
}
-Airavata_addGatewayDataStoragePreference_args::~Airavata_addGatewayDataStoragePreference_args() throw() {
+Airavata_addGatewayStoragePreference_args::~Airavata_addGatewayStoragePreference_args() throw() {
}
-uint32_t Airavata_addGatewayDataStoragePreference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addGatewayStoragePreference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -35368,7 +35368,7 @@ uint32_t Airavata_addGatewayDataStoragePreference_args::read(::apache::thrift::p
bool isset_authzToken = false;
bool isset_gatewayID = false;
bool isset_dataMoveId = false;
- bool isset_dataStoragePreference = false;
+ bool isset_storagePreference = false;
while (true)
{
@@ -35404,8 +35404,8 @@ uint32_t Airavata_addGatewayDataStoragePreference_args::read(::apache::thrift::p
break;
case 4:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->dataStoragePreference.read(iprot);
- isset_dataStoragePreference = true;
+ xfer += this->storagePreference.read(iprot);
+ isset_storagePreference = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -35425,15 +35425,15 @@ uint32_t Airavata_addGatewayDataStoragePreference_args::read(::apache::thrift::p
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_dataMoveId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_dataStoragePreference)
+ if (!isset_storagePreference)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_addGatewayDataStoragePreference_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addGatewayStoragePreference_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_addGatewayDataStoragePreference_args");
+ xfer += oprot->writeStructBegin("Airavata_addGatewayStoragePreference_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -35447,8 +35447,8 @@ uint32_t Airavata_addGatewayDataStoragePreference_args::write(::apache::thrift::
xfer += oprot->writeString(this->dataMoveId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("dataStoragePreference", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->dataStoragePreference.write(oprot);
+ xfer += oprot->writeFieldBegin("storagePreference", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += this->storagePreference.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -35458,14 +35458,14 @@ uint32_t Airavata_addGatewayDataStoragePreference_args::write(::apache::thrift::
}
-Airavata_addGatewayDataStoragePreference_pargs::~Airavata_addGatewayDataStoragePreference_pargs() throw() {
+Airavata_addGatewayStoragePreference_pargs::~Airavata_addGatewayStoragePreference_pargs() throw() {
}
-uint32_t Airavata_addGatewayDataStoragePreference_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addGatewayStoragePreference_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_addGatewayDataStoragePreference_pargs");
+ xfer += oprot->writeStructBegin("Airavata_addGatewayStoragePreference_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -35479,8 +35479,8 @@ uint32_t Airavata_addGatewayDataStoragePreference_pargs::write(::apache::thrift:
xfer += oprot->writeString((*(this->dataMoveId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("dataStoragePreference", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += (*(this->dataStoragePreference)).write(oprot);
+ xfer += oprot->writeFieldBegin("storagePreference", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += (*(this->storagePreference)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -35490,11 +35490,11 @@ uint32_t Airavata_addGatewayDataStoragePreference_pargs::write(::apache::thrift:
}
-Airavata_addGatewayDataStoragePreference_result::~Airavata_addGatewayDataStoragePreference_result() throw() {
+Airavata_addGatewayStoragePreference_result::~Airavata_addGatewayStoragePreference_result() throw() {
}
-uint32_t Airavata_addGatewayDataStoragePreference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addGatewayStoragePreference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -35566,11 +35566,11 @@ uint32_t Airavata_addGatewayDataStoragePreference_result::read(::apache::thrift:
return xfer;
}
-uint32_t Airavata_addGatewayDataStoragePreference_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_addGatewayStoragePreference_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_addGatewayDataStoragePreference_result");
+ xfer += oprot->writeStructBegin("Airavata_addGatewayStoragePreference_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -35599,11 +35599,11 @@ uint32_t Airavata_addGatewayDataStoragePreference_result::write(::apache::thrift
}
-Airavata_addGatewayDataStoragePreference_presult::~Airavata_addGatewayDataStoragePreference_presult() throw() {
+Airavata_addGatewayStoragePreference_presult::~Airavata_addGatewayStoragePreference_presult() throw() {
}
-uint32_t Airavata_addGatewayDataStoragePreference_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_addGatewayStoragePreference_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -35983,11 +35983,11 @@ uint32_t Airavata_getGatewayComputeResourcePreference_presult::read(::apache::th
}
-Airavata_getGatewayDataStoragePreference_args::~Airavata_getGatewayDataStoragePreference_args() throw() {
+Airavata_getGatewayStoragePreference_args::~Airavata_getGatewayStoragePreference_args() throw() {
}
-uint32_t Airavata_getGatewayDataStoragePreference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGatewayStoragePreference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -36052,10 +36052,10 @@ uint32_t Airavata_getGatewayDataStoragePreference_args::read(::apache::thrift::p
return xfer;
}
-uint32_t Airavata_getGatewayDataStoragePreference_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGatewayStoragePreference_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getGatewayDataStoragePreference_args");
+ xfer += oprot->writeStructBegin("Airavata_getGatewayStoragePreference_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -36076,14 +36076,14 @@ uint32_t Airavata_getGatewayDataStoragePreference_args::write(::apache::thrift::
}
-Airavata_getGatewayDataStoragePreference_pargs::~Airavata_getGatewayDataStoragePreference_pargs() throw() {
+Airavata_getGatewayStoragePreference_pargs::~Airavata_getGatewayStoragePreference_pargs() throw() {
}
-uint32_t Airavata_getGatewayDataStoragePreference_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGatewayStoragePreference_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getGatewayDataStoragePreference_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getGatewayStoragePreference_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -36104,11 +36104,11 @@ uint32_t Airavata_getGatewayDataStoragePreference_pargs::write(::apache::thrift:
}
-Airavata_getGatewayDataStoragePreference_result::~Airavata_getGatewayDataStoragePreference_result() throw() {
+Airavata_getGatewayStoragePreference_result::~Airavata_getGatewayStoragePreference_result() throw() {
}
-uint32_t Airavata_getGatewayDataStoragePreference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGatewayStoragePreference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -36180,11 +36180,11 @@ uint32_t Airavata_getGatewayDataStoragePreference_result::read(::apache::thrift:
return xfer;
}
-uint32_t Airavata_getGatewayDataStoragePreference_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getGatewayStoragePreference_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getGatewayDataStoragePreference_result");
+ xfer += oprot->writeStructBegin("Airavata_getGatewayStoragePreference_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRUCT, 0);
@@ -36213,11 +36213,11 @@ uint32_t Airavata_getGatewayDataStoragePreference_result::write(::apache::thrift
}
-Airavata_getGatewayDataStoragePreference_presult::~Airavata_getGatewayDataStoragePreference_presult() throw() {
+Airavata_getGatewayStoragePreference_presult::~Airavata_getGatewayStoragePreference_presult() throw() {
}
-uint32_t Airavata_getGatewayDataStoragePreference_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getGatewayStoragePreference_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -36610,11 +36610,11 @@ uint32_t Airavata_getAllGatewayComputeResourcePreferences_presult::read(::apache
}
-Airavata_getAllGatewayDataStoragePreferences_args::~Airavata_getAllGatewayDataStoragePreferences_args() throw() {
+Airavata_getAllGatewayStoragePreferences_args::~Airavata_getAllGatewayStoragePreferences_args() throw() {
}
-uint32_t Airavata_getAllGatewayDataStoragePreferences_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGatewayStoragePreferences_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -36668,10 +36668,10 @@ uint32_t Airavata_getAllGatewayDataStoragePreferences_args::read(::apache::thrif
return xfer;
}
-uint32_t Airavata_getAllGatewayDataStoragePreferences_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGatewayStoragePreferences_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getAllGatewayDataStoragePreferences_args");
+ xfer += oprot->writeStructBegin("Airavata_getAllGatewayStoragePreferences_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -36688,14 +36688,14 @@ uint32_t Airavata_getAllGatewayDataStoragePreferences_args::write(::apache::thri
}
-Airavata_getAllGatewayDataStoragePreferences_pargs::~Airavata_getAllGatewayDataStoragePreferences_pargs() throw() {
+Airavata_getAllGatewayStoragePreferences_pargs::~Airavata_getAllGatewayStoragePreferences_pargs() throw() {
}
-uint32_t Airavata_getAllGatewayDataStoragePreferences_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGatewayStoragePreferences_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_getAllGatewayDataStoragePreferences_pargs");
+ xfer += oprot->writeStructBegin("Airavata_getAllGatewayStoragePreferences_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -36712,11 +36712,11 @@ uint32_t Airavata_getAllGatewayDataStoragePreferences_pargs::write(::apache::thr
}
-Airavata_getAllGatewayDataStoragePreferences_result::~Airavata_getAllGatewayDataStoragePreferences_result() throw() {
+Airavata_getAllGatewayStoragePreferences_result::~Airavata_getAllGatewayStoragePreferences_result() throw() {
}
-uint32_t Airavata_getAllGatewayDataStoragePreferences_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGatewayStoragePreferences_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -36800,17 +36800,17 @@ uint32_t Airavata_getAllGatewayDataStoragePreferences_result::read(::apache::thr
return xfer;
}
-uint32_t Airavata_getAllGatewayDataStoragePreferences_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_getAllGatewayStoragePreferences_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_getAllGatewayDataStoragePreferences_result");
+ xfer += oprot->writeStructBegin("Airavata_getAllGatewayStoragePreferences_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->success.size()));
- std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> ::const_iterator _iter366;
+ std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> ::const_iterator _iter366;
for (_iter366 = this->success.begin(); _iter366 != this->success.end(); ++_iter366)
{
xfer += (*_iter366).write(oprot);
@@ -36841,11 +36841,11 @@ uint32_t Airavata_getAllGatewayDataStoragePreferences_result::write(::apache::th
}
-Airavata_getAllGatewayDataStoragePreferences_presult::~Airavata_getAllGatewayDataStoragePreferences_presult() throw() {
+Airavata_getAllGatewayStoragePreferences_presult::~Airavata_getAllGatewayStoragePreferences_presult() throw() {
}
-uint32_t Airavata_getAllGatewayDataStoragePreferences_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_getAllGatewayStoragePreferences_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -37557,11 +37557,11 @@ uint32_t Airavata_updateGatewayComputeResourcePreference_presult::read(::apache:
}
-Airavata_updateGatewayDataStoragePreference_args::~Airavata_updateGatewayDataStoragePreference_args() throw() {
+Airavata_updateGatewayStoragePreference_args::~Airavata_updateGatewayStoragePreference_args() throw() {
}
-uint32_t Airavata_updateGatewayDataStoragePreference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGatewayStoragePreference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -37574,8 +37574,8 @@ uint32_t Airavata_updateGatewayDataStoragePreference_args::read(::apache::thrift
bool isset_authzToken = false;
bool isset_gatewayID = false;
- bool isset_dataMoveId = false;
- bool isset_dataStoragePreference = false;
+ bool isset_storageId = false;
+ bool isset_storagePreference = false;
while (true)
{
@@ -37603,16 +37603,16 @@ uint32_t Airavata_updateGatewayDataStoragePreference_args::read(::apache::thrift
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->dataMoveId);
- isset_dataMoveId = true;
+ xfer += iprot->readString(this->storageId);
+ isset_storageId = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 4:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
- xfer += this->dataStoragePreference.read(iprot);
- isset_dataStoragePreference = true;
+ xfer += this->storagePreference.read(iprot);
+ isset_storagePreference = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -37630,17 +37630,17 @@ uint32_t Airavata_updateGatewayDataStoragePreference_args::read(::apache::thrift
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayID)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_dataMoveId)
+ if (!isset_storageId)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_dataStoragePreference)
+ if (!isset_storagePreference)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_updateGatewayDataStoragePreference_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGatewayStoragePreference_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_updateGatewayDataStoragePreference_args");
+ xfer += oprot->writeStructBegin("Airavata_updateGatewayStoragePreference_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -37650,12 +37650,12 @@ uint32_t Airavata_updateGatewayDataStoragePreference_args::write(::apache::thrif
xfer += oprot->writeString(this->gatewayID);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("dataMoveId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->dataMoveId);
+ xfer += oprot->writeFieldBegin("storageId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->storageId);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("dataStoragePreference", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += this->dataStoragePreference.write(oprot);
+ xfer += oprot->writeFieldBegin("storagePreference", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += this->storagePreference.write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -37665,14 +37665,14 @@ uint32_t Airavata_updateGatewayDataStoragePreference_args::write(::apache::thrif
}
-Airavata_updateGatewayDataStoragePreference_pargs::~Airavata_updateGatewayDataStoragePreference_pargs() throw() {
+Airavata_updateGatewayStoragePreference_pargs::~Airavata_updateGatewayStoragePreference_pargs() throw() {
}
-uint32_t Airavata_updateGatewayDataStoragePreference_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGatewayStoragePreference_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_updateGatewayDataStoragePreference_pargs");
+ xfer += oprot->writeStructBegin("Airavata_updateGatewayStoragePreference_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -37682,12 +37682,12 @@ uint32_t Airavata_updateGatewayDataStoragePreference_pargs::write(::apache::thri
xfer += oprot->writeString((*(this->gatewayID)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("dataMoveId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->dataMoveId)));
+ xfer += oprot->writeFieldBegin("storageId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString((*(this->storageId)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("dataStoragePreference", ::apache::thrift::protocol::T_STRUCT, 4);
- xfer += (*(this->dataStoragePreference)).write(oprot);
+ xfer += oprot->writeFieldBegin("storagePreference", ::apache::thrift::protocol::T_STRUCT, 4);
+ xfer += (*(this->storagePreference)).write(oprot);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -37697,11 +37697,11 @@ uint32_t Airavata_updateGatewayDataStoragePreference_pargs::write(::apache::thri
}
-Airavata_updateGatewayDataStoragePreference_result::~Airavata_updateGatewayDataStoragePreference_result() throw() {
+Airavata_updateGatewayStoragePreference_result::~Airavata_updateGatewayStoragePreference_result() throw() {
}
-uint32_t Airavata_updateGatewayDataStoragePreference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGatewayStoragePreference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -37773,11 +37773,11 @@ uint32_t Airavata_updateGatewayDataStoragePreference_result::read(::apache::thri
return xfer;
}
-uint32_t Airavata_updateGatewayDataStoragePreference_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_updateGatewayStoragePreference_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_updateGatewayDataStoragePreference_result");
+ xfer += oprot->writeStructBegin("Airavata_updateGatewayStoragePreference_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -37806,11 +37806,11 @@ uint32_t Airavata_updateGatewayDataStoragePreference_result::write(::apache::thr
}
-Airavata_updateGatewayDataStoragePreference_presult::~Airavata_updateGatewayDataStoragePreference_presult() throw() {
+Airavata_updateGatewayStoragePreference_presult::~Airavata_updateGatewayStoragePreference_presult() throw() {
}
-uint32_t Airavata_updateGatewayDataStoragePreference_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_updateGatewayStoragePreference_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -38190,11 +38190,11 @@ uint32_t Airavata_deleteGatewayComputeResourcePreference_presult::read(::apache:
}
-Airavata_deleteGatewayDataStoragePreference_args::~Airavata_deleteGatewayDataStoragePreference_args() throw() {
+Airavata_deleteGatewayStoragePreference_args::~Airavata_deleteGatewayStoragePreference_args() throw() {
}
-uint32_t Airavata_deleteGatewayDataStoragePreference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteGatewayStoragePreference_args::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -38207,7 +38207,7 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_args::read(::apache::thrift
bool isset_authzToken = false;
bool isset_gatewayID = false;
- bool isset_dataMoveId = false;
+ bool isset_storageId = false;
while (true)
{
@@ -38235,8 +38235,8 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_args::read(::apache::thrift
break;
case 3:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->dataMoveId);
- isset_dataMoveId = true;
+ xfer += iprot->readString(this->storageId);
+ isset_storageId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -38254,15 +38254,15 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_args::read(::apache::thrift
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_gatewayID)
throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_dataMoveId)
+ if (!isset_storageId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
-uint32_t Airavata_deleteGatewayDataStoragePreference_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteGatewayStoragePreference_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_deleteGatewayDataStoragePreference_args");
+ xfer += oprot->writeStructBegin("Airavata_deleteGatewayStoragePreference_args");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += this->authzToken.write(oprot);
@@ -38272,8 +38272,8 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_args::write(::apache::thrif
xfer += oprot->writeString(this->gatewayID);
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("dataMoveId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString(this->dataMoveId);
+ xfer += oprot->writeFieldBegin("storageId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString(this->storageId);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -38283,14 +38283,14 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_args::write(::apache::thrif
}
-Airavata_deleteGatewayDataStoragePreference_pargs::~Airavata_deleteGatewayDataStoragePreference_pargs() throw() {
+Airavata_deleteGatewayStoragePreference_pargs::~Airavata_deleteGatewayStoragePreference_pargs() throw() {
}
-uint32_t Airavata_deleteGatewayDataStoragePreference_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteGatewayStoragePreference_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
oprot->incrementRecursionDepth();
- xfer += oprot->writeStructBegin("Airavata_deleteGatewayDataStoragePreference_pargs");
+ xfer += oprot->writeStructBegin("Airavata_deleteGatewayStoragePreference_pargs");
xfer += oprot->writeFieldBegin("authzToken", ::apache::thrift::protocol::T_STRUCT, 1);
xfer += (*(this->authzToken)).write(oprot);
@@ -38300,8 +38300,8 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_pargs::write(::apache::thri
xfer += oprot->writeString((*(this->gatewayID)));
xfer += oprot->writeFieldEnd();
- xfer += oprot->writeFieldBegin("dataMoveId", ::apache::thrift::protocol::T_STRING, 3);
- xfer += oprot->writeString((*(this->dataMoveId)));
+ xfer += oprot->writeFieldBegin("storageId", ::apache::thrift::protocol::T_STRING, 3);
+ xfer += oprot->writeString((*(this->storageId)));
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
@@ -38311,11 +38311,11 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_pargs::write(::apache::thri
}
-Airavata_deleteGatewayDataStoragePreference_result::~Airavata_deleteGatewayDataStoragePreference_result() throw() {
+Airavata_deleteGatewayStoragePreference_result::~Airavata_deleteGatewayStoragePreference_result() throw() {
}
-uint32_t Airavata_deleteGatewayDataStoragePreference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteGatewayStoragePreference_result::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -38387,11 +38387,11 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_result::read(::apache::thri
return xfer;
}
-uint32_t Airavata_deleteGatewayDataStoragePreference_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
+uint32_t Airavata_deleteGatewayStoragePreference_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
uint32_t xfer = 0;
- xfer += oprot->writeStructBegin("Airavata_deleteGatewayDataStoragePreference_result");
+ xfer += oprot->writeStructBegin("Airavata_deleteGatewayStoragePreference_result");
if (this->__isset.success) {
xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_BOOL, 0);
@@ -38420,11 +38420,11 @@ uint32_t Airavata_deleteGatewayDataStoragePreference_result::write(::apache::thr
}
-Airavata_deleteGatewayDataStoragePreference_presult::~Airavata_deleteGatewayDataStoragePreference_presult() throw() {
+Airavata_deleteGatewayStoragePreference_presult::~Airavata_deleteGatewayStoragePreference_presult() throw() {
}
-uint32_t Airavata_deleteGatewayDataStoragePreference_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
+uint32_t Airavata_deleteGatewayStoragePreference_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
uint32_t xfer = 0;
std::string fname;
@@ -48645,22 +48645,22 @@ bool AiravataClient::recv_addGatewayComputeResourcePreference()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGatewayComputeResourcePreference failed: unknown result");
}
-bool AiravataClient::addGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference)
+bool AiravataClient::addGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference)
{
- send_addGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
- return recv_addGatewayDataStoragePreference();
+ send_addGatewayStoragePreference(authzToken, gatewayID, dataMoveId, storagePreference);
+ return recv_addGatewayStoragePreference();
}
-void AiravataClient::send_addGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference)
+void AiravataClient::send_addGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("addGatewayDataStoragePreference", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("addGatewayStoragePreference", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_addGatewayDataStoragePreference_pargs args;
+ Airavata_addGatewayStoragePreference_pargs args;
args.authzToken = &authzToken;
args.gatewayID = &gatewayID;
args.dataMoveId = &dataMoveId;
- args.dataStoragePreference = &dataStoragePreference;
+ args.storagePreference = &storagePreference;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -48668,7 +48668,7 @@ void AiravataClient::send_addGatewayDataStoragePreference(const ::apache::airav
oprot_->getTransport()->flush();
}
-bool AiravataClient::recv_addGatewayDataStoragePreference()
+bool AiravataClient::recv_addGatewayStoragePreference()
{
int32_t rseqid = 0;
@@ -48688,13 +48688,13 @@ bool AiravataClient::recv_addGatewayDataStoragePreference()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("addGatewayDataStoragePreference") != 0) {
+ if (fname.compare("addGatewayStoragePreference") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
bool _return;
- Airavata_addGatewayDataStoragePreference_presult result;
+ Airavata_addGatewayStoragePreference_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -48715,7 +48715,7 @@ bool AiravataClient::recv_addGatewayDataStoragePreference()
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGatewayDataStoragePreference failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "addGatewayStoragePreference failed: unknown result");
}
void AiravataClient::getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId)
@@ -48790,18 +48790,18 @@ void AiravataClient::recv_getGatewayComputeResourcePreference( ::apache::airavat
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getGatewayComputeResourcePreference failed: unknown result");
}
-void AiravataClient::getGatewayDataStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId)
+void AiravataClient::getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId)
{
- send_getGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId);
- recv_getGatewayDataStoragePreference(_return);
+ send_getGatewayStoragePreference(authzToken, gatewayID, dataMoveId);
+ recv_getGatewayStoragePreference(_return);
}
-void AiravataClient::send_getGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId)
+void AiravataClient::send_getGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getGatewayDataStoragePreference", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getGatewayStoragePreference", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getGatewayDataStoragePreference_pargs args;
+ Airavata_getGatewayStoragePreference_pargs args;
args.authzToken = &authzToken;
args.gatewayID = &gatewayID;
args.dataMoveId = &dataMoveId;
@@ -48812,7 +48812,7 @@ void AiravataClient::send_getGatewayDataStoragePreference(const ::apache::airav
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getGatewayDataStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& _return)
+void AiravataClient::recv_getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return)
{
int32_t rseqid = 0;
@@ -48832,12 +48832,12 @@ void AiravataClient::recv_getGatewayDataStoragePreference( ::apache::airavata::m
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getGatewayDataStoragePreference") != 0) {
+ if (fname.compare("getGatewayStoragePreference") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getGatewayDataStoragePreference_presult result;
+ Airavata_getGatewayStoragePreference_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -48859,7 +48859,7 @@ void AiravataClient::recv_getGatewayDataStoragePreference( ::apache::airavata::m
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getGatewayDataStoragePreference failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getGatewayStoragePreference failed: unknown result");
}
void AiravataClient::getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID)
@@ -48933,18 +48933,18 @@ void AiravataClient::recv_getAllGatewayComputeResourcePreferences(std::vector< :
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllGatewayComputeResourcePreferences failed: unknown result");
}
-void AiravataClient::getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID)
+void AiravataClient::getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID)
{
- send_getAllGatewayDataStoragePreferences(authzToken, gatewayID);
- recv_getAllGatewayDataStoragePreferences(_return);
+ send_getAllGatewayStoragePreferences(authzToken, gatewayID);
+ recv_getAllGatewayStoragePreferences(_return);
}
-void AiravataClient::send_getAllGatewayDataStoragePreferences(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID)
+void AiravataClient::send_getAllGatewayStoragePreferences(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("getAllGatewayDataStoragePreferences", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("getAllGatewayStoragePreferences", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_getAllGatewayDataStoragePreferences_pargs args;
+ Airavata_getAllGatewayStoragePreferences_pargs args;
args.authzToken = &authzToken;
args.gatewayID = &gatewayID;
args.write(oprot_);
@@ -48954,7 +48954,7 @@ void AiravataClient::send_getAllGatewayDataStoragePreferences(const ::apache::a
oprot_->getTransport()->flush();
}
-void AiravataClient::recv_getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return)
+void AiravataClient::recv_getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return)
{
int32_t rseqid = 0;
@@ -48974,12 +48974,12 @@ void AiravataClient::recv_getAllGatewayDataStoragePreferences(std::vector< ::apa
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("getAllGatewayDataStoragePreferences") != 0) {
+ if (fname.compare("getAllGatewayStoragePreferences") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- Airavata_getAllGatewayDataStoragePreferences_presult result;
+ Airavata_getAllGatewayStoragePreferences_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -49001,7 +49001,7 @@ void AiravataClient::recv_getAllGatewayDataStoragePreferences(std::vector< ::apa
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllGatewayDataStoragePreferences failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "getAllGatewayStoragePreferences failed: unknown result");
}
void AiravataClient::getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken)
@@ -49147,22 +49147,22 @@ bool AiravataClient::recv_updateGatewayComputeResourcePreference()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "updateGatewayComputeResourcePreference failed: unknown result");
}
-bool AiravataClient::updateGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference)
+bool AiravataClient::updateGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference)
{
- send_updateGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
- return recv_updateGatewayDataStoragePreference();
+ send_updateGatewayStoragePreference(authzToken, gatewayID, storageId, storagePreference);
+ return recv_updateGatewayStoragePreference();
}
-void AiravataClient::send_updateGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference)
+void AiravataClient::send_updateGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("updateGatewayDataStoragePreference", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("updateGatewayStoragePreference", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_updateGatewayDataStoragePreference_pargs args;
+ Airavata_updateGatewayStoragePreference_pargs args;
args.authzToken = &authzToken;
args.gatewayID = &gatewayID;
- args.dataMoveId = &dataMoveId;
- args.dataStoragePreference = &dataStoragePreference;
+ args.storageId = &storageId;
+ args.storagePreference = &storagePreference;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -49170,7 +49170,7 @@ void AiravataClient::send_updateGatewayDataStoragePreference(const ::apache::ai
oprot_->getTransport()->flush();
}
-bool AiravataClient::recv_updateGatewayDataStoragePreference()
+bool AiravataClient::recv_updateGatewayStoragePreference()
{
int32_t rseqid = 0;
@@ -49190,13 +49190,13 @@ bool AiravataClient::recv_updateGatewayDataStoragePreference()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("updateGatewayDataStoragePreference") != 0) {
+ if (fname.compare("updateGatewayStoragePreference") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
bool _return;
- Airavata_updateGatewayDataStoragePreference_presult result;
+ Airavata_updateGatewayStoragePreference_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -49217,7 +49217,7 @@ bool AiravataClient::recv_updateGatewayDataStoragePreference()
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "updateGatewayDataStoragePreference failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "updateGatewayStoragePreference failed: unknown result");
}
bool AiravataClient::deleteGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId)
@@ -49292,21 +49292,21 @@ bool AiravataClient::recv_deleteGatewayComputeResourcePreference()
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteGatewayComputeResourcePreference failed: unknown result");
}
-bool AiravataClient::deleteGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId)
+bool AiravataClient::deleteGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId)
{
- send_deleteGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId);
- return recv_deleteGatewayDataStoragePreference();
+ send_deleteGatewayStoragePreference(authzToken, gatewayID, storageId);
+ return recv_deleteGatewayStoragePreference();
}
-void AiravataClient::send_deleteGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId)
+void AiravataClient::send_deleteGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId)
{
int32_t cseqid = 0;
- oprot_->writeMessageBegin("deleteGatewayDataStoragePreference", ::apache::thrift::protocol::T_CALL, cseqid);
+ oprot_->writeMessageBegin("deleteGatewayStoragePreference", ::apache::thrift::protocol::T_CALL, cseqid);
- Airavata_deleteGatewayDataStoragePreference_pargs args;
+ Airavata_deleteGatewayStoragePreference_pargs args;
args.authzToken = &authzToken;
args.gatewayID = &gatewayID;
- args.dataMoveId = &dataMoveId;
+ args.storageId = &storageId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -49314,7 +49314,7 @@ void AiravataClient::send_deleteGatewayDataStoragePreference(const ::apache::ai
oprot_->getTransport()->flush();
}
-bool AiravataClient::recv_deleteGatewayDataStoragePreference()
+bool AiravataClient::recv_deleteGatewayStoragePreference()
{
int32_t rseqid = 0;
@@ -49334,13 +49334,13 @@ bool AiravataClient::recv_deleteGatewayDataStoragePreference()
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
- if (fname.compare("deleteGatewayDataStoragePreference") != 0) {
+ if (fname.compare("deleteGatewayStoragePreference") != 0) {
iprot_->skip(::apache::thrift::protocol::T_STRUCT);
iprot_->readMessageEnd();
iprot_->getTransport()->readEnd();
}
bool _return;
- Airavata_deleteGatewayDataStoragePreference_presult result;
+ Airavata_deleteGatewayStoragePreference_presult result;
result.success = &_return;
result.read(iprot_);
iprot_->readMessageEnd();
@@ -49361,7 +49361,7 @@ bool AiravataClient::recv_deleteGatewayDataStoragePreference()
if (result.__isset.ae) {
throw result.ae;
}
- throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteGatewayDataStoragePreference failed: unknown result");
+ throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "deleteGatewayStoragePreference failed: unknown result");
}
void AiravataClient::getAllWorkflows(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId)
@@ -57344,30 +57344,30 @@ void AiravataProcessor::process_addGatewayComputeResourcePreference(int32_t seqi
}
}
-void AiravataProcessor::process_addGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+void AiravataProcessor::process_addGatewayStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
if (this->eventHandler_.get() != NULL) {
- ctx = this->eventHandler_->getContext("Airavata.addGatewayDataStoragePreference", callContext);
+ ctx = this->eventHandler_->getContext("Airavata.addGatewayStoragePreference", callContext);
}
- ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.addGatewayDataStoragePreference");
+ ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.addGatewayStoragePreference");
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preRead(ctx, "Airavata.addGatewayDataStoragePreference");
+ this->eventHandler_->preRead(ctx, "Airavata.addGatewayStoragePreference");
}
- Airavata_addGatewayDataStoragePreference_args args;
+ Airavata_addGatewayStoragePreference_args args;
args.read(iprot);
iprot->readMessageEnd();
uint32_t bytes = iprot->getTransport()->readEnd();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postRead(ctx, "Airavata.addGatewayDataStoragePreference", bytes);
+ this->eventHandler_->postRead(ctx, "Airavata.addGatewayStoragePreference", bytes);
}
- Airavata_addGatewayDataStoragePreference_result result;
+ Airavata_addGatewayStoragePreference_result result;
try {
- result.success = iface_->addGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference);
+ result.success = iface_->addGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.storagePreference);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -57383,11 +57383,11 @@ void AiravataProcessor::process_addGatewayDataStoragePreference(int32_t seqid, :
result.__isset.ae = true;
} catch (const std::exception& e) {
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->handlerError(ctx, "Airavata.addGatewayDataStoragePreference");
+ this->eventHandler_->handlerError(ctx, "Airavata.addGatewayStoragePreference");
}
::apache::thrift::TApplicationException x(e.what());
- oprot->writeMessageBegin("addGatewayDataStoragePreference", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ oprot->writeMessageBegin("addGatewayStoragePreference", ::apache::thrift::protocol::T_EXCEPTION, seqid);
x.write(oprot);
oprot->writeMessageEnd();
oprot->getTransport()->writeEnd();
@@ -57396,17 +57396,17 @@ void AiravataProcessor::process_addGatewayDataStoragePreference(int32_t seqid, :
}
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preWrite(ctx, "Airavata.addGatewayDataStoragePreference");
+ this->eventHandler_->preWrite(ctx, "Airavata.addGatewayStoragePreference");
}
- oprot->writeMessageBegin("addGatewayDataStoragePreference", ::apache::thrift::protocol::T_REPLY, seqid);
+ oprot->writeMessageBegin("addGatewayStoragePreference", ::apache::thrift::protocol::T_REPLY, seqid);
result.write(oprot);
oprot->writeMessageEnd();
bytes = oprot->getTransport()->writeEnd();
oprot->getTransport()->flush();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postWrite(ctx, "Airavata.addGatewayDataStoragePreference", bytes);
+ this->eventHandler_->postWrite(ctx, "Airavata.addGatewayStoragePreference", bytes);
}
}
@@ -57476,30 +57476,30 @@ void AiravataProcessor::process_getGatewayComputeResourcePreference(int32_t seqi
}
}
-void AiravataProcessor::process_getGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+void AiravataProcessor::process_getGatewayStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
if (this->eventHandler_.get() != NULL) {
- ctx = this->eventHandler_->getContext("Airavata.getGatewayDataStoragePreference", callContext);
+ ctx = this->eventHandler_->getContext("Airavata.getGatewayStoragePreference", callContext);
}
- ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getGatewayDataStoragePreference");
+ ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getGatewayStoragePreference");
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preRead(ctx, "Airavata.getGatewayDataStoragePreference");
+ this->eventHandler_->preRead(ctx, "Airavata.getGatewayStoragePreference");
}
- Airavata_getGatewayDataStoragePreference_args args;
+ Airavata_getGatewayStoragePreference_args args;
args.read(iprot);
iprot->readMessageEnd();
uint32_t bytes = iprot->getTransport()->readEnd();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postRead(ctx, "Airavata.getGatewayDataStoragePreference", bytes);
+ this->eventHandler_->postRead(ctx, "Airavata.getGatewayStoragePreference", bytes);
}
- Airavata_getGatewayDataStoragePreference_result result;
+ Airavata_getGatewayStoragePreference_result result;
try {
- iface_->getGatewayDataStoragePreference(result.success, args.authzToken, args.gatewayID, args.dataMoveId);
+ iface_->getGatewayStoragePreference(result.success, args.authzToken, args.gatewayID, args.dataMoveId);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -57515,11 +57515,11 @@ void AiravataProcessor::process_getGatewayDataStoragePreference(int32_t seqid, :
result.__isset.ae = true;
} catch (const std::exception& e) {
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->handlerError(ctx, "Airavata.getGatewayDataStoragePreference");
+ this->eventHandler_->handlerError(ctx, "Airavata.getGatewayStoragePreference");
}
::apache::thrift::TApplicationException x(e.what());
- oprot->writeMessageBegin("getGatewayDataStoragePreference", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ oprot->writeMessageBegin("getGatewayStoragePreference", ::apache::thrift::protocol::T_EXCEPTION, seqid);
x.write(oprot);
oprot->writeMessageEnd();
oprot->getTransport()->writeEnd();
@@ -57528,17 +57528,17 @@ void AiravataProcessor::process_getGatewayDataStoragePreference(int32_t seqid, :
}
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preWrite(ctx, "Airavata.getGatewayDataStoragePreference");
+ this->eventHandler_->preWrite(ctx, "Airavata.getGatewayStoragePreference");
}
- oprot->writeMessageBegin("getGatewayDataStoragePreference", ::apache::thrift::protocol::T_REPLY, seqid);
+ oprot->writeMessageBegin("getGatewayStoragePreference", ::apache::thrift::protocol::T_REPLY, seqid);
result.write(oprot);
oprot->writeMessageEnd();
bytes = oprot->getTransport()->writeEnd();
oprot->getTransport()->flush();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postWrite(ctx, "Airavata.getGatewayDataStoragePreference", bytes);
+ this->eventHandler_->postWrite(ctx, "Airavata.getGatewayStoragePreference", bytes);
}
}
@@ -57608,30 +57608,30 @@ void AiravataProcessor::process_getAllGatewayComputeResourcePreferences(int32_t
}
}
-void AiravataProcessor::process_getAllGatewayDataStoragePreferences(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+void AiravataProcessor::process_getAllGatewayStoragePreferences(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
if (this->eventHandler_.get() != NULL) {
- ctx = this->eventHandler_->getContext("Airavata.getAllGatewayDataStoragePreferences", callContext);
+ ctx = this->eventHandler_->getContext("Airavata.getAllGatewayStoragePreferences", callContext);
}
- ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getAllGatewayDataStoragePreferences");
+ ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.getAllGatewayStoragePreferences");
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preRead(ctx, "Airavata.getAllGatewayDataStoragePreferences");
+ this->eventHandler_->preRead(ctx, "Airavata.getAllGatewayStoragePreferences");
}
- Airavata_getAllGatewayDataStoragePreferences_args args;
+ Airavata_getAllGatewayStoragePreferences_args args;
args.read(iprot);
iprot->readMessageEnd();
uint32_t bytes = iprot->getTransport()->readEnd();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postRead(ctx, "Airavata.getAllGatewayDataStoragePreferences", bytes);
+ this->eventHandler_->postRead(ctx, "Airavata.getAllGatewayStoragePreferences", bytes);
}
- Airavata_getAllGatewayDataStoragePreferences_result result;
+ Airavata_getAllGatewayStoragePreferences_result result;
try {
- iface_->getAllGatewayDataStoragePreferences(result.success, args.authzToken, args.gatewayID);
+ iface_->getAllGatewayStoragePreferences(result.success, args.authzToken, args.gatewayID);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -57647,11 +57647,11 @@ void AiravataProcessor::process_getAllGatewayDataStoragePreferences(int32_t seqi
result.__isset.ae = true;
} catch (const std::exception& e) {
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->handlerError(ctx, "Airavata.getAllGatewayDataStoragePreferences");
+ this->eventHandler_->handlerError(ctx, "Airavata.getAllGatewayStoragePreferences");
}
::apache::thrift::TApplicationException x(e.what());
- oprot->writeMessageBegin("getAllGatewayDataStoragePreferences", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ oprot->writeMessageBegin("getAllGatewayStoragePreferences", ::apache::thrift::protocol::T_EXCEPTION, seqid);
x.write(oprot);
oprot->writeMessageEnd();
oprot->getTransport()->writeEnd();
@@ -57660,17 +57660,17 @@ void AiravataProcessor::process_getAllGatewayDataStoragePreferences(int32_t seqi
}
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preWrite(ctx, "Airavata.getAllGatewayDataStoragePreferences");
+ this->eventHandler_->preWrite(ctx, "Airavata.getAllGatewayStoragePreferences");
}
- oprot->writeMessageBegin("getAllGatewayDataStoragePreferences", ::apache::thrift::protocol::T_REPLY, seqid);
+ oprot->writeMessageBegin("getAllGatewayStoragePreferences", ::apache::thrift::protocol::T_REPLY, seqid);
result.write(oprot);
oprot->writeMessageEnd();
bytes = oprot->getTransport()->writeEnd();
oprot->getTransport()->flush();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postWrite(ctx, "Airavata.getAllGatewayDataStoragePreferences", bytes);
+ this->eventHandler_->postWrite(ctx, "Airavata.getAllGatewayStoragePreferences", bytes);
}
}
@@ -57806,30 +57806,30 @@ void AiravataProcessor::process_updateGatewayComputeResourcePreference(int32_t s
}
}
-void AiravataProcessor::process_updateGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+void AiravataProcessor::process_updateGatewayStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
if (this->eventHandler_.get() != NULL) {
- ctx = this->eventHandler_->getContext("Airavata.updateGatewayDataStoragePreference", callContext);
+ ctx = this->eventHandler_->getContext("Airavata.updateGatewayStoragePreference", callContext);
}
- ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.updateGatewayDataStoragePreference");
+ ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.updateGatewayStoragePreference");
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preRead(ctx, "Airavata.updateGatewayDataStoragePreference");
+ this->eventHandler_->preRead(ctx, "Airavata.updateGatewayStoragePreference");
}
- Airavata_updateGatewayDataStoragePreference_args args;
+ Airavata_updateGatewayStoragePreference_args args;
args.read(iprot);
iprot->readMessageEnd();
uint32_t bytes = iprot->getTransport()->readEnd();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postRead(ctx, "Airavata.updateGatewayDataStoragePreference", bytes);
+ this->eventHandler_->postRead(ctx, "Airavata.updateGatewayStoragePreference", bytes);
}
- Airavata_updateGatewayDataStoragePreference_result result;
+ Airavata_updateGatewayStoragePreference_result result;
try {
- result.success = iface_->updateGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference);
+ result.success = iface_->updateGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId, args.storagePreference);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -57845,11 +57845,11 @@ void AiravataProcessor::process_updateGatewayDataStoragePreference(int32_t seqid
result.__isset.ae = true;
} catch (const std::exception& e) {
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->handlerError(ctx, "Airavata.updateGatewayDataStoragePreference");
+ this->eventHandler_->handlerError(ctx, "Airavata.updateGatewayStoragePreference");
}
::apache::thrift::TApplicationException x(e.what());
- oprot->writeMessageBegin("updateGatewayDataStoragePreference", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ oprot->writeMessageBegin("updateGatewayStoragePreference", ::apache::thrift::protocol::T_EXCEPTION, seqid);
x.write(oprot);
oprot->writeMessageEnd();
oprot->getTransport()->writeEnd();
@@ -57858,17 +57858,17 @@ void AiravataProcessor::process_updateGatewayDataStoragePreference(int32_t seqid
}
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preWrite(ctx, "Airavata.updateGatewayDataStoragePreference");
+ this->eventHandler_->preWrite(ctx, "Airavata.updateGatewayStoragePreference");
}
- oprot->writeMessageBegin("updateGatewayDataStoragePreference", ::apache::thrift::protocol::T_REPLY, seqid);
+ oprot->writeMessageBegin("updateGatewayStoragePreference", ::apache::thrift::protocol::T_REPLY, seqid);
result.write(oprot);
oprot->writeMessageEnd();
bytes = oprot->getTransport()->writeEnd();
oprot->getTransport()->flush();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postWrite(ctx, "Airavata.updateGatewayDataStoragePreference", bytes);
+ this->eventHandler_->postWrite(ctx, "Airavata.updateGatewayStoragePreference", bytes);
}
}
@@ -57938,30 +57938,30 @@ void AiravataProcessor::process_deleteGatewayComputeResourcePreference(int32_t s
}
}
-void AiravataProcessor::process_deleteGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
+void AiravataProcessor::process_deleteGatewayStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext)
{
void* ctx = NULL;
if (this->eventHandler_.get() != NULL) {
- ctx = this->eventHandler_->getContext("Airavata.deleteGatewayDataStoragePreference", callContext);
+ ctx = this->eventHandler_->getContext("Airavata.deleteGatewayStoragePreference", callContext);
}
- ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.deleteGatewayDataStoragePreference");
+ ::apache::thrift::TProcessorContextFreer freer(this->eventHandler_.get(), ctx, "Airavata.deleteGatewayStoragePreference");
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preRead(ctx, "Airavata.deleteGatewayDataStoragePreference");
+ this->eventHandler_->preRead(ctx, "Airavata.deleteGatewayStoragePreference");
}
- Airavata_deleteGatewayDataStoragePreference_args args;
+ Airavata_deleteGatewayStoragePreference_args args;
args.read(iprot);
iprot->readMessageEnd();
uint32_t bytes = iprot->getTransport()->readEnd();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postRead(ctx, "Airavata.deleteGatewayDataStoragePreference", bytes);
+ this->eventHandler_->postRead(ctx, "Airavata.deleteGatewayStoragePreference", bytes);
}
- Airavata_deleteGatewayDataStoragePreference_result result;
+ Airavata_deleteGatewayStoragePreference_result result;
try {
- result.success = iface_->deleteGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId);
+ result.success = iface_->deleteGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId);
result.__isset.success = true;
} catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -57977,11 +57977,11 @@ void AiravataProcessor::process_deleteGatewayDataStoragePreference(int32_t seqid
result.__isset.ae = true;
} catch (const std::exception& e) {
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->handlerError(ctx, "Airavata.deleteGatewayDataStoragePreference");
+ this->eventHandler_->handlerError(ctx, "Airavata.deleteGatewayStoragePreference");
}
::apache::thrift::TApplicationException x(e.what());
- oprot->writeMessageBegin("deleteGatewayDataStoragePreference", ::apache::thrift::protocol::T_EXCEPTION, seqid);
+ oprot->writeMessageBegin("deleteGatewayStoragePreference", ::apache::thrift::protocol::T_EXCEPTION, seqid);
x.write(oprot);
oprot->writeMessageEnd();
oprot->getTransport()->writeEnd();
@@ -57990,17 +57990,17 @@ void AiravataProcessor::process_deleteGatewayDataStoragePreference(int32_t seqid
}
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->preWrite(ctx, "Airavata.deleteGatewayDataStoragePreference");
+ this->eventHandler_->preWrite(ctx, "Airavata.deleteGatewayStoragePreference");
}
- oprot->writeMessageBegin("deleteGatewayDataStoragePreference", ::apache::thrift::protocol::T_REPLY, seqid);
+ oprot->writeMessageBegin("deleteGatewayStoragePreference", ::apache::thrift::protocol::T_REPLY, seqid);
result.write(oprot);
oprot->writeMessageEnd();
bytes = oprot->getTransport()->writeEnd();
oprot->getTransport()->flush();
if (this->eventHandler_.get() != NULL) {
- this->eventHandler_->postWrite(ctx, "Airavata.deleteGatewayDataStoragePreference", bytes);
+ this->eventHandler_->postWrite(ctx, "Airavata.deleteGatewayStoragePreference", bytes);
}
}
[7/8] airavata git commit: adding data storage interfaces
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/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 a910c4a..e7d3ec6 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
@@ -1790,7 +1790,7 @@ public class Airavata {
*/
public boolean addGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public boolean addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public boolean addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
* Fetch a Compute Resource Preference of a registered gateway profile.
@@ -1811,7 +1811,7 @@ public class Airavata {
*/
public org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
* Fetch all Compute Resource Preferences of a registered gateway profile.
@@ -1828,7 +1828,7 @@ public class Airavata {
*/
public List<org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference> getAllGatewayComputeResourcePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
* Fetch all gateway profiles registered
@@ -1861,7 +1861,7 @@ public class Airavata {
*/
public boolean updateGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public boolean updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public boolean updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
/**
* Delete the Compute Resource Preference of a registered gateway profile.
@@ -1882,7 +1882,7 @@ public class Airavata {
*/
public boolean deleteGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
- public boolean deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+ public boolean deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
public List<String> getAllWorkflows(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
@@ -2128,25 +2128,25 @@ public class Airavata {
public void addGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getAllGatewayComputeResourcePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getAllGatewayResourceProfiles(org.apache.airavata.model.security.AuthzToken authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void updateGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference computeResourcePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void deleteGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void getAllWorkflows(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
@@ -6346,26 +6346,26 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGatewayComputeResourcePreference failed: unknown result");
}
- public boolean addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_addGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
- return recv_addGatewayDataStoragePreference();
+ send_addGatewayStoragePreference(authzToken, gatewayID, dataMoveId, storagePreference);
+ return recv_addGatewayStoragePreference();
}
- public void send_addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.thrift.TException
+ public void send_addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.thrift.TException
{
- addGatewayDataStoragePreference_args args = new addGatewayDataStoragePreference_args();
+ addGatewayStoragePreference_args args = new addGatewayStoragePreference_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
args.setDataMoveId(dataMoveId);
- args.setDataStoragePreference(dataStoragePreference);
- sendBase("addGatewayDataStoragePreference", args);
+ args.setStoragePreference(storagePreference);
+ sendBase("addGatewayStoragePreference", args);
}
- public boolean recv_addGatewayDataStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean recv_addGatewayStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- addGatewayDataStoragePreference_result result = new addGatewayDataStoragePreference_result();
- receiveBase(result, "addGatewayDataStoragePreference");
+ addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
+ receiveBase(result, "addGatewayStoragePreference");
if (result.isSetSuccess()) {
return result.success;
}
@@ -6381,7 +6381,7 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGatewayDataStoragePreference failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addGatewayStoragePreference failed: unknown result");
}
public org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference getGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -6421,25 +6421,25 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGatewayComputeResourcePreference failed: unknown result");
}
- public org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_getGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId);
- return recv_getGatewayDataStoragePreference();
+ send_getGatewayStoragePreference(authzToken, gatewayID, dataMoveId);
+ return recv_getGatewayStoragePreference();
}
- public void send_getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.thrift.TException
+ public void send_getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.thrift.TException
{
- getGatewayDataStoragePreference_args args = new getGatewayDataStoragePreference_args();
+ getGatewayStoragePreference_args args = new getGatewayStoragePreference_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
args.setDataMoveId(dataMoveId);
- sendBase("getGatewayDataStoragePreference", args);
+ sendBase("getGatewayStoragePreference", args);
}
- public org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference recv_getGatewayDataStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference recv_getGatewayStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- getGatewayDataStoragePreference_result result = new getGatewayDataStoragePreference_result();
- receiveBase(result, "getGatewayDataStoragePreference");
+ getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
+ receiveBase(result, "getGatewayStoragePreference");
if (result.isSetSuccess()) {
return result.success;
}
@@ -6455,7 +6455,7 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGatewayDataStoragePreference failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getGatewayStoragePreference failed: unknown result");
}
public List<org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference> getAllGatewayComputeResourcePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -6494,24 +6494,24 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayComputeResourcePreferences failed: unknown result");
}
- public List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_getAllGatewayDataStoragePreferences(authzToken, gatewayID);
- return recv_getAllGatewayDataStoragePreferences();
+ send_getAllGatewayStoragePreferences(authzToken, gatewayID);
+ return recv_getAllGatewayStoragePreferences();
}
- public void send_getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.thrift.TException
+ public void send_getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID) throws org.apache.thrift.TException
{
- getAllGatewayDataStoragePreferences_args args = new getAllGatewayDataStoragePreferences_args();
+ getAllGatewayStoragePreferences_args args = new getAllGatewayStoragePreferences_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
- sendBase("getAllGatewayDataStoragePreferences", args);
+ sendBase("getAllGatewayStoragePreferences", args);
}
- public List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> recv_getAllGatewayDataStoragePreferences() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> recv_getAllGatewayStoragePreferences() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- getAllGatewayDataStoragePreferences_result result = new getAllGatewayDataStoragePreferences_result();
- receiveBase(result, "getAllGatewayDataStoragePreferences");
+ getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
+ receiveBase(result, "getAllGatewayStoragePreferences");
if (result.isSetSuccess()) {
return result.success;
}
@@ -6527,7 +6527,7 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayDataStoragePreferences failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllGatewayStoragePreferences failed: unknown result");
}
public List<org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile> getAllGatewayResourceProfiles(org.apache.airavata.model.security.AuthzToken authzToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -6603,26 +6603,26 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateGatewayComputeResourcePreference failed: unknown result");
}
- public boolean updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_updateGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
- return recv_updateGatewayDataStoragePreference();
+ send_updateGatewayStoragePreference(authzToken, gatewayID, storageId, storagePreference);
+ return recv_updateGatewayStoragePreference();
}
- public void send_updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference) throws org.apache.thrift.TException
+ public void send_updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference) throws org.apache.thrift.TException
{
- updateGatewayDataStoragePreference_args args = new updateGatewayDataStoragePreference_args();
+ updateGatewayStoragePreference_args args = new updateGatewayStoragePreference_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
- args.setDataMoveId(dataMoveId);
- args.setDataStoragePreference(dataStoragePreference);
- sendBase("updateGatewayDataStoragePreference", args);
+ args.setStorageId(storageId);
+ args.setStoragePreference(storagePreference);
+ sendBase("updateGatewayStoragePreference", args);
}
- public boolean recv_updateGatewayDataStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean recv_updateGatewayStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- updateGatewayDataStoragePreference_result result = new updateGatewayDataStoragePreference_result();
- receiveBase(result, "updateGatewayDataStoragePreference");
+ updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
+ receiveBase(result, "updateGatewayStoragePreference");
if (result.isSetSuccess()) {
return result.success;
}
@@ -6638,7 +6638,7 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateGatewayDataStoragePreference failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateGatewayStoragePreference failed: unknown result");
}
public boolean deleteGatewayComputeResourcePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String computeResourceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -6678,25 +6678,25 @@ public class Airavata {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteGatewayComputeResourcePreference failed: unknown result");
}
- public boolean deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- send_deleteGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId);
- return recv_deleteGatewayDataStoragePreference();
+ send_deleteGatewayStoragePreference(authzToken, gatewayID, storageId);
+ return recv_deleteGatewayStoragePreference();
}
- public void send_deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId) throws org.apache.thrift.TException
+ public void send_deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId) throws org.apache.thrift.TException
{
- deleteGatewayDataStoragePreference_args args = new deleteGatewayDataStoragePreference_args();
+ deleteGatewayStoragePreference_args args = new deleteGatewayStoragePreference_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
- args.setDataMoveId(dataMoveId);
- sendBase("deleteGatewayDataStoragePreference", args);
+ args.setStorageId(storageId);
+ sendBase("deleteGatewayStoragePreference", args);
}
- public boolean recv_deleteGatewayDataStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+ public boolean recv_deleteGatewayStoragePreference() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
{
- deleteGatewayDataStoragePreference_result result = new deleteGatewayDataStoragePreference_result();
- receiveBase(result, "deleteGatewayDataStoragePreference");
+ deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
+ receiveBase(result, "deleteGatewayStoragePreference");
if (result.isSetSuccess()) {
return result.success;
}
@@ -6712,7 +6712,7 @@ public class Airavata {
if (result.ae != null) {
throw result.ae;
}
- throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteGatewayDataStoragePreference failed: unknown result");
+ throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteGatewayStoragePreference failed: unknown result");
}
public List<String> getAllWorkflows(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
@@ -11218,33 +11218,33 @@ public class Airavata {
}
}
- public void addGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void addGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- addGatewayDataStoragePreference_call method_call = new addGatewayDataStoragePreference_call(authzToken, gatewayID, dataMoveId, dataStoragePreference, resultHandler, this, ___protocolFactory, ___transport);
+ addGatewayStoragePreference_call method_call = new addGatewayStoragePreference_call(authzToken, gatewayID, dataMoveId, storagePreference, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class addGatewayDataStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
+ public static class addGatewayStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String gatewayID;
private String dataMoveId;
- private org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference;
- public addGatewayDataStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, 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 {
+ private org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference;
+ public addGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, 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.authzToken = authzToken;
this.gatewayID = gatewayID;
this.dataMoveId = dataMoveId;
- this.dataStoragePreference = dataStoragePreference;
+ this.storagePreference = storagePreference;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGatewayDataStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
- addGatewayDataStoragePreference_args args = new addGatewayDataStoragePreference_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addGatewayStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ addGatewayStoragePreference_args args = new addGatewayStoragePreference_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
args.setDataMoveId(dataMoveId);
- args.setDataStoragePreference(dataStoragePreference);
+ args.setStoragePreference(storagePreference);
args.write(prot);
prot.writeMessageEnd();
}
@@ -11255,7 +11255,7 @@ public class Airavata {
}
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_addGatewayDataStoragePreference();
+ return (new Client(prot)).recv_addGatewayStoragePreference();
}
}
@@ -11297,18 +11297,18 @@ public class Airavata {
}
}
- public void getGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getGatewayDataStoragePreference_call method_call = new getGatewayDataStoragePreference_call(authzToken, gatewayID, dataMoveId, resultHandler, this, ___protocolFactory, ___transport);
+ getGatewayStoragePreference_call method_call = new getGatewayStoragePreference_call(authzToken, gatewayID, dataMoveId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class getGatewayDataStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
+ public static class getGatewayStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String gatewayID;
private String dataMoveId;
- public getGatewayDataStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, 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 {
+ public getGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, 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.authzToken = authzToken;
this.gatewayID = gatewayID;
@@ -11316,8 +11316,8 @@ public class Airavata {
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getGatewayDataStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
- getGatewayDataStoragePreference_args args = new getGatewayDataStoragePreference_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getGatewayStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getGatewayStoragePreference_args args = new getGatewayStoragePreference_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
args.setDataMoveId(dataMoveId);
@@ -11325,13 +11325,13 @@ public class Airavata {
prot.writeMessageEnd();
}
- public org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+ public org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, 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_getGatewayDataStoragePreference();
+ return (new Client(prot)).recv_getGatewayStoragePreference();
}
}
@@ -11370,38 +11370,38 @@ public class Airavata {
}
}
- public void getAllGatewayDataStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getAllGatewayStoragePreferences(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getAllGatewayDataStoragePreferences_call method_call = new getAllGatewayDataStoragePreferences_call(authzToken, gatewayID, resultHandler, this, ___protocolFactory, ___transport);
+ getAllGatewayStoragePreferences_call method_call = new getAllGatewayStoragePreferences_call(authzToken, gatewayID, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class getAllGatewayDataStoragePreferences_call extends org.apache.thrift.async.TAsyncMethodCall {
+ public static class getAllGatewayStoragePreferences_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String gatewayID;
- public getAllGatewayDataStoragePreferences_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, 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 {
+ public getAllGatewayStoragePreferences_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, 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.authzToken = authzToken;
this.gatewayID = gatewayID;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllGatewayDataStoragePreferences", org.apache.thrift.protocol.TMessageType.CALL, 0));
- getAllGatewayDataStoragePreferences_args args = new getAllGatewayDataStoragePreferences_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllGatewayStoragePreferences", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ getAllGatewayStoragePreferences_args args = new getAllGatewayStoragePreferences_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
args.write(prot);
prot.writeMessageEnd();
}
- public List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException {
+ public List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getResult() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, 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_getAllGatewayDataStoragePreferences();
+ return (new Client(prot)).recv_getAllGatewayStoragePreferences();
}
}
@@ -11478,33 +11478,33 @@ public class Airavata {
}
}
- public void updateGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void updateGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- updateGatewayDataStoragePreference_call method_call = new updateGatewayDataStoragePreference_call(authzToken, gatewayID, dataMoveId, dataStoragePreference, resultHandler, this, ___protocolFactory, ___transport);
+ updateGatewayStoragePreference_call method_call = new updateGatewayStoragePreference_call(authzToken, gatewayID, storageId, storagePreference, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class updateGatewayDataStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
+ public static class updateGatewayStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String gatewayID;
- private String dataMoveId;
- private org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference;
- public updateGatewayDataStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference dataStoragePreference, 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 {
+ private String storageId;
+ private org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference;
+ public updateGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference storagePreference, 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.authzToken = authzToken;
this.gatewayID = gatewayID;
- this.dataMoveId = dataMoveId;
- this.dataStoragePreference = dataStoragePreference;
+ this.storageId = storageId;
+ this.storagePreference = storagePreference;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateGatewayDataStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
- updateGatewayDataStoragePreference_args args = new updateGatewayDataStoragePreference_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("updateGatewayStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ updateGatewayStoragePreference_args args = new updateGatewayStoragePreference_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
- args.setDataMoveId(dataMoveId);
- args.setDataStoragePreference(dataStoragePreference);
+ args.setStorageId(storageId);
+ args.setStoragePreference(storagePreference);
args.write(prot);
prot.writeMessageEnd();
}
@@ -11515,7 +11515,7 @@ public class Airavata {
}
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_updateGatewayDataStoragePreference();
+ return (new Client(prot)).recv_updateGatewayStoragePreference();
}
}
@@ -11557,30 +11557,30 @@ public class Airavata {
}
}
- public void deleteGatewayDataStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- deleteGatewayDataStoragePreference_call method_call = new deleteGatewayDataStoragePreference_call(authzToken, gatewayID, dataMoveId, resultHandler, this, ___protocolFactory, ___transport);
+ deleteGatewayStoragePreference_call method_call = new deleteGatewayStoragePreference_call(authzToken, gatewayID, storageId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
- public static class deleteGatewayDataStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
+ public static class deleteGatewayStoragePreference_call extends org.apache.thrift.async.TAsyncMethodCall {
private org.apache.airavata.model.security.AuthzToken authzToken;
private String gatewayID;
- private String dataMoveId;
- public deleteGatewayDataStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String dataMoveId, 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 {
+ private String storageId;
+ public deleteGatewayStoragePreference_call(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayID, String storageId, 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.authzToken = authzToken;
this.gatewayID = gatewayID;
- this.dataMoveId = dataMoveId;
+ this.storageId = storageId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
- prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteGatewayDataStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
- deleteGatewayDataStoragePreference_args args = new deleteGatewayDataStoragePreference_args();
+ prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteGatewayStoragePreference", org.apache.thrift.protocol.TMessageType.CALL, 0));
+ deleteGatewayStoragePreference_args args = new deleteGatewayStoragePreference_args();
args.setAuthzToken(authzToken);
args.setGatewayID(gatewayID);
- args.setDataMoveId(dataMoveId);
+ args.setStorageId(storageId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -11591,7 +11591,7 @@ public class Airavata {
}
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_deleteGatewayDataStoragePreference();
+ return (new Client(prot)).recv_deleteGatewayStoragePreference();
}
}
@@ -11972,16 +11972,16 @@ public class Airavata {
processMap.put("updateGatewayResourceProfile", new updateGatewayResourceProfile());
processMap.put("deleteGatewayResourceProfile", new deleteGatewayResourceProfile());
processMap.put("addGatewayComputeResourcePreference", new addGatewayComputeResourcePreference());
- processMap.put("addGatewayDataStoragePreference", new addGatewayDataStoragePreference());
+ processMap.put("addGatewayStoragePreference", new addGatewayStoragePreference());
processMap.put("getGatewayComputeResourcePreference", new getGatewayComputeResourcePreference());
- processMap.put("getGatewayDataStoragePreference", new getGatewayDataStoragePreference());
+ processMap.put("getGatewayStoragePreference", new getGatewayStoragePreference());
processMap.put("getAllGatewayComputeResourcePreferences", new getAllGatewayComputeResourcePreferences());
- processMap.put("getAllGatewayDataStoragePreferences", new getAllGatewayDataStoragePreferences());
+ processMap.put("getAllGatewayStoragePreferences", new getAllGatewayStoragePreferences());
processMap.put("getAllGatewayResourceProfiles", new getAllGatewayResourceProfiles());
processMap.put("updateGatewayComputeResourcePreference", new updateGatewayComputeResourcePreference());
- processMap.put("updateGatewayDataStoragePreference", new updateGatewayDataStoragePreference());
+ processMap.put("updateGatewayStoragePreference", new updateGatewayStoragePreference());
processMap.put("deleteGatewayComputeResourcePreference", new deleteGatewayComputeResourcePreference());
- processMap.put("deleteGatewayDataStoragePreference", new deleteGatewayDataStoragePreference());
+ processMap.put("deleteGatewayStoragePreference", new deleteGatewayStoragePreference());
processMap.put("getAllWorkflows", new getAllWorkflows());
processMap.put("getWorkflow", new getWorkflow());
processMap.put("deleteWorkflow", new deleteWorkflow());
@@ -15431,23 +15431,23 @@ public class Airavata {
}
}
- public static class addGatewayDataStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGatewayDataStoragePreference_args> {
- public addGatewayDataStoragePreference() {
- super("addGatewayDataStoragePreference");
+ public static class addGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addGatewayStoragePreference_args> {
+ public addGatewayStoragePreference() {
+ super("addGatewayStoragePreference");
}
- public addGatewayDataStoragePreference_args getEmptyArgsInstance() {
- return new addGatewayDataStoragePreference_args();
+ public addGatewayStoragePreference_args getEmptyArgsInstance() {
+ return new addGatewayStoragePreference_args();
}
protected boolean isOneway() {
return false;
}
- public addGatewayDataStoragePreference_result getResult(I iface, addGatewayDataStoragePreference_args args) throws org.apache.thrift.TException {
- addGatewayDataStoragePreference_result result = new addGatewayDataStoragePreference_result();
+ public addGatewayStoragePreference_result getResult(I iface, addGatewayStoragePreference_args args) throws org.apache.thrift.TException {
+ addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
try {
- result.success = iface.addGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference);
+ result.success = iface.addGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.storagePreference);
result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
@@ -15492,23 +15492,23 @@ public class Airavata {
}
}
- public static class getGatewayDataStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayDataStoragePreference_args> {
- public getGatewayDataStoragePreference() {
- super("getGatewayDataStoragePreference");
+ public static class getGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getGatewayStoragePreference_args> {
+ public getGatewayStoragePreference() {
+ super("getGatewayStoragePreference");
}
- public getGatewayDataStoragePreference_args getEmptyArgsInstance() {
- return new getGatewayDataStoragePreference_args();
+ public getGatewayStoragePreference_args getEmptyArgsInstance() {
+ return new getGatewayStoragePreference_args();
}
protected boolean isOneway() {
return false;
}
- public getGatewayDataStoragePreference_result getResult(I iface, getGatewayDataStoragePreference_args args) throws org.apache.thrift.TException {
- getGatewayDataStoragePreference_result result = new getGatewayDataStoragePreference_result();
+ public getGatewayStoragePreference_result getResult(I iface, getGatewayStoragePreference_args args) throws org.apache.thrift.TException {
+ getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
try {
- result.success = iface.getGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId);
+ result.success = iface.getGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -15552,23 +15552,23 @@ public class Airavata {
}
}
- public static class getAllGatewayDataStoragePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayDataStoragePreferences_args> {
- public getAllGatewayDataStoragePreferences() {
- super("getAllGatewayDataStoragePreferences");
+ public static class getAllGatewayStoragePreferences<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllGatewayStoragePreferences_args> {
+ public getAllGatewayStoragePreferences() {
+ super("getAllGatewayStoragePreferences");
}
- public getAllGatewayDataStoragePreferences_args getEmptyArgsInstance() {
- return new getAllGatewayDataStoragePreferences_args();
+ public getAllGatewayStoragePreferences_args getEmptyArgsInstance() {
+ return new getAllGatewayStoragePreferences_args();
}
protected boolean isOneway() {
return false;
}
- public getAllGatewayDataStoragePreferences_result getResult(I iface, getAllGatewayDataStoragePreferences_args args) throws org.apache.thrift.TException {
- getAllGatewayDataStoragePreferences_result result = new getAllGatewayDataStoragePreferences_result();
+ public getAllGatewayStoragePreferences_result getResult(I iface, getAllGatewayStoragePreferences_args args) throws org.apache.thrift.TException {
+ getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
try {
- result.success = iface.getAllGatewayDataStoragePreferences(args.authzToken, args.gatewayID);
+ result.success = iface.getAllGatewayStoragePreferences(args.authzToken, args.gatewayID);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -15643,23 +15643,23 @@ public class Airavata {
}
}
- public static class updateGatewayDataStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayDataStoragePreference_args> {
- public updateGatewayDataStoragePreference() {
- super("updateGatewayDataStoragePreference");
+ public static class updateGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, updateGatewayStoragePreference_args> {
+ public updateGatewayStoragePreference() {
+ super("updateGatewayStoragePreference");
}
- public updateGatewayDataStoragePreference_args getEmptyArgsInstance() {
- return new updateGatewayDataStoragePreference_args();
+ public updateGatewayStoragePreference_args getEmptyArgsInstance() {
+ return new updateGatewayStoragePreference_args();
}
protected boolean isOneway() {
return false;
}
- public updateGatewayDataStoragePreference_result getResult(I iface, updateGatewayDataStoragePreference_args args) throws org.apache.thrift.TException {
- updateGatewayDataStoragePreference_result result = new updateGatewayDataStoragePreference_result();
+ public updateGatewayStoragePreference_result getResult(I iface, updateGatewayStoragePreference_args args) throws org.apache.thrift.TException {
+ updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
try {
- result.success = iface.updateGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference);
+ result.success = iface.updateGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId, args.storagePreference);
result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
@@ -15705,23 +15705,23 @@ public class Airavata {
}
}
- public static class deleteGatewayDataStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayDataStoragePreference_args> {
- public deleteGatewayDataStoragePreference() {
- super("deleteGatewayDataStoragePreference");
+ public static class deleteGatewayStoragePreference<I extends Iface> extends org.apache.thrift.ProcessFunction<I, deleteGatewayStoragePreference_args> {
+ public deleteGatewayStoragePreference() {
+ super("deleteGatewayStoragePreference");
}
- public deleteGatewayDataStoragePreference_args getEmptyArgsInstance() {
- return new deleteGatewayDataStoragePreference_args();
+ public deleteGatewayStoragePreference_args getEmptyArgsInstance() {
+ return new deleteGatewayStoragePreference_args();
}
protected boolean isOneway() {
return false;
}
- public deleteGatewayDataStoragePreference_result getResult(I iface, deleteGatewayDataStoragePreference_args args) throws org.apache.thrift.TException {
- deleteGatewayDataStoragePreference_result result = new deleteGatewayDataStoragePreference_result();
+ public deleteGatewayStoragePreference_result getResult(I iface, deleteGatewayStoragePreference_args args) throws org.apache.thrift.TException {
+ deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
try {
- result.success = iface.deleteGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId);
+ result.success = iface.deleteGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId);
result.setSuccessIsSet(true);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
@@ -16073,16 +16073,16 @@ public class Airavata {
processMap.put("updateGatewayResourceProfile", new updateGatewayResourceProfile());
processMap.put("deleteGatewayResourceProfile", new deleteGatewayResourceProfile());
processMap.put("addGatewayComputeResourcePreference", new addGatewayComputeResourcePreference());
- processMap.put("addGatewayDataStoragePreference", new addGatewayDataStoragePreference());
+ processMap.put("addGatewayStoragePreference", new addGatewayStoragePreference());
processMap.put("getGatewayComputeResourcePreference", new getGatewayComputeResourcePreference());
- processMap.put("getGatewayDataStoragePreference", new getGatewayDataStoragePreference());
+ processMap.put("getGatewayStoragePreference", new getGatewayStoragePreference());
processMap.put("getAllGatewayComputeResourcePreferences", new getAllGatewayComputeResourcePreferences());
- processMap.put("getAllGatewayDataStoragePreferences", new getAllGatewayDataStoragePreferences());
+ processMap.put("getAllGatewayStoragePreferences", new getAllGatewayStoragePreferences());
processMap.put("getAllGatewayResourceProfiles", new getAllGatewayResourceProfiles());
processMap.put("updateGatewayComputeResourcePreference", new updateGatewayComputeResourcePreference());
- processMap.put("updateGatewayDataStoragePreference", new updateGatewayDataStoragePreference());
+ processMap.put("updateGatewayStoragePreference", new updateGatewayStoragePreference());
processMap.put("deleteGatewayComputeResourcePreference", new deleteGatewayComputeResourcePreference());
- processMap.put("deleteGatewayDataStoragePreference", new deleteGatewayDataStoragePreference());
+ processMap.put("deleteGatewayStoragePreference", new deleteGatewayStoragePreference());
processMap.put("getAllWorkflows", new getAllWorkflows());
processMap.put("getWorkflow", new getWorkflow());
processMap.put("deleteWorkflow", new deleteWorkflow());
@@ -24292,20 +24292,20 @@ public class Airavata {
}
}
- public static class addGatewayDataStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGatewayDataStoragePreference_args, Boolean> {
- public addGatewayDataStoragePreference() {
- super("addGatewayDataStoragePreference");
+ public static class addGatewayStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addGatewayStoragePreference_args, Boolean> {
+ public addGatewayStoragePreference() {
+ super("addGatewayStoragePreference");
}
- public addGatewayDataStoragePreference_args getEmptyArgsInstance() {
- return new addGatewayDataStoragePreference_args();
+ public addGatewayStoragePreference_args getEmptyArgsInstance() {
+ return new addGatewayStoragePreference_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) {
- addGatewayDataStoragePreference_result result = new addGatewayDataStoragePreference_result();
+ addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
result.success = o;
result.setSuccessIsSet(true);
try {
@@ -24319,7 +24319,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- addGatewayDataStoragePreference_result result = new addGatewayDataStoragePreference_result();
+ addGatewayStoragePreference_result result = new addGatewayStoragePreference_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -24360,8 +24360,8 @@ public class Airavata {
return false;
}
- public void start(I iface, addGatewayDataStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.addGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference,resultHandler);
+ public void start(I iface, addGatewayStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.addGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.storagePreference,resultHandler);
}
}
@@ -24437,20 +24437,20 @@ public class Airavata {
}
}
- public static class getGatewayDataStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGatewayDataStoragePreference_args, org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> {
- public getGatewayDataStoragePreference() {
- super("getGatewayDataStoragePreference");
+ public static class getGatewayStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getGatewayStoragePreference_args, org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> {
+ public getGatewayStoragePreference() {
+ super("getGatewayStoragePreference");
}
- public getGatewayDataStoragePreference_args getEmptyArgsInstance() {
- return new getGatewayDataStoragePreference_args();
+ public getGatewayStoragePreference_args getEmptyArgsInstance() {
+ return new getGatewayStoragePreference_args();
}
- public AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>() {
- public void onComplete(org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference o) {
- getGatewayDataStoragePreference_result result = new getGatewayDataStoragePreference_result();
+ return new AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>() {
+ public void onComplete(org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference o) {
+ getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -24463,7 +24463,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getGatewayDataStoragePreference_result result = new getGatewayDataStoragePreference_result();
+ getGatewayStoragePreference_result result = new getGatewayStoragePreference_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -24504,8 +24504,8 @@ public class Airavata {
return false;
}
- public void start(I iface, getGatewayDataStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> resultHandler) throws TException {
- iface.getGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId,resultHandler);
+ public void start(I iface, getGatewayStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> resultHandler) throws TException {
+ iface.getGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId,resultHandler);
}
}
@@ -24581,20 +24581,20 @@ public class Airavata {
}
}
- public static class getAllGatewayDataStoragePreferences<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGatewayDataStoragePreferences_args, List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>> {
- public getAllGatewayDataStoragePreferences() {
- super("getAllGatewayDataStoragePreferences");
+ public static class getAllGatewayStoragePreferences<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllGatewayStoragePreferences_args, List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>> {
+ public getAllGatewayStoragePreferences() {
+ super("getAllGatewayStoragePreferences");
}
- public getAllGatewayDataStoragePreferences_args getEmptyArgsInstance() {
- return new getAllGatewayDataStoragePreferences_args();
+ public getAllGatewayStoragePreferences_args getEmptyArgsInstance() {
+ return new getAllGatewayStoragePreferences_args();
}
- public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+ public AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>>() {
- public void onComplete(List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference> o) {
- getAllGatewayDataStoragePreferences_result result = new getAllGatewayDataStoragePreferences_result();
+ return new AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>>() {
+ public void onComplete(List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference> o) {
+ getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
result.success = o;
try {
fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -24607,7 +24607,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- getAllGatewayDataStoragePreferences_result result = new getAllGatewayDataStoragePreferences_result();
+ getAllGatewayStoragePreferences_result result = new getAllGatewayStoragePreferences_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -24648,8 +24648,8 @@ public class Airavata {
return false;
}
- public void start(I iface, getAllGatewayDataStoragePreferences_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference>> resultHandler) throws TException {
- iface.getAllGatewayDataStoragePreferences(args.authzToken, args.gatewayID,resultHandler);
+ public void start(I iface, getAllGatewayStoragePreferences_args args, org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference>> resultHandler) throws TException {
+ iface.getAllGatewayStoragePreferences(args.authzToken, args.gatewayID,resultHandler);
}
}
@@ -24798,20 +24798,20 @@ public class Airavata {
}
}
- public static class updateGatewayDataStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGatewayDataStoragePreference_args, Boolean> {
- public updateGatewayDataStoragePreference() {
- super("updateGatewayDataStoragePreference");
+ public static class updateGatewayStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateGatewayStoragePreference_args, Boolean> {
+ public updateGatewayStoragePreference() {
+ super("updateGatewayStoragePreference");
}
- public updateGatewayDataStoragePreference_args getEmptyArgsInstance() {
- return new updateGatewayDataStoragePreference_args();
+ public updateGatewayStoragePreference_args getEmptyArgsInstance() {
+ return new updateGatewayStoragePreference_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) {
- updateGatewayDataStoragePreference_result result = new updateGatewayDataStoragePreference_result();
+ updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
result.success = o;
result.setSuccessIsSet(true);
try {
@@ -24825,7 +24825,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- updateGatewayDataStoragePreference_result result = new updateGatewayDataStoragePreference_result();
+ updateGatewayStoragePreference_result result = new updateGatewayStoragePreference_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -24866,8 +24866,8 @@ public class Airavata {
return false;
}
- public void start(I iface, updateGatewayDataStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.updateGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference,resultHandler);
+ public void start(I iface, updateGatewayStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.updateGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId, args.storagePreference,resultHandler);
}
}
@@ -24944,20 +24944,20 @@ public class Airavata {
}
}
- public static class deleteGatewayDataStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteGatewayDataStoragePreference_args, Boolean> {
- public deleteGatewayDataStoragePreference() {
- super("deleteGatewayDataStoragePreference");
+ public static class deleteGatewayStoragePreference<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, deleteGatewayStoragePreference_args, Boolean> {
+ public deleteGatewayStoragePreference() {
+ super("deleteGatewayStoragePreference");
}
- public deleteGatewayDataStoragePreference_args getEmptyArgsInstance() {
- return new deleteGatewayDataStoragePreference_args();
+ public deleteGatewayStoragePreference_args getEmptyArgsInstance() {
+ return new deleteGatewayStoragePreference_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) {
- deleteGatewayDataStoragePreference_result result = new deleteGatewayDataStoragePreference_result();
+ deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
result.success = o;
result.setSuccessIsSet(true);
try {
@@ -24971,7 +24971,7 @@ public class Airavata {
public void onError(Exception e) {
byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
org.apache.thrift.TBase msg;
- deleteGatewayDataStoragePreference_result result = new deleteGatewayDataStoragePreference_result();
+ deleteGatewayStoragePreference_result result = new deleteGatewayStoragePreference_result();
if (e instanceof org.apache.airavata.model.error.InvalidRequestException) {
result.ire = (org.apache.airavata.model.error.InvalidRequestException) e;
result.setIreIsSet(true);
@@ -25012,8 +25012,8 @@ public class Airavata {
return false;
}
- public void start(I iface, deleteGatewayDataStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.deleteGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId,resultHandler);
+ public void start(I iface, deleteGatewayStoragePreference_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+ iface.deleteGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId,resultHandler);
}
}
@@ -178045,31 +178045,31 @@ public class Airavata {
}
- public static class addGatewayDataStoragePreference_args implements org.apache.thrift.TBase<addGatewayDataStoragePreference_args, addGatewayDataStoragePreference_args._Fields>, java.io.Serializable, Cloneable, Comparable<addGatewayDataStoragePreference_args> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addGatewayDataStoragePreference_args");
+ public static class addGatewayStoragePreference_args implements org.apache.thrift.TBase<addGatewayStoragePreference_args, addGatewayStoragePreference_args._Fields>, java.io.Serializable, Cloneable, Comparable<addGatewayStoragePreference_args> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addGatewayStoragePreference_args");
private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayID", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField DATA_MOVE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMoveId", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField DATA_STORAGE_PREFERENCE_FIELD_DESC = new org.apache.thrift.protocol.TField("dataStoragePreference", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+ private static final org.apache.thrift.protocol.TField STORAGE_PREFERENCE_FIELD_DESC = new org.apache.thrift.protocol.TField("storagePreference", org.apache.thrift.protocol.TType.STRUCT, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
- schemes.put(StandardScheme.class, new addGatewayDataStoragePreference_argsStandardSchemeFactory());
- schemes.put(TupleScheme.class, new addGatewayDataStoragePreference_argsTupleSchemeFactory());
+ schemes.put(StandardScheme.class, new addGatewayStorage
<TRUNCATED>
[8/8] airavata git commit: adding data storage interfaces
Posted by ch...@apache.org.
adding data storage interfaces
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/13b50f7a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/13b50f7a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/13b50f7a
Branch: refs/heads/develop
Commit: 13b50f7a50ee55439ad7cef5b73978a448b68d3f
Parents: c116140
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Tue Nov 17 19:57:45 2015 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Tue Nov 17 19:57:45 2015 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 34 +-
.../java/org/apache/airavata/api/Airavata.java | 1556 +++++++++---------
.../main/resources/lib/airavata/Airavata.cpp | 434 ++---
.../src/main/resources/lib/airavata/Airavata.h | 464 +++---
.../lib/airavata/Airavata_server.skeleton.cpp | 20 +-
.../gateway_resource_profile_model_types.cpp | 84 +-
.../gateway_resource_profile_model_types.h | 48 +-
.../resources/lib/Airavata/API/Airavata.php | 292 ++--
.../Model/AppCatalog/GatewayProfile/Types.php | 50 +-
.../lib/apache/airavata/api/Airavata-remote | 40 +-
.../lib/apache/airavata/api/Airavata.py | 322 ++--
.../model/appcatalog/gatewayprofile/ttypes.py | 50 +-
.../gatewayprofile/DataStoragePreference.java | 728 --------
.../gatewayprofile/GatewayResourceProfile.java | 152 +-
.../gatewayprofile/StoragePreference.java | 728 ++++++++
.../core/utils/OrchestratorUtils.java | 9 +-
.../catalog/impl/GwyResourceProfileImpl.java | 44 +-
.../app/catalog/impl/StorageResourceImpl.java | 6 +-
.../app/catalog/model/DataStorageInterface.java | 113 --
.../catalog/model/DataStorageInterface_PK.java | 62 -
.../catalog/model/DataStoragePreference.java | 96 --
.../catalog/model/DataStoragePreferencePK.java | 64 -
.../app/catalog/model/DataStorageResource.java | 2 +-
.../app/catalog/model/StorageInterface.java | 102 ++
.../app/catalog/model/StorageInterface_PK.java | 62 +
.../app/catalog/model/StoragePreference.java | 95 ++
.../app/catalog/model/StoragePreferencePK.java | 64 +
.../core/app/catalog/model/StorageResource.java | 56 +-
.../resources/AppCatAbstractResource.java | 33 +-
.../DataStoragePreferenceResource.java | 323 ----
.../resources/StorageInterfaceResource.java | 326 ++++
.../resources/StoragePreferenceResource.java | 322 ++++
.../resources/StorageResourceResource.java | 28 +-
.../app/catalog/util/AppCatalogJPAUtils.java | 48 +-
.../catalog/util/AppCatalogResourceType.java | 5 +-
.../util/AppCatalogThriftConversion.java | 22 +-
.../src/main/resources/META-INF/persistence.xml | 2 +-
.../src/main/resources/appcatalog-derby.sql | 11 +-
.../registry/cpi/GwyResourceProfile.java | 6 +-
.../airavata-api/airavata_api.thrift | 20 +-
.../gateway_resource_profile_model.thrift | 6 +-
41 files changed, 3645 insertions(+), 3284 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/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 ab0e146..cfb754c 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
@@ -41,8 +41,8 @@ import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
-import org.apache.airavata.model.appcatalog.gatewayprofile.DataStoragePreference;
import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile;
+import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference;
import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription;
import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.application.io.OutputDataObjectType;
@@ -67,8 +67,6 @@ import org.apache.airavata.registry.core.app.catalog.resources.*;
import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion;
import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
-import org.apache.airavata.registry.core.experiment.catalog.model.*;
-import org.apache.airavata.registry.core.experiment.catalog.model.Process;
import org.apache.airavata.registry.cpi.*;
import org.apache.airavata.registry.cpi.utils.Constants;
import org.apache.thrift.TException;
@@ -3586,7 +3584,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
@Override
- public boolean addGatewayDataStoragePreference(AuthzToken authzToken, String gatewayID, String dataMoveId, DataStoragePreference dataStoragePreference) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public boolean addGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String dataMoveId, StoragePreference dataStoragePreference) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
if (!isGatewayExistInternal(gatewayID)){
logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -3599,7 +3597,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
GatewayResourceProfile profile = gatewayProfile.getGatewayProfile(gatewayID);
// gatewayProfile.removeGatewayResourceProfile(gatewayID);
- profile.addToDataStoragePreferences(dataStoragePreference);
+ profile.addToStoragePreferences(dataStoragePreference);
gatewayProfile.updateGatewayResourceProfile(gatewayID, profile);
return true;
} catch (AppCatalogException e) {
@@ -3656,7 +3654,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
@Override
- public DataStoragePreference getGatewayDataStoragePreference(AuthzToken authzToken, String gatewayID, String dataMoveId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public StoragePreference getGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String dataMoveId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
if (!isGatewayExistInternal(gatewayID)){
logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -3673,7 +3671,7 @@ public class AiravataServerHandler implements Airavata.Iface {
throw exception;
}
- return gatewayProfile.getDataStoragePreference(gatewayID, dataMoveId);
+ return gatewayProfile.getStoragePreference(gatewayID, dataMoveId);
} catch (AppCatalogException e) {
logger.error(gatewayID, "Error while reading gateway data storage preference...", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -3712,7 +3710,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
@Override
- public List<DataStoragePreference> getAllGatewayDataStoragePreferences(AuthzToken authzToken, String gatewayID) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public List<StoragePreference> getAllGatewayStoragePreferences(AuthzToken authzToken, String gatewayID) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
if (!isGatewayExistInternal(gatewayID)){
logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -3720,7 +3718,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
appCatalog = RegistryFactory.getAppCatalog();
GwyResourceProfile gatewayProfile = appCatalog.getGatewayProfile();
- return gatewayProfile.getGatewayProfile(gatewayID).getDataStoragePreferences();
+ return gatewayProfile.getGatewayProfile(gatewayID).getStoragePreferences();
} catch (AppCatalogException e) {
logger.error(gatewayID, "Error while reading gateway data storage preferences...", e);
AiravataSystemException exception = new AiravataSystemException();
@@ -3793,7 +3791,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
@Override
- public boolean updateGatewayDataStoragePreference(AuthzToken authzToken, String gatewayID, String dataMoveId, DataStoragePreference dataStoragePreference) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public boolean updateGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String storageId, StoragePreference dataStoragePreference) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
if (!isGatewayExistInternal(gatewayID)){
logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -3802,19 +3800,19 @@ public class AiravataServerHandler implements Airavata.Iface {
appCatalog = RegistryFactory.getAppCatalog();
GwyResourceProfile gatewayProfile = appCatalog.getGatewayProfile();
GatewayResourceProfile profile = gatewayProfile.getGatewayProfile(gatewayID);
- List<DataStoragePreference> dataStoragePreferences = profile.getDataStoragePreferences();
- DataStoragePreference preferenceToRemove = null;
- for (DataStoragePreference preference : dataStoragePreferences) {
- if (preference.getDataMovememtResourceId().equals(dataMoveId)){
+ List<StoragePreference> dataStoragePreferences = profile.getStoragePreferences();
+ StoragePreference preferenceToRemove = null;
+ for (StoragePreference preference : dataStoragePreferences) {
+ if (preference.getStorageResourceId().equals(storageId)){
preferenceToRemove=preference;
break;
}
}
if (preferenceToRemove!=null) {
- profile.getDataStoragePreferences().remove(
+ profile.getStoragePreferences().remove(
preferenceToRemove);
}
- profile.getDataStoragePreferences().add(dataStoragePreference);
+ profile.getStoragePreferences().add(dataStoragePreference);
gatewayProfile.updateGatewayResourceProfile(gatewayID, profile);
return true;
} catch (AppCatalogException e) {
@@ -3856,7 +3854,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
@Override
- public boolean deleteGatewayDataStoragePreference(AuthzToken authzToken, String gatewayID, String dataMoveId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
+ public boolean deleteGatewayStoragePreference(AuthzToken authzToken, String gatewayID, String storageId) throws InvalidRequestException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
try {
if (!isGatewayExistInternal(gatewayID)){
logger.error("Gateway does not exist.Please provide a valid gateway id...");
@@ -3864,7 +3862,7 @@ public class AiravataServerHandler implements Airavata.Iface {
}
appCatalog = RegistryFactory.getAppCatalog();
GwyResourceProfile gatewayProfile = appCatalog.getGatewayProfile();
- return gatewayProfile.removeDataStoragePreferenceFromGateway(gatewayID, dataMoveId);
+ return gatewayProfile.removeDataStoragePreferenceFromGateway(gatewayID, storageId);
} catch (AppCatalogException e) {
logger.error(gatewayID, "Error while reading gateway data storage preference...", e);
AiravataSystemException exception = new AiravataSystemException();
[5/8] airavata git commit: adding data storage interfaces
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/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 4b7cd57..2f478fc 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
@@ -1740,7 +1740,7 @@ class AiravataIf {
* @param computeResourcePreference
*/
virtual bool addGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference) = 0;
- virtual bool addGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference) = 0;
+ virtual bool addGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) = 0;
/**
* Fetch a Compute Resource Preference of a registered gateway profile.
@@ -1760,7 +1760,7 @@ class AiravataIf {
* @param computeResourceId
*/
virtual void getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId) = 0;
- virtual void getGatewayDataStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) = 0;
+ virtual void getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) = 0;
/**
* Fetch all Compute Resource Preferences of a registered gateway profile.
@@ -1776,7 +1776,7 @@ class AiravataIf {
* @param gatewayID
*/
virtual void getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) = 0;
- virtual void getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) = 0;
+ virtual void getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) = 0;
/**
* Fetch all gateway profiles registered
@@ -1808,7 +1808,7 @@ class AiravataIf {
* @param computeResourcePreference
*/
virtual bool updateGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference) = 0;
- virtual bool updateGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference) = 0;
+ virtual bool updateGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) = 0;
/**
* Delete the Compute Resource Preference of a registered gateway profile.
@@ -1828,7 +1828,7 @@ class AiravataIf {
* @param computeResourceId
*/
virtual bool deleteGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId) = 0;
- virtual bool deleteGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) = 0;
+ virtual bool deleteGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId) = 0;
virtual void getAllWorkflows(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) = 0;
virtual void getWorkflow( ::Workflow& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) = 0;
virtual void deleteWorkflow(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& workflowTemplateId) = 0;
@@ -2239,20 +2239,20 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
- bool addGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* dataMoveId */, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& /* dataStoragePreference */) {
+ bool addGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* dataMoveId */, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& /* storagePreference */) {
bool _return = false;
return _return;
}
void getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* computeResourceId */) {
return;
}
- void getGatewayDataStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* dataMoveId */) {
+ void getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* dataMoveId */) {
return;
}
void getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */) {
return;
}
- void getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */) {
+ void getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */) {
return;
}
void getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & /* _return */, const ::apache::airavata::model::security::AuthzToken& /* authzToken */) {
@@ -2262,7 +2262,7 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
- bool updateGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* dataMoveId */, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& /* dataStoragePreference */) {
+ bool updateGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* storageId */, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& /* storagePreference */) {
bool _return = false;
return _return;
}
@@ -2270,7 +2270,7 @@ class AiravataNull : virtual public AiravataIf {
bool _return = false;
return _return;
}
- bool deleteGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* dataMoveId */) {
+ bool deleteGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayID */, const std::string& /* storageId */) {
bool _return = false;
return _return;
}
@@ -20059,22 +20059,22 @@ class Airavata_addGatewayComputeResourcePreference_presult {
};
-class Airavata_addGatewayDataStoragePreference_args {
+class Airavata_addGatewayStoragePreference_args {
public:
static const char* ascii_fingerprint; // = "4D5977CE449D5B8E072CED19DFBA2D3F";
static const uint8_t binary_fingerprint[16]; // = {0x4D,0x59,0x77,0xCE,0x44,0x9D,0x5B,0x8E,0x07,0x2C,0xED,0x19,0xDF,0xBA,0x2D,0x3F};
- Airavata_addGatewayDataStoragePreference_args(const Airavata_addGatewayDataStoragePreference_args&);
- Airavata_addGatewayDataStoragePreference_args& operator=(const Airavata_addGatewayDataStoragePreference_args&);
- Airavata_addGatewayDataStoragePreference_args() : gatewayID(), dataMoveId() {
+ Airavata_addGatewayStoragePreference_args(const Airavata_addGatewayStoragePreference_args&);
+ Airavata_addGatewayStoragePreference_args& operator=(const Airavata_addGatewayStoragePreference_args&);
+ Airavata_addGatewayStoragePreference_args() : gatewayID(), dataMoveId() {
}
- virtual ~Airavata_addGatewayDataStoragePreference_args() throw();
+ virtual ~Airavata_addGatewayStoragePreference_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayID;
std::string dataMoveId;
- ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference dataStoragePreference;
+ ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference storagePreference;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
@@ -20082,9 +20082,9 @@ class Airavata_addGatewayDataStoragePreference_args {
void __set_dataMoveId(const std::string& val);
- void __set_dataStoragePreference(const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& val);
+ void __set_storagePreference(const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& val);
- bool operator == (const Airavata_addGatewayDataStoragePreference_args & rhs) const
+ bool operator == (const Airavata_addGatewayStoragePreference_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -20092,69 +20092,69 @@ class Airavata_addGatewayDataStoragePreference_args {
return false;
if (!(dataMoveId == rhs.dataMoveId))
return false;
- if (!(dataStoragePreference == rhs.dataStoragePreference))
+ if (!(storagePreference == rhs.storagePreference))
return false;
return true;
}
- bool operator != (const Airavata_addGatewayDataStoragePreference_args &rhs) const {
+ bool operator != (const Airavata_addGatewayStoragePreference_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_addGatewayDataStoragePreference_args & ) const;
+ bool operator < (const Airavata_addGatewayStoragePreference_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_addGatewayDataStoragePreference_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_addGatewayStoragePreference_args& obj);
};
-class Airavata_addGatewayDataStoragePreference_pargs {
+class Airavata_addGatewayStoragePreference_pargs {
public:
static const char* ascii_fingerprint; // = "4D5977CE449D5B8E072CED19DFBA2D3F";
static const uint8_t binary_fingerprint[16]; // = {0x4D,0x59,0x77,0xCE,0x44,0x9D,0x5B,0x8E,0x07,0x2C,0xED,0x19,0xDF,0xBA,0x2D,0x3F};
- virtual ~Airavata_addGatewayDataStoragePreference_pargs() throw();
+ virtual ~Airavata_addGatewayStoragePreference_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayID;
const std::string* dataMoveId;
- const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference* dataStoragePreference;
+ const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference* storagePreference;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_addGatewayDataStoragePreference_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_addGatewayStoragePreference_pargs& obj);
};
-typedef struct _Airavata_addGatewayDataStoragePreference_result__isset {
- _Airavata_addGatewayDataStoragePreference_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_addGatewayStoragePreference_result__isset {
+ _Airavata_addGatewayStoragePreference_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_addGatewayDataStoragePreference_result__isset;
+} _Airavata_addGatewayStoragePreference_result__isset;
-class Airavata_addGatewayDataStoragePreference_result {
+class Airavata_addGatewayStoragePreference_result {
public:
static const char* ascii_fingerprint; // = "C0679679E26638BE0A41545C2E17B17A";
static const uint8_t binary_fingerprint[16]; // = {0xC0,0x67,0x96,0x79,0xE2,0x66,0x38,0xBE,0x0A,0x41,0x54,0x5C,0x2E,0x17,0xB1,0x7A};
- Airavata_addGatewayDataStoragePreference_result(const Airavata_addGatewayDataStoragePreference_result&);
- Airavata_addGatewayDataStoragePreference_result& operator=(const Airavata_addGatewayDataStoragePreference_result&);
- Airavata_addGatewayDataStoragePreference_result() : success(0) {
+ Airavata_addGatewayStoragePreference_result(const Airavata_addGatewayStoragePreference_result&);
+ Airavata_addGatewayStoragePreference_result& operator=(const Airavata_addGatewayStoragePreference_result&);
+ Airavata_addGatewayStoragePreference_result() : success(0) {
}
- virtual ~Airavata_addGatewayDataStoragePreference_result() throw();
+ virtual ~Airavata_addGatewayStoragePreference_result() throw();
bool success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_addGatewayDataStoragePreference_result__isset __isset;
+ _Airavata_addGatewayStoragePreference_result__isset __isset;
void __set_success(const bool val);
@@ -20166,7 +20166,7 @@ class Airavata_addGatewayDataStoragePreference_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_addGatewayDataStoragePreference_result & rhs) const
+ bool operator == (const Airavata_addGatewayStoragePreference_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -20180,46 +20180,46 @@ class Airavata_addGatewayDataStoragePreference_result {
return false;
return true;
}
- bool operator != (const Airavata_addGatewayDataStoragePreference_result &rhs) const {
+ bool operator != (const Airavata_addGatewayStoragePreference_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_addGatewayDataStoragePreference_result & ) const;
+ bool operator < (const Airavata_addGatewayStoragePreference_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_addGatewayDataStoragePreference_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_addGatewayStoragePreference_result& obj);
};
-typedef struct _Airavata_addGatewayDataStoragePreference_presult__isset {
- _Airavata_addGatewayDataStoragePreference_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_addGatewayStoragePreference_presult__isset {
+ _Airavata_addGatewayStoragePreference_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_addGatewayDataStoragePreference_presult__isset;
+} _Airavata_addGatewayStoragePreference_presult__isset;
-class Airavata_addGatewayDataStoragePreference_presult {
+class Airavata_addGatewayStoragePreference_presult {
public:
static const char* ascii_fingerprint; // = "C0679679E26638BE0A41545C2E17B17A";
static const uint8_t binary_fingerprint[16]; // = {0xC0,0x67,0x96,0x79,0xE2,0x66,0x38,0xBE,0x0A,0x41,0x54,0x5C,0x2E,0x17,0xB1,0x7A};
- virtual ~Airavata_addGatewayDataStoragePreference_presult() throw();
+ virtual ~Airavata_addGatewayStoragePreference_presult() throw();
bool* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_addGatewayDataStoragePreference_presult__isset __isset;
+ _Airavata_addGatewayStoragePreference_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_addGatewayDataStoragePreference_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_addGatewayStoragePreference_presult& obj);
};
@@ -20381,18 +20381,18 @@ class Airavata_getGatewayComputeResourcePreference_presult {
};
-class Airavata_getGatewayDataStoragePreference_args {
+class Airavata_getGatewayStoragePreference_args {
public:
static const char* ascii_fingerprint; // = "1E6476DBB101101BCE4A4B190EDEB468";
static const uint8_t binary_fingerprint[16]; // = {0x1E,0x64,0x76,0xDB,0xB1,0x01,0x10,0x1B,0xCE,0x4A,0x4B,0x19,0x0E,0xDE,0xB4,0x68};
- Airavata_getGatewayDataStoragePreference_args(const Airavata_getGatewayDataStoragePreference_args&);
- Airavata_getGatewayDataStoragePreference_args& operator=(const Airavata_getGatewayDataStoragePreference_args&);
- Airavata_getGatewayDataStoragePreference_args() : gatewayID(), dataMoveId() {
+ Airavata_getGatewayStoragePreference_args(const Airavata_getGatewayStoragePreference_args&);
+ Airavata_getGatewayStoragePreference_args& operator=(const Airavata_getGatewayStoragePreference_args&);
+ Airavata_getGatewayStoragePreference_args() : gatewayID(), dataMoveId() {
}
- virtual ~Airavata_getGatewayDataStoragePreference_args() throw();
+ virtual ~Airavata_getGatewayStoragePreference_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayID;
std::string dataMoveId;
@@ -20403,7 +20403,7 @@ class Airavata_getGatewayDataStoragePreference_args {
void __set_dataMoveId(const std::string& val);
- bool operator == (const Airavata_getGatewayDataStoragePreference_args & rhs) const
+ bool operator == (const Airavata_getGatewayStoragePreference_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -20413,66 +20413,66 @@ class Airavata_getGatewayDataStoragePreference_args {
return false;
return true;
}
- bool operator != (const Airavata_getGatewayDataStoragePreference_args &rhs) const {
+ bool operator != (const Airavata_getGatewayStoragePreference_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getGatewayDataStoragePreference_args & ) const;
+ bool operator < (const Airavata_getGatewayStoragePreference_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getGatewayDataStoragePreference_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getGatewayStoragePreference_args& obj);
};
-class Airavata_getGatewayDataStoragePreference_pargs {
+class Airavata_getGatewayStoragePreference_pargs {
public:
static const char* ascii_fingerprint; // = "1E6476DBB101101BCE4A4B190EDEB468";
static const uint8_t binary_fingerprint[16]; // = {0x1E,0x64,0x76,0xDB,0xB1,0x01,0x10,0x1B,0xCE,0x4A,0x4B,0x19,0x0E,0xDE,0xB4,0x68};
- virtual ~Airavata_getGatewayDataStoragePreference_pargs() throw();
+ virtual ~Airavata_getGatewayStoragePreference_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayID;
const std::string* dataMoveId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getGatewayDataStoragePreference_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getGatewayStoragePreference_pargs& obj);
};
-typedef struct _Airavata_getGatewayDataStoragePreference_result__isset {
- _Airavata_getGatewayDataStoragePreference_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_getGatewayStoragePreference_result__isset {
+ _Airavata_getGatewayStoragePreference_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_getGatewayDataStoragePreference_result__isset;
+} _Airavata_getGatewayStoragePreference_result__isset;
-class Airavata_getGatewayDataStoragePreference_result {
+class Airavata_getGatewayStoragePreference_result {
public:
static const char* ascii_fingerprint; // = "1CD3091B63319C5F9E044C91C5E7D48E";
static const uint8_t binary_fingerprint[16]; // = {0x1C,0xD3,0x09,0x1B,0x63,0x31,0x9C,0x5F,0x9E,0x04,0x4C,0x91,0xC5,0xE7,0xD4,0x8E};
- Airavata_getGatewayDataStoragePreference_result(const Airavata_getGatewayDataStoragePreference_result&);
- Airavata_getGatewayDataStoragePreference_result& operator=(const Airavata_getGatewayDataStoragePreference_result&);
- Airavata_getGatewayDataStoragePreference_result() {
+ Airavata_getGatewayStoragePreference_result(const Airavata_getGatewayStoragePreference_result&);
+ Airavata_getGatewayStoragePreference_result& operator=(const Airavata_getGatewayStoragePreference_result&);
+ Airavata_getGatewayStoragePreference_result() {
}
- virtual ~Airavata_getGatewayDataStoragePreference_result() throw();
- ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference success;
+ virtual ~Airavata_getGatewayStoragePreference_result() throw();
+ ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_getGatewayDataStoragePreference_result__isset __isset;
+ _Airavata_getGatewayStoragePreference_result__isset __isset;
- void __set_success(const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& val);
+ void __set_success(const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -20482,7 +20482,7 @@ class Airavata_getGatewayDataStoragePreference_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_getGatewayDataStoragePreference_result & rhs) const
+ bool operator == (const Airavata_getGatewayStoragePreference_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -20496,46 +20496,46 @@ class Airavata_getGatewayDataStoragePreference_result {
return false;
return true;
}
- bool operator != (const Airavata_getGatewayDataStoragePreference_result &rhs) const {
+ bool operator != (const Airavata_getGatewayStoragePreference_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getGatewayDataStoragePreference_result & ) const;
+ bool operator < (const Airavata_getGatewayStoragePreference_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getGatewayDataStoragePreference_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getGatewayStoragePreference_result& obj);
};
-typedef struct _Airavata_getGatewayDataStoragePreference_presult__isset {
- _Airavata_getGatewayDataStoragePreference_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_getGatewayStoragePreference_presult__isset {
+ _Airavata_getGatewayStoragePreference_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_getGatewayDataStoragePreference_presult__isset;
+} _Airavata_getGatewayStoragePreference_presult__isset;
-class Airavata_getGatewayDataStoragePreference_presult {
+class Airavata_getGatewayStoragePreference_presult {
public:
static const char* ascii_fingerprint; // = "1CD3091B63319C5F9E044C91C5E7D48E";
static const uint8_t binary_fingerprint[16]; // = {0x1C,0xD3,0x09,0x1B,0x63,0x31,0x9C,0x5F,0x9E,0x04,0x4C,0x91,0xC5,0xE7,0xD4,0x8E};
- virtual ~Airavata_getGatewayDataStoragePreference_presult() throw();
- ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference* success;
+ virtual ~Airavata_getGatewayStoragePreference_presult() throw();
+ ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_getGatewayDataStoragePreference_presult__isset __isset;
+ _Airavata_getGatewayStoragePreference_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getGatewayDataStoragePreference_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getGatewayStoragePreference_presult& obj);
};
@@ -20691,18 +20691,18 @@ class Airavata_getAllGatewayComputeResourcePreferences_presult {
};
-class Airavata_getAllGatewayDataStoragePreferences_args {
+class Airavata_getAllGatewayStoragePreferences_args {
public:
static const char* ascii_fingerprint; // = "5C8C4FD14D732E7EC3E0A61A8C24C7FF";
static const uint8_t binary_fingerprint[16]; // = {0x5C,0x8C,0x4F,0xD1,0x4D,0x73,0x2E,0x7E,0xC3,0xE0,0xA6,0x1A,0x8C,0x24,0xC7,0xFF};
- Airavata_getAllGatewayDataStoragePreferences_args(const Airavata_getAllGatewayDataStoragePreferences_args&);
- Airavata_getAllGatewayDataStoragePreferences_args& operator=(const Airavata_getAllGatewayDataStoragePreferences_args&);
- Airavata_getAllGatewayDataStoragePreferences_args() : gatewayID() {
+ Airavata_getAllGatewayStoragePreferences_args(const Airavata_getAllGatewayStoragePreferences_args&);
+ Airavata_getAllGatewayStoragePreferences_args& operator=(const Airavata_getAllGatewayStoragePreferences_args&);
+ Airavata_getAllGatewayStoragePreferences_args() : gatewayID() {
}
- virtual ~Airavata_getAllGatewayDataStoragePreferences_args() throw();
+ virtual ~Airavata_getAllGatewayStoragePreferences_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayID;
@@ -20710,7 +20710,7 @@ class Airavata_getAllGatewayDataStoragePreferences_args {
void __set_gatewayID(const std::string& val);
- bool operator == (const Airavata_getAllGatewayDataStoragePreferences_args & rhs) const
+ bool operator == (const Airavata_getAllGatewayStoragePreferences_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
@@ -20718,65 +20718,65 @@ class Airavata_getAllGatewayDataStoragePreferences_args {
return false;
return true;
}
- bool operator != (const Airavata_getAllGatewayDataStoragePreferences_args &rhs) const {
+ bool operator != (const Airavata_getAllGatewayStoragePreferences_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getAllGatewayDataStoragePreferences_args & ) const;
+ bool operator < (const Airavata_getAllGatewayStoragePreferences_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayDataStoragePreferences_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayStoragePreferences_args& obj);
};
-class Airavata_getAllGatewayDataStoragePreferences_pargs {
+class Airavata_getAllGatewayStoragePreferences_pargs {
public:
static const char* ascii_fingerprint; // = "5C8C4FD14D732E7EC3E0A61A8C24C7FF";
static const uint8_t binary_fingerprint[16]; // = {0x5C,0x8C,0x4F,0xD1,0x4D,0x73,0x2E,0x7E,0xC3,0xE0,0xA6,0x1A,0x8C,0x24,0xC7,0xFF};
- virtual ~Airavata_getAllGatewayDataStoragePreferences_pargs() throw();
+ virtual ~Airavata_getAllGatewayStoragePreferences_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayID;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayDataStoragePreferences_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayStoragePreferences_pargs& obj);
};
-typedef struct _Airavata_getAllGatewayDataStoragePreferences_result__isset {
- _Airavata_getAllGatewayDataStoragePreferences_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_getAllGatewayStoragePreferences_result__isset {
+ _Airavata_getAllGatewayStoragePreferences_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_getAllGatewayDataStoragePreferences_result__isset;
+} _Airavata_getAllGatewayStoragePreferences_result__isset;
-class Airavata_getAllGatewayDataStoragePreferences_result {
+class Airavata_getAllGatewayStoragePreferences_result {
public:
static const char* ascii_fingerprint; // = "797B839022B9DB504CEA88A61463B523";
static const uint8_t binary_fingerprint[16]; // = {0x79,0x7B,0x83,0x90,0x22,0xB9,0xDB,0x50,0x4C,0xEA,0x88,0xA6,0x14,0x63,0xB5,0x23};
- Airavata_getAllGatewayDataStoragePreferences_result(const Airavata_getAllGatewayDataStoragePreferences_result&);
- Airavata_getAllGatewayDataStoragePreferences_result& operator=(const Airavata_getAllGatewayDataStoragePreferences_result&);
- Airavata_getAllGatewayDataStoragePreferences_result() {
+ Airavata_getAllGatewayStoragePreferences_result(const Airavata_getAllGatewayStoragePreferences_result&);
+ Airavata_getAllGatewayStoragePreferences_result& operator=(const Airavata_getAllGatewayStoragePreferences_result&);
+ Airavata_getAllGatewayStoragePreferences_result() {
}
- virtual ~Airavata_getAllGatewayDataStoragePreferences_result() throw();
- std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> success;
+ virtual ~Airavata_getAllGatewayStoragePreferences_result() throw();
+ std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_getAllGatewayDataStoragePreferences_result__isset __isset;
+ _Airavata_getAllGatewayStoragePreferences_result__isset __isset;
- void __set_success(const std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & val);
+ void __set_success(const std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & val);
void __set_ire(const ::apache::airavata::api::error::InvalidRequestException& val);
@@ -20786,7 +20786,7 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_getAllGatewayDataStoragePreferences_result & rhs) const
+ bool operator == (const Airavata_getAllGatewayStoragePreferences_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -20800,46 +20800,46 @@ class Airavata_getAllGatewayDataStoragePreferences_result {
return false;
return true;
}
- bool operator != (const Airavata_getAllGatewayDataStoragePreferences_result &rhs) const {
+ bool operator != (const Airavata_getAllGatewayStoragePreferences_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_getAllGatewayDataStoragePreferences_result & ) const;
+ bool operator < (const Airavata_getAllGatewayStoragePreferences_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayDataStoragePreferences_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayStoragePreferences_result& obj);
};
-typedef struct _Airavata_getAllGatewayDataStoragePreferences_presult__isset {
- _Airavata_getAllGatewayDataStoragePreferences_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_getAllGatewayStoragePreferences_presult__isset {
+ _Airavata_getAllGatewayStoragePreferences_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_getAllGatewayDataStoragePreferences_presult__isset;
+} _Airavata_getAllGatewayStoragePreferences_presult__isset;
-class Airavata_getAllGatewayDataStoragePreferences_presult {
+class Airavata_getAllGatewayStoragePreferences_presult {
public:
static const char* ascii_fingerprint; // = "797B839022B9DB504CEA88A61463B523";
static const uint8_t binary_fingerprint[16]; // = {0x79,0x7B,0x83,0x90,0x22,0xB9,0xDB,0x50,0x4C,0xEA,0x88,0xA6,0x14,0x63,0xB5,0x23};
- virtual ~Airavata_getAllGatewayDataStoragePreferences_presult() throw();
- std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> * success;
+ virtual ~Airavata_getAllGatewayStoragePreferences_presult() throw();
+ std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> * success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_getAllGatewayDataStoragePreferences_presult__isset __isset;
+ _Airavata_getAllGatewayStoragePreferences_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayDataStoragePreferences_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_getAllGatewayStoragePreferences_presult& obj);
};
@@ -21153,102 +21153,102 @@ class Airavata_updateGatewayComputeResourcePreference_presult {
};
-class Airavata_updateGatewayDataStoragePreference_args {
+class Airavata_updateGatewayStoragePreference_args {
public:
static const char* ascii_fingerprint; // = "4D5977CE449D5B8E072CED19DFBA2D3F";
static const uint8_t binary_fingerprint[16]; // = {0x4D,0x59,0x77,0xCE,0x44,0x9D,0x5B,0x8E,0x07,0x2C,0xED,0x19,0xDF,0xBA,0x2D,0x3F};
- Airavata_updateGatewayDataStoragePreference_args(const Airavata_updateGatewayDataStoragePreference_args&);
- Airavata_updateGatewayDataStoragePreference_args& operator=(const Airavata_updateGatewayDataStoragePreference_args&);
- Airavata_updateGatewayDataStoragePreference_args() : gatewayID(), dataMoveId() {
+ Airavata_updateGatewayStoragePreference_args(const Airavata_updateGatewayStoragePreference_args&);
+ Airavata_updateGatewayStoragePreference_args& operator=(const Airavata_updateGatewayStoragePreference_args&);
+ Airavata_updateGatewayStoragePreference_args() : gatewayID(), storageId() {
}
- virtual ~Airavata_updateGatewayDataStoragePreference_args() throw();
+ virtual ~Airavata_updateGatewayStoragePreference_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayID;
- std::string dataMoveId;
- ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference dataStoragePreference;
+ std::string storageId;
+ ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference storagePreference;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
void __set_gatewayID(const std::string& val);
- void __set_dataMoveId(const std::string& val);
+ void __set_storageId(const std::string& val);
- void __set_dataStoragePreference(const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& val);
+ void __set_storagePreference(const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& val);
- bool operator == (const Airavata_updateGatewayDataStoragePreference_args & rhs) const
+ bool operator == (const Airavata_updateGatewayStoragePreference_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
if (!(gatewayID == rhs.gatewayID))
return false;
- if (!(dataMoveId == rhs.dataMoveId))
+ if (!(storageId == rhs.storageId))
return false;
- if (!(dataStoragePreference == rhs.dataStoragePreference))
+ if (!(storagePreference == rhs.storagePreference))
return false;
return true;
}
- bool operator != (const Airavata_updateGatewayDataStoragePreference_args &rhs) const {
+ bool operator != (const Airavata_updateGatewayStoragePreference_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_updateGatewayDataStoragePreference_args & ) const;
+ bool operator < (const Airavata_updateGatewayStoragePreference_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_updateGatewayDataStoragePreference_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_updateGatewayStoragePreference_args& obj);
};
-class Airavata_updateGatewayDataStoragePreference_pargs {
+class Airavata_updateGatewayStoragePreference_pargs {
public:
static const char* ascii_fingerprint; // = "4D5977CE449D5B8E072CED19DFBA2D3F";
static const uint8_t binary_fingerprint[16]; // = {0x4D,0x59,0x77,0xCE,0x44,0x9D,0x5B,0x8E,0x07,0x2C,0xED,0x19,0xDF,0xBA,0x2D,0x3F};
- virtual ~Airavata_updateGatewayDataStoragePreference_pargs() throw();
+ virtual ~Airavata_updateGatewayStoragePreference_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayID;
- const std::string* dataMoveId;
- const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference* dataStoragePreference;
+ const std::string* storageId;
+ const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference* storagePreference;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_updateGatewayDataStoragePreference_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_updateGatewayStoragePreference_pargs& obj);
};
-typedef struct _Airavata_updateGatewayDataStoragePreference_result__isset {
- _Airavata_updateGatewayDataStoragePreference_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_updateGatewayStoragePreference_result__isset {
+ _Airavata_updateGatewayStoragePreference_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_updateGatewayDataStoragePreference_result__isset;
+} _Airavata_updateGatewayStoragePreference_result__isset;
-class Airavata_updateGatewayDataStoragePreference_result {
+class Airavata_updateGatewayStoragePreference_result {
public:
static const char* ascii_fingerprint; // = "C0679679E26638BE0A41545C2E17B17A";
static const uint8_t binary_fingerprint[16]; // = {0xC0,0x67,0x96,0x79,0xE2,0x66,0x38,0xBE,0x0A,0x41,0x54,0x5C,0x2E,0x17,0xB1,0x7A};
- Airavata_updateGatewayDataStoragePreference_result(const Airavata_updateGatewayDataStoragePreference_result&);
- Airavata_updateGatewayDataStoragePreference_result& operator=(const Airavata_updateGatewayDataStoragePreference_result&);
- Airavata_updateGatewayDataStoragePreference_result() : success(0) {
+ Airavata_updateGatewayStoragePreference_result(const Airavata_updateGatewayStoragePreference_result&);
+ Airavata_updateGatewayStoragePreference_result& operator=(const Airavata_updateGatewayStoragePreference_result&);
+ Airavata_updateGatewayStoragePreference_result() : success(0) {
}
- virtual ~Airavata_updateGatewayDataStoragePreference_result() throw();
+ virtual ~Airavata_updateGatewayStoragePreference_result() throw();
bool success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_updateGatewayDataStoragePreference_result__isset __isset;
+ _Airavata_updateGatewayStoragePreference_result__isset __isset;
void __set_success(const bool val);
@@ -21260,7 +21260,7 @@ class Airavata_updateGatewayDataStoragePreference_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_updateGatewayDataStoragePreference_result & rhs) const
+ bool operator == (const Airavata_updateGatewayStoragePreference_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -21274,46 +21274,46 @@ class Airavata_updateGatewayDataStoragePreference_result {
return false;
return true;
}
- bool operator != (const Airavata_updateGatewayDataStoragePreference_result &rhs) const {
+ bool operator != (const Airavata_updateGatewayStoragePreference_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_updateGatewayDataStoragePreference_result & ) const;
+ bool operator < (const Airavata_updateGatewayStoragePreference_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_updateGatewayDataStoragePreference_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_updateGatewayStoragePreference_result& obj);
};
-typedef struct _Airavata_updateGatewayDataStoragePreference_presult__isset {
- _Airavata_updateGatewayDataStoragePreference_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_updateGatewayStoragePreference_presult__isset {
+ _Airavata_updateGatewayStoragePreference_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_updateGatewayDataStoragePreference_presult__isset;
+} _Airavata_updateGatewayStoragePreference_presult__isset;
-class Airavata_updateGatewayDataStoragePreference_presult {
+class Airavata_updateGatewayStoragePreference_presult {
public:
static const char* ascii_fingerprint; // = "C0679679E26638BE0A41545C2E17B17A";
static const uint8_t binary_fingerprint[16]; // = {0xC0,0x67,0x96,0x79,0xE2,0x66,0x38,0xBE,0x0A,0x41,0x54,0x5C,0x2E,0x17,0xB1,0x7A};
- virtual ~Airavata_updateGatewayDataStoragePreference_presult() throw();
+ virtual ~Airavata_updateGatewayStoragePreference_presult() throw();
bool* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_updateGatewayDataStoragePreference_presult__isset __isset;
+ _Airavata_updateGatewayStoragePreference_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_updateGatewayDataStoragePreference_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_updateGatewayStoragePreference_presult& obj);
};
@@ -21475,96 +21475,96 @@ class Airavata_deleteGatewayComputeResourcePreference_presult {
};
-class Airavata_deleteGatewayDataStoragePreference_args {
+class Airavata_deleteGatewayStoragePreference_args {
public:
static const char* ascii_fingerprint; // = "1E6476DBB101101BCE4A4B190EDEB468";
static const uint8_t binary_fingerprint[16]; // = {0x1E,0x64,0x76,0xDB,0xB1,0x01,0x10,0x1B,0xCE,0x4A,0x4B,0x19,0x0E,0xDE,0xB4,0x68};
- Airavata_deleteGatewayDataStoragePreference_args(const Airavata_deleteGatewayDataStoragePreference_args&);
- Airavata_deleteGatewayDataStoragePreference_args& operator=(const Airavata_deleteGatewayDataStoragePreference_args&);
- Airavata_deleteGatewayDataStoragePreference_args() : gatewayID(), dataMoveId() {
+ Airavata_deleteGatewayStoragePreference_args(const Airavata_deleteGatewayStoragePreference_args&);
+ Airavata_deleteGatewayStoragePreference_args& operator=(const Airavata_deleteGatewayStoragePreference_args&);
+ Airavata_deleteGatewayStoragePreference_args() : gatewayID(), storageId() {
}
- virtual ~Airavata_deleteGatewayDataStoragePreference_args() throw();
+ virtual ~Airavata_deleteGatewayStoragePreference_args() throw();
::apache::airavata::model::security::AuthzToken authzToken;
std::string gatewayID;
- std::string dataMoveId;
+ std::string storageId;
void __set_authzToken(const ::apache::airavata::model::security::AuthzToken& val);
void __set_gatewayID(const std::string& val);
- void __set_dataMoveId(const std::string& val);
+ void __set_storageId(const std::string& val);
- bool operator == (const Airavata_deleteGatewayDataStoragePreference_args & rhs) const
+ bool operator == (const Airavata_deleteGatewayStoragePreference_args & rhs) const
{
if (!(authzToken == rhs.authzToken))
return false;
if (!(gatewayID == rhs.gatewayID))
return false;
- if (!(dataMoveId == rhs.dataMoveId))
+ if (!(storageId == rhs.storageId))
return false;
return true;
}
- bool operator != (const Airavata_deleteGatewayDataStoragePreference_args &rhs) const {
+ bool operator != (const Airavata_deleteGatewayStoragePreference_args &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_deleteGatewayDataStoragePreference_args & ) const;
+ bool operator < (const Airavata_deleteGatewayStoragePreference_args & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_deleteGatewayDataStoragePreference_args& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_deleteGatewayStoragePreference_args& obj);
};
-class Airavata_deleteGatewayDataStoragePreference_pargs {
+class Airavata_deleteGatewayStoragePreference_pargs {
public:
static const char* ascii_fingerprint; // = "1E6476DBB101101BCE4A4B190EDEB468";
static const uint8_t binary_fingerprint[16]; // = {0x1E,0x64,0x76,0xDB,0xB1,0x01,0x10,0x1B,0xCE,0x4A,0x4B,0x19,0x0E,0xDE,0xB4,0x68};
- virtual ~Airavata_deleteGatewayDataStoragePreference_pargs() throw();
+ virtual ~Airavata_deleteGatewayStoragePreference_pargs() throw();
const ::apache::airavata::model::security::AuthzToken* authzToken;
const std::string* gatewayID;
- const std::string* dataMoveId;
+ const std::string* storageId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_deleteGatewayDataStoragePreference_pargs& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_deleteGatewayStoragePreference_pargs& obj);
};
-typedef struct _Airavata_deleteGatewayDataStoragePreference_result__isset {
- _Airavata_deleteGatewayDataStoragePreference_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_deleteGatewayStoragePreference_result__isset {
+ _Airavata_deleteGatewayStoragePreference_result__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_deleteGatewayDataStoragePreference_result__isset;
+} _Airavata_deleteGatewayStoragePreference_result__isset;
-class Airavata_deleteGatewayDataStoragePreference_result {
+class Airavata_deleteGatewayStoragePreference_result {
public:
static const char* ascii_fingerprint; // = "C0679679E26638BE0A41545C2E17B17A";
static const uint8_t binary_fingerprint[16]; // = {0xC0,0x67,0x96,0x79,0xE2,0x66,0x38,0xBE,0x0A,0x41,0x54,0x5C,0x2E,0x17,0xB1,0x7A};
- Airavata_deleteGatewayDataStoragePreference_result(const Airavata_deleteGatewayDataStoragePreference_result&);
- Airavata_deleteGatewayDataStoragePreference_result& operator=(const Airavata_deleteGatewayDataStoragePreference_result&);
- Airavata_deleteGatewayDataStoragePreference_result() : success(0) {
+ Airavata_deleteGatewayStoragePreference_result(const Airavata_deleteGatewayStoragePreference_result&);
+ Airavata_deleteGatewayStoragePreference_result& operator=(const Airavata_deleteGatewayStoragePreference_result&);
+ Airavata_deleteGatewayStoragePreference_result() : success(0) {
}
- virtual ~Airavata_deleteGatewayDataStoragePreference_result() throw();
+ virtual ~Airavata_deleteGatewayStoragePreference_result() throw();
bool success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_deleteGatewayDataStoragePreference_result__isset __isset;
+ _Airavata_deleteGatewayStoragePreference_result__isset __isset;
void __set_success(const bool val);
@@ -21576,7 +21576,7 @@ class Airavata_deleteGatewayDataStoragePreference_result {
void __set_ae(const ::apache::airavata::api::error::AuthorizationException& val);
- bool operator == (const Airavata_deleteGatewayDataStoragePreference_result & rhs) const
+ bool operator == (const Airavata_deleteGatewayStoragePreference_result & rhs) const
{
if (!(success == rhs.success))
return false;
@@ -21590,46 +21590,46 @@ class Airavata_deleteGatewayDataStoragePreference_result {
return false;
return true;
}
- bool operator != (const Airavata_deleteGatewayDataStoragePreference_result &rhs) const {
+ bool operator != (const Airavata_deleteGatewayStoragePreference_result &rhs) const {
return !(*this == rhs);
}
- bool operator < (const Airavata_deleteGatewayDataStoragePreference_result & ) const;
+ bool operator < (const Airavata_deleteGatewayStoragePreference_result & ) const;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
- friend std::ostream& operator<<(std::ostream& out, const Airavata_deleteGatewayDataStoragePreference_result& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_deleteGatewayStoragePreference_result& obj);
};
-typedef struct _Airavata_deleteGatewayDataStoragePreference_presult__isset {
- _Airavata_deleteGatewayDataStoragePreference_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
+typedef struct _Airavata_deleteGatewayStoragePreference_presult__isset {
+ _Airavata_deleteGatewayStoragePreference_presult__isset() : success(false), ire(false), ace(false), ase(false), ae(false) {}
bool success :1;
bool ire :1;
bool ace :1;
bool ase :1;
bool ae :1;
-} _Airavata_deleteGatewayDataStoragePreference_presult__isset;
+} _Airavata_deleteGatewayStoragePreference_presult__isset;
-class Airavata_deleteGatewayDataStoragePreference_presult {
+class Airavata_deleteGatewayStoragePreference_presult {
public:
static const char* ascii_fingerprint; // = "C0679679E26638BE0A41545C2E17B17A";
static const uint8_t binary_fingerprint[16]; // = {0xC0,0x67,0x96,0x79,0xE2,0x66,0x38,0xBE,0x0A,0x41,0x54,0x5C,0x2E,0x17,0xB1,0x7A};
- virtual ~Airavata_deleteGatewayDataStoragePreference_presult() throw();
+ virtual ~Airavata_deleteGatewayStoragePreference_presult() throw();
bool* success;
::apache::airavata::api::error::InvalidRequestException ire;
::apache::airavata::api::error::AiravataClientException ace;
::apache::airavata::api::error::AiravataSystemException ase;
::apache::airavata::api::error::AuthorizationException ae;
- _Airavata_deleteGatewayDataStoragePreference_presult__isset __isset;
+ _Airavata_deleteGatewayStoragePreference_presult__isset __isset;
uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
- friend std::ostream& operator<<(std::ostream& out, const Airavata_deleteGatewayDataStoragePreference_presult& obj);
+ friend std::ostream& operator<<(std::ostream& out, const Airavata_deleteGatewayStoragePreference_presult& obj);
};
@@ -23056,36 +23056,36 @@ class AiravataClient : virtual public AiravataIf {
bool addGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference);
void send_addGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference);
bool recv_addGatewayComputeResourcePreference();
- bool addGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference);
- void send_addGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference);
- bool recv_addGatewayDataStoragePreference();
+ bool addGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference);
+ void send_addGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference);
+ bool recv_addGatewayStoragePreference();
void getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId);
void send_getGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId);
void recv_getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return);
- void getGatewayDataStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId);
- void send_getGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId);
- void recv_getGatewayDataStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& _return);
+ void getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId);
+ void send_getGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId);
+ void recv_getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return);
void getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID);
void send_getAllGatewayComputeResourcePreferences(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID);
void recv_getAllGatewayComputeResourcePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference> & _return);
- void getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID);
- void send_getAllGatewayDataStoragePreferences(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID);
- void recv_getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return);
+ void getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID);
+ void send_getAllGatewayStoragePreferences(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID);
+ void recv_getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return);
void getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken);
void send_getAllGatewayResourceProfiles(const ::apache::airavata::model::security::AuthzToken& authzToken);
void recv_getAllGatewayResourceProfiles(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::GatewayResourceProfile> & _return);
bool updateGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference);
void send_updateGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId, const ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& computeResourcePreference);
bool recv_updateGatewayComputeResourcePreference();
- bool updateGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference);
- void send_updateGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference);
- bool recv_updateGatewayDataStoragePreference();
+ bool updateGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference);
+ void send_updateGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference);
+ bool recv_updateGatewayStoragePreference();
bool deleteGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId);
void send_deleteGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId);
bool recv_deleteGatewayComputeResourcePreference();
- bool deleteGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId);
- void send_deleteGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId);
- bool recv_deleteGatewayDataStoragePreference();
+ bool deleteGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId);
+ void send_deleteGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId);
+ bool recv_deleteGatewayStoragePreference();
void getAllWorkflows(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
void send_getAllWorkflows(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId);
void recv_getAllWorkflows(std::vector<std::string> & _return);
@@ -23235,16 +23235,16 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
void process_updateGatewayResourceProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_deleteGatewayResourceProfile(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_addGatewayComputeResourcePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_addGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_addGatewayStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getGatewayComputeResourcePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_getGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_getGatewayStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getAllGatewayComputeResourcePreferences(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_getAllGatewayDataStoragePreferences(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_getAllGatewayStoragePreferences(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getAllGatewayResourceProfiles(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_updateGatewayComputeResourcePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_updateGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_updateGatewayStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_deleteGatewayComputeResourcePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
- void process_deleteGatewayDataStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
+ void process_deleteGatewayStoragePreference(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getAllWorkflows(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_getWorkflow(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
void process_deleteWorkflow(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
@@ -23368,16 +23368,16 @@ class AiravataProcessor : public ::apache::thrift::TDispatchProcessor {
processMap_["updateGatewayResourceProfile"] = &AiravataProcessor::process_updateGatewayResourceProfile;
processMap_["deleteGatewayResourceProfile"] = &AiravataProcessor::process_deleteGatewayResourceProfile;
processMap_["addGatewayComputeResourcePreference"] = &AiravataProcessor::process_addGatewayComputeResourcePreference;
- processMap_["addGatewayDataStoragePreference"] = &AiravataProcessor::process_addGatewayDataStoragePreference;
+ processMap_["addGatewayStoragePreference"] = &AiravataProcessor::process_addGatewayStoragePreference;
processMap_["getGatewayComputeResourcePreference"] = &AiravataProcessor::process_getGatewayComputeResourcePreference;
- processMap_["getGatewayDataStoragePreference"] = &AiravataProcessor::process_getGatewayDataStoragePreference;
+ processMap_["getGatewayStoragePreference"] = &AiravataProcessor::process_getGatewayStoragePreference;
processMap_["getAllGatewayComputeResourcePreferences"] = &AiravataProcessor::process_getAllGatewayComputeResourcePreferences;
- processMap_["getAllGatewayDataStoragePreferences"] = &AiravataProcessor::process_getAllGatewayDataStoragePreferences;
+ processMap_["getAllGatewayStoragePreferences"] = &AiravataProcessor::process_getAllGatewayStoragePreferences;
processMap_["getAllGatewayResourceProfiles"] = &AiravataProcessor::process_getAllGatewayResourceProfiles;
processMap_["updateGatewayComputeResourcePreference"] = &AiravataProcessor::process_updateGatewayComputeResourcePreference;
- processMap_["updateGatewayDataStoragePreference"] = &AiravataProcessor::process_updateGatewayDataStoragePreference;
+ processMap_["updateGatewayStoragePreference"] = &AiravataProcessor::process_updateGatewayStoragePreference;
processMap_["deleteGatewayComputeResourcePreference"] = &AiravataProcessor::process_deleteGatewayComputeResourcePreference;
- processMap_["deleteGatewayDataStoragePreference"] = &AiravataProcessor::process_deleteGatewayDataStoragePreference;
+ processMap_["deleteGatewayStoragePreference"] = &AiravataProcessor::process_deleteGatewayStoragePreference;
processMap_["getAllWorkflows"] = &AiravataProcessor::process_getAllWorkflows;
processMap_["getWorkflow"] = &AiravataProcessor::process_getWorkflow;
processMap_["deleteWorkflow"] = &AiravataProcessor::process_deleteWorkflow;
@@ -24501,13 +24501,13 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->addGatewayComputeResourcePreference(authzToken, gatewayID, computeResourceId, computeResourcePreference);
}
- bool addGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference) {
+ bool addGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->addGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
+ ifaces_[i]->addGatewayStoragePreference(authzToken, gatewayID, dataMoveId, storagePreference);
}
- return ifaces_[i]->addGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
+ return ifaces_[i]->addGatewayStoragePreference(authzToken, gatewayID, dataMoveId, storagePreference);
}
void getGatewayComputeResourcePreference( ::apache::airavata::model::appcatalog::gatewayprofile::ComputeResourcePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId) {
@@ -24520,13 +24520,13 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- void getGatewayDataStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) {
+ void getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->getGatewayDataStoragePreference(_return, authzToken, gatewayID, dataMoveId);
+ ifaces_[i]->getGatewayStoragePreference(_return, authzToken, gatewayID, dataMoveId);
}
- ifaces_[i]->getGatewayDataStoragePreference(_return, authzToken, gatewayID, dataMoveId);
+ ifaces_[i]->getGatewayStoragePreference(_return, authzToken, gatewayID, dataMoveId);
return;
}
@@ -24540,13 +24540,13 @@ class AiravataMultiface : virtual public AiravataIf {
return;
}
- void getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) {
+ void getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->getAllGatewayDataStoragePreferences(_return, authzToken, gatewayID);
+ ifaces_[i]->getAllGatewayStoragePreferences(_return, authzToken, gatewayID);
}
- ifaces_[i]->getAllGatewayDataStoragePreferences(_return, authzToken, gatewayID);
+ ifaces_[i]->getAllGatewayStoragePreferences(_return, authzToken, gatewayID);
return;
}
@@ -24569,13 +24569,13 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->updateGatewayComputeResourcePreference(authzToken, gatewayID, computeResourceId, computeResourcePreference);
}
- bool updateGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference) {
+ bool updateGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->updateGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
+ ifaces_[i]->updateGatewayStoragePreference(authzToken, gatewayID, storageId, storagePreference);
}
- return ifaces_[i]->updateGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference);
+ return ifaces_[i]->updateGatewayStoragePreference(authzToken, gatewayID, storageId, storagePreference);
}
bool deleteGatewayComputeResourcePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& computeResourceId) {
@@ -24587,13 +24587,13 @@ class AiravataMultiface : virtual public AiravataIf {
return ifaces_[i]->deleteGatewayComputeResourcePreference(authzToken, gatewayID, computeResourceId);
}
- bool deleteGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) {
+ bool deleteGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->deleteGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId);
+ ifaces_[i]->deleteGatewayStoragePreference(authzToken, gatewayID, storageId);
}
- return ifaces_[i]->deleteGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId);
+ return ifaces_[i]->deleteGatewayStoragePreference(authzToken, gatewayID, storageId);
}
void getAllWorkflows(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/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 fdc4f8c..126dc38 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
@@ -2112,9 +2112,9 @@ class AiravataHandler : virtual public AiravataIf {
printf("addGatewayComputeResourcePreference\n");
}
- bool addGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference) {
+ bool addGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) {
// Your implementation goes here
- printf("addGatewayDataStoragePreference\n");
+ printf("addGatewayStoragePreference\n");
}
/**
@@ -2139,9 +2139,9 @@ class AiravataHandler : virtual public AiravataIf {
printf("getGatewayComputeResourcePreference\n");
}
- void getGatewayDataStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) {
+ void getGatewayStoragePreference( ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) {
// Your implementation goes here
- printf("getGatewayDataStoragePreference\n");
+ printf("getGatewayStoragePreference\n");
}
/**
@@ -2162,9 +2162,9 @@ class AiravataHandler : virtual public AiravataIf {
printf("getAllGatewayComputeResourcePreferences\n");
}
- void getAllGatewayDataStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) {
+ void getAllGatewayStoragePreferences(std::vector< ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID) {
// Your implementation goes here
- printf("getAllGatewayDataStoragePreferences\n");
+ printf("getAllGatewayStoragePreferences\n");
}
/**
@@ -2204,9 +2204,9 @@ class AiravataHandler : virtual public AiravataIf {
printf("updateGatewayComputeResourcePreference\n");
}
- bool updateGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId, const ::apache::airavata::model::appcatalog::gatewayprofile::DataStoragePreference& dataStoragePreference) {
+ bool updateGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId, const ::apache::airavata::model::appcatalog::gatewayprofile::StoragePreference& storagePreference) {
// Your implementation goes here
- printf("updateGatewayDataStoragePreference\n");
+ printf("updateGatewayStoragePreference\n");
}
/**
@@ -2231,9 +2231,9 @@ class AiravataHandler : virtual public AiravataIf {
printf("deleteGatewayComputeResourcePreference\n");
}
- bool deleteGatewayDataStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& dataMoveId) {
+ bool deleteGatewayStoragePreference(const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayID, const std::string& storageId) {
// Your implementation goes here
- printf("deleteGatewayDataStoragePreference\n");
+ printf("deleteGatewayStoragePreference\n");
}
void getAllWorkflows(std::vector<std::string> & _return, const ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId) {
[3/8] airavata git commit: adding data storage interfaces
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index 4f25769..080a6b7 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -2091,13 +2091,13 @@ class Iface:
"""
pass
- def addGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
+ def addGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId, storagePreference):
"""
Parameters:
- authzToken
- gatewayID
- dataMoveId
- - dataStoragePreference
+ - storagePreference
"""
pass
@@ -2122,7 +2122,7 @@ class Iface:
"""
pass
- def getGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
+ def getGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId):
"""
Parameters:
- authzToken
@@ -2148,7 +2148,7 @@ class Iface:
"""
pass
- def getAllGatewayDataStoragePreferences(self, authzToken, gatewayID):
+ def getAllGatewayStoragePreferences(self, authzToken, gatewayID):
"""
Parameters:
- authzToken
@@ -2191,13 +2191,13 @@ class Iface:
"""
pass
- def updateGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
+ def updateGatewayStoragePreference(self, authzToken, gatewayID, storageId, storagePreference):
"""
Parameters:
- authzToken
- gatewayID
- - dataMoveId
- - dataStoragePreference
+ - storageId
+ - storagePreference
"""
pass
@@ -2222,12 +2222,12 @@ class Iface:
"""
pass
- def deleteGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
+ def deleteGatewayStoragePreference(self, authzToken, gatewayID, storageId):
"""
Parameters:
- authzToken
- gatewayID
- - dataMoveId
+ - storageId
"""
pass
@@ -8193,29 +8193,29 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "addGatewayComputeResourcePreference failed: unknown result");
- def addGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
+ def addGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId, storagePreference):
"""
Parameters:
- authzToken
- gatewayID
- dataMoveId
- - dataStoragePreference
+ - storagePreference
"""
- self.send_addGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference)
- return self.recv_addGatewayDataStoragePreference()
+ self.send_addGatewayStoragePreference(authzToken, gatewayID, dataMoveId, storagePreference)
+ return self.recv_addGatewayStoragePreference()
- def send_addGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
- self._oprot.writeMessageBegin('addGatewayDataStoragePreference', TMessageType.CALL, self._seqid)
- args = addGatewayDataStoragePreference_args()
+ def send_addGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId, storagePreference):
+ self._oprot.writeMessageBegin('addGatewayStoragePreference', TMessageType.CALL, self._seqid)
+ args = addGatewayStoragePreference_args()
args.authzToken = authzToken
args.gatewayID = gatewayID
args.dataMoveId = dataMoveId
- args.dataStoragePreference = dataStoragePreference
+ args.storagePreference = storagePreference
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_addGatewayDataStoragePreference(self):
+ def recv_addGatewayStoragePreference(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -8223,7 +8223,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = addGatewayDataStoragePreference_result()
+ result = addGatewayStoragePreference_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -8236,7 +8236,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "addGatewayDataStoragePreference failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "addGatewayStoragePreference failed: unknown result");
def getGatewayComputeResourcePreference(self, authzToken, gatewayID, computeResourceId):
"""
@@ -8293,19 +8293,19 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getGatewayComputeResourcePreference failed: unknown result");
- def getGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
+ def getGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId):
"""
Parameters:
- authzToken
- gatewayID
- dataMoveId
"""
- self.send_getGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId)
- return self.recv_getGatewayDataStoragePreference()
+ self.send_getGatewayStoragePreference(authzToken, gatewayID, dataMoveId)
+ return self.recv_getGatewayStoragePreference()
- def send_getGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
- self._oprot.writeMessageBegin('getGatewayDataStoragePreference', TMessageType.CALL, self._seqid)
- args = getGatewayDataStoragePreference_args()
+ def send_getGatewayStoragePreference(self, authzToken, gatewayID, dataMoveId):
+ self._oprot.writeMessageBegin('getGatewayStoragePreference', TMessageType.CALL, self._seqid)
+ args = getGatewayStoragePreference_args()
args.authzToken = authzToken
args.gatewayID = gatewayID
args.dataMoveId = dataMoveId
@@ -8313,7 +8313,7 @@ class Client(Iface):
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getGatewayDataStoragePreference(self):
+ def recv_getGatewayStoragePreference(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -8321,7 +8321,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = getGatewayDataStoragePreference_result()
+ result = getGatewayStoragePreference_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -8334,7 +8334,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getGatewayDataStoragePreference failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getGatewayStoragePreference failed: unknown result");
def getAllGatewayComputeResourcePreferences(self, authzToken, gatewayID):
"""
@@ -8386,25 +8386,25 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayComputeResourcePreferences failed: unknown result");
- def getAllGatewayDataStoragePreferences(self, authzToken, gatewayID):
+ def getAllGatewayStoragePreferences(self, authzToken, gatewayID):
"""
Parameters:
- authzToken
- gatewayID
"""
- self.send_getAllGatewayDataStoragePreferences(authzToken, gatewayID)
- return self.recv_getAllGatewayDataStoragePreferences()
+ self.send_getAllGatewayStoragePreferences(authzToken, gatewayID)
+ return self.recv_getAllGatewayStoragePreferences()
- def send_getAllGatewayDataStoragePreferences(self, authzToken, gatewayID):
- self._oprot.writeMessageBegin('getAllGatewayDataStoragePreferences', TMessageType.CALL, self._seqid)
- args = getAllGatewayDataStoragePreferences_args()
+ def send_getAllGatewayStoragePreferences(self, authzToken, gatewayID):
+ self._oprot.writeMessageBegin('getAllGatewayStoragePreferences', TMessageType.CALL, self._seqid)
+ args = getAllGatewayStoragePreferences_args()
args.authzToken = authzToken
args.gatewayID = gatewayID
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_getAllGatewayDataStoragePreferences(self):
+ def recv_getAllGatewayStoragePreferences(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -8412,7 +8412,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = getAllGatewayDataStoragePreferences_result()
+ result = getAllGatewayStoragePreferences_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -8425,7 +8425,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayDataStoragePreferences failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllGatewayStoragePreferences failed: unknown result");
def getAllGatewayResourceProfiles(self, authzToken):
"""
@@ -8529,29 +8529,29 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "updateGatewayComputeResourcePreference failed: unknown result");
- def updateGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
+ def updateGatewayStoragePreference(self, authzToken, gatewayID, storageId, storagePreference):
"""
Parameters:
- authzToken
- gatewayID
- - dataMoveId
- - dataStoragePreference
+ - storageId
+ - storagePreference
"""
- self.send_updateGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId, dataStoragePreference)
- return self.recv_updateGatewayDataStoragePreference()
+ self.send_updateGatewayStoragePreference(authzToken, gatewayID, storageId, storagePreference)
+ return self.recv_updateGatewayStoragePreference()
- def send_updateGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId, dataStoragePreference):
- self._oprot.writeMessageBegin('updateGatewayDataStoragePreference', TMessageType.CALL, self._seqid)
- args = updateGatewayDataStoragePreference_args()
+ def send_updateGatewayStoragePreference(self, authzToken, gatewayID, storageId, storagePreference):
+ self._oprot.writeMessageBegin('updateGatewayStoragePreference', TMessageType.CALL, self._seqid)
+ args = updateGatewayStoragePreference_args()
args.authzToken = authzToken
args.gatewayID = gatewayID
- args.dataMoveId = dataMoveId
- args.dataStoragePreference = dataStoragePreference
+ args.storageId = storageId
+ args.storagePreference = storagePreference
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_updateGatewayDataStoragePreference(self):
+ def recv_updateGatewayStoragePreference(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -8559,7 +8559,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = updateGatewayDataStoragePreference_result()
+ result = updateGatewayStoragePreference_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -8572,7 +8572,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "updateGatewayDataStoragePreference failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "updateGatewayStoragePreference failed: unknown result");
def deleteGatewayComputeResourcePreference(self, authzToken, gatewayID, computeResourceId):
"""
@@ -8629,27 +8629,27 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGatewayComputeResourcePreference failed: unknown result");
- def deleteGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
+ def deleteGatewayStoragePreference(self, authzToken, gatewayID, storageId):
"""
Parameters:
- authzToken
- gatewayID
- - dataMoveId
+ - storageId
"""
- self.send_deleteGatewayDataStoragePreference(authzToken, gatewayID, dataMoveId)
- return self.recv_deleteGatewayDataStoragePreference()
+ self.send_deleteGatewayStoragePreference(authzToken, gatewayID, storageId)
+ return self.recv_deleteGatewayStoragePreference()
- def send_deleteGatewayDataStoragePreference(self, authzToken, gatewayID, dataMoveId):
- self._oprot.writeMessageBegin('deleteGatewayDataStoragePreference', TMessageType.CALL, self._seqid)
- args = deleteGatewayDataStoragePreference_args()
+ def send_deleteGatewayStoragePreference(self, authzToken, gatewayID, storageId):
+ self._oprot.writeMessageBegin('deleteGatewayStoragePreference', TMessageType.CALL, self._seqid)
+ args = deleteGatewayStoragePreference_args()
args.authzToken = authzToken
args.gatewayID = gatewayID
- args.dataMoveId = dataMoveId
+ args.storageId = storageId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
- def recv_deleteGatewayDataStoragePreference(self):
+ def recv_deleteGatewayStoragePreference(self):
iprot = self._iprot
(fname, mtype, rseqid) = iprot.readMessageBegin()
if mtype == TMessageType.EXCEPTION:
@@ -8657,7 +8657,7 @@ class Client(Iface):
x.read(iprot)
iprot.readMessageEnd()
raise x
- result = deleteGatewayDataStoragePreference_result()
+ result = deleteGatewayStoragePreference_result()
result.read(iprot)
iprot.readMessageEnd()
if result.success is not None:
@@ -8670,7 +8670,7 @@ class Client(Iface):
raise result.ase
if result.ae is not None:
raise result.ae
- raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGatewayDataStoragePreference failed: unknown result");
+ raise TApplicationException(TApplicationException.MISSING_RESULT, "deleteGatewayStoragePreference failed: unknown result");
def getAllWorkflows(self, authzToken, gatewayId):
"""
@@ -9077,16 +9077,16 @@ class Processor(Iface, TProcessor):
self._processMap["updateGatewayResourceProfile"] = Processor.process_updateGatewayResourceProfile
self._processMap["deleteGatewayResourceProfile"] = Processor.process_deleteGatewayResourceProfile
self._processMap["addGatewayComputeResourcePreference"] = Processor.process_addGatewayComputeResourcePreference
- self._processMap["addGatewayDataStoragePreference"] = Processor.process_addGatewayDataStoragePreference
+ self._processMap["addGatewayStoragePreference"] = Processor.process_addGatewayStoragePreference
self._processMap["getGatewayComputeResourcePreference"] = Processor.process_getGatewayComputeResourcePreference
- self._processMap["getGatewayDataStoragePreference"] = Processor.process_getGatewayDataStoragePreference
+ self._processMap["getGatewayStoragePreference"] = Processor.process_getGatewayStoragePreference
self._processMap["getAllGatewayComputeResourcePreferences"] = Processor.process_getAllGatewayComputeResourcePreferences
- self._processMap["getAllGatewayDataStoragePreferences"] = Processor.process_getAllGatewayDataStoragePreferences
+ self._processMap["getAllGatewayStoragePreferences"] = Processor.process_getAllGatewayStoragePreferences
self._processMap["getAllGatewayResourceProfiles"] = Processor.process_getAllGatewayResourceProfiles
self._processMap["updateGatewayComputeResourcePreference"] = Processor.process_updateGatewayComputeResourcePreference
- self._processMap["updateGatewayDataStoragePreference"] = Processor.process_updateGatewayDataStoragePreference
+ self._processMap["updateGatewayStoragePreference"] = Processor.process_updateGatewayStoragePreference
self._processMap["deleteGatewayComputeResourcePreference"] = Processor.process_deleteGatewayComputeResourcePreference
- self._processMap["deleteGatewayDataStoragePreference"] = Processor.process_deleteGatewayDataStoragePreference
+ self._processMap["deleteGatewayStoragePreference"] = Processor.process_deleteGatewayStoragePreference
self._processMap["getAllWorkflows"] = Processor.process_getAllWorkflows
self._processMap["getWorkflow"] = Processor.process_getWorkflow
self._processMap["deleteWorkflow"] = Processor.process_deleteWorkflow
@@ -11384,13 +11384,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_addGatewayDataStoragePreference(self, seqid, iprot, oprot):
- args = addGatewayDataStoragePreference_args()
+ def process_addGatewayStoragePreference(self, seqid, iprot, oprot):
+ args = addGatewayStoragePreference_args()
args.read(iprot)
iprot.readMessageEnd()
- result = addGatewayDataStoragePreference_result()
+ result = addGatewayStoragePreference_result()
try:
- result.success = self._handler.addGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference)
+ result.success = self._handler.addGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.storagePreference)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11399,7 +11399,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("addGatewayDataStoragePreference", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("addGatewayStoragePreference", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -11424,13 +11424,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getGatewayDataStoragePreference(self, seqid, iprot, oprot):
- args = getGatewayDataStoragePreference_args()
+ def process_getGatewayStoragePreference(self, seqid, iprot, oprot):
+ args = getGatewayStoragePreference_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getGatewayDataStoragePreference_result()
+ result = getGatewayStoragePreference_result()
try:
- result.success = self._handler.getGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId)
+ result.success = self._handler.getGatewayStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11439,7 +11439,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("getGatewayDataStoragePreference", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("getGatewayStoragePreference", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -11464,13 +11464,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_getAllGatewayDataStoragePreferences(self, seqid, iprot, oprot):
- args = getAllGatewayDataStoragePreferences_args()
+ def process_getAllGatewayStoragePreferences(self, seqid, iprot, oprot):
+ args = getAllGatewayStoragePreferences_args()
args.read(iprot)
iprot.readMessageEnd()
- result = getAllGatewayDataStoragePreferences_result()
+ result = getAllGatewayStoragePreferences_result()
try:
- result.success = self._handler.getAllGatewayDataStoragePreferences(args.authzToken, args.gatewayID)
+ result.success = self._handler.getAllGatewayStoragePreferences(args.authzToken, args.gatewayID)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11479,7 +11479,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("getAllGatewayDataStoragePreferences", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("getAllGatewayStoragePreferences", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -11524,13 +11524,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_updateGatewayDataStoragePreference(self, seqid, iprot, oprot):
- args = updateGatewayDataStoragePreference_args()
+ def process_updateGatewayStoragePreference(self, seqid, iprot, oprot):
+ args = updateGatewayStoragePreference_args()
args.read(iprot)
iprot.readMessageEnd()
- result = updateGatewayDataStoragePreference_result()
+ result = updateGatewayStoragePreference_result()
try:
- result.success = self._handler.updateGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId, args.dataStoragePreference)
+ result.success = self._handler.updateGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId, args.storagePreference)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11539,7 +11539,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("updateGatewayDataStoragePreference", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("updateGatewayStoragePreference", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -11564,13 +11564,13 @@ class Processor(Iface, TProcessor):
oprot.writeMessageEnd()
oprot.trans.flush()
- def process_deleteGatewayDataStoragePreference(self, seqid, iprot, oprot):
- args = deleteGatewayDataStoragePreference_args()
+ def process_deleteGatewayStoragePreference(self, seqid, iprot, oprot):
+ args = deleteGatewayStoragePreference_args()
args.read(iprot)
iprot.readMessageEnd()
- result = deleteGatewayDataStoragePreference_result()
+ result = deleteGatewayStoragePreference_result()
try:
- result.success = self._handler.deleteGatewayDataStoragePreference(args.authzToken, args.gatewayID, args.dataMoveId)
+ result.success = self._handler.deleteGatewayStoragePreference(args.authzToken, args.gatewayID, args.storageId)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.AiravataClientException, ace:
@@ -11579,7 +11579,7 @@ class Processor(Iface, TProcessor):
result.ase = ase
except apache.airavata.api.error.ttypes.AuthorizationException, ae:
result.ae = ae
- oprot.writeMessageBegin("deleteGatewayDataStoragePreference", TMessageType.REPLY, seqid)
+ oprot.writeMessageBegin("deleteGatewayStoragePreference", TMessageType.REPLY, seqid)
result.write(oprot)
oprot.writeMessageEnd()
oprot.trans.flush()
@@ -36420,13 +36420,13 @@ class addGatewayComputeResourcePreference_result:
def __ne__(self, other):
return not (self == other)
-class addGatewayDataStoragePreference_args:
+class addGatewayStoragePreference_args:
"""
Attributes:
- authzToken
- gatewayID
- dataMoveId
- - dataStoragePreference
+ - storagePreference
"""
thrift_spec = (
@@ -36434,14 +36434,14 @@ class addGatewayDataStoragePreference_args:
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'gatewayID', None, None, ), # 2
(3, TType.STRING, 'dataMoveId', None, None, ), # 3
- (4, TType.STRUCT, 'dataStoragePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference.thrift_spec), None, ), # 4
+ (4, TType.STRUCT, 'storagePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ), # 4
)
- def __init__(self, authzToken=None, gatewayID=None, dataMoveId=None, dataStoragePreference=None,):
+ def __init__(self, authzToken=None, gatewayID=None, dataMoveId=None, storagePreference=None,):
self.authzToken = authzToken
self.gatewayID = gatewayID
self.dataMoveId = dataMoveId
- self.dataStoragePreference = dataStoragePreference
+ self.storagePreference = storagePreference
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -36470,8 +36470,8 @@ class addGatewayDataStoragePreference_args:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.STRUCT:
- self.dataStoragePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference()
- self.dataStoragePreference.read(iprot)
+ self.storagePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+ self.storagePreference.read(iprot)
else:
iprot.skip(ftype)
else:
@@ -36483,7 +36483,7 @@ class addGatewayDataStoragePreference_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('addGatewayDataStoragePreference_args')
+ oprot.writeStructBegin('addGatewayStoragePreference_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -36496,9 +36496,9 @@ class addGatewayDataStoragePreference_args:
oprot.writeFieldBegin('dataMoveId', TType.STRING, 3)
oprot.writeString(self.dataMoveId)
oprot.writeFieldEnd()
- if self.dataStoragePreference is not None:
- oprot.writeFieldBegin('dataStoragePreference', TType.STRUCT, 4)
- self.dataStoragePreference.write(oprot)
+ if self.storagePreference is not None:
+ oprot.writeFieldBegin('storagePreference', TType.STRUCT, 4)
+ self.storagePreference.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -36510,8 +36510,8 @@ class addGatewayDataStoragePreference_args:
raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
if self.dataMoveId is None:
raise TProtocol.TProtocolException(message='Required field dataMoveId is unset!')
- if self.dataStoragePreference is None:
- raise TProtocol.TProtocolException(message='Required field dataStoragePreference is unset!')
+ if self.storagePreference is None:
+ raise TProtocol.TProtocolException(message='Required field storagePreference is unset!')
return
@@ -36520,7 +36520,7 @@ class addGatewayDataStoragePreference_args:
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.gatewayID)
value = (value * 31) ^ hash(self.dataMoveId)
- value = (value * 31) ^ hash(self.dataStoragePreference)
+ value = (value * 31) ^ hash(self.storagePreference)
return value
def __repr__(self):
@@ -36534,7 +36534,7 @@ class addGatewayDataStoragePreference_args:
def __ne__(self, other):
return not (self == other)
-class addGatewayDataStoragePreference_result:
+class addGatewayStoragePreference_result:
"""
Attributes:
- success
@@ -36606,7 +36606,7 @@ class addGatewayDataStoragePreference_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('addGatewayDataStoragePreference_result')
+ oprot.writeStructBegin('addGatewayStoragePreference_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.BOOL, 0)
oprot.writeBool(self.success)
@@ -36873,7 +36873,7 @@ class getGatewayComputeResourcePreference_result:
def __ne__(self, other):
return not (self == other)
-class getGatewayDataStoragePreference_args:
+class getGatewayStoragePreference_args:
"""
Attributes:
- authzToken
@@ -36927,7 +36927,7 @@ class getGatewayDataStoragePreference_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getGatewayDataStoragePreference_args')
+ oprot.writeStructBegin('getGatewayStoragePreference_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -36971,7 +36971,7 @@ class getGatewayDataStoragePreference_args:
def __ne__(self, other):
return not (self == other)
-class getGatewayDataStoragePreference_result:
+class getGatewayStoragePreference_result:
"""
Attributes:
- success
@@ -36982,7 +36982,7 @@ class getGatewayDataStoragePreference_result:
"""
thrift_spec = (
- (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference.thrift_spec), None, ), # 0
+ (0, TType.STRUCT, 'success', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -37007,7 +37007,7 @@ class getGatewayDataStoragePreference_result:
break
if fid == 0:
if ftype == TType.STRUCT:
- self.success = apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference()
+ self.success = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
self.success.read(iprot)
else:
iprot.skip(ftype)
@@ -37044,7 +37044,7 @@ class getGatewayDataStoragePreference_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getGatewayDataStoragePreference_result')
+ oprot.writeStructBegin('getGatewayStoragePreference_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.STRUCT, 0)
self.success.write(oprot)
@@ -37304,7 +37304,7 @@ class getAllGatewayComputeResourcePreferences_result:
def __ne__(self, other):
return not (self == other)
-class getAllGatewayDataStoragePreferences_args:
+class getAllGatewayStoragePreferences_args:
"""
Attributes:
- authzToken
@@ -37350,7 +37350,7 @@ class getAllGatewayDataStoragePreferences_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGatewayDataStoragePreferences_args')
+ oprot.writeStructBegin('getAllGatewayStoragePreferences_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -37387,7 +37387,7 @@ class getAllGatewayDataStoragePreferences_args:
def __ne__(self, other):
return not (self == other)
-class getAllGatewayDataStoragePreferences_result:
+class getAllGatewayStoragePreferences_result:
"""
Attributes:
- success
@@ -37398,7 +37398,7 @@ class getAllGatewayDataStoragePreferences_result:
"""
thrift_spec = (
- (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference.thrift_spec)), None, ), # 0
+ (0, TType.LIST, 'success', (TType.STRUCT,(apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec)), None, ), # 0
(1, TType.STRUCT, 'ire', (apache.airavata.api.error.ttypes.InvalidRequestException, apache.airavata.api.error.ttypes.InvalidRequestException.thrift_spec), None, ), # 1
(2, TType.STRUCT, 'ace', (apache.airavata.api.error.ttypes.AiravataClientException, apache.airavata.api.error.ttypes.AiravataClientException.thrift_spec), None, ), # 2
(3, TType.STRUCT, 'ase', (apache.airavata.api.error.ttypes.AiravataSystemException, apache.airavata.api.error.ttypes.AiravataSystemException.thrift_spec), None, ), # 3
@@ -37426,7 +37426,7 @@ class getAllGatewayDataStoragePreferences_result:
self.success = []
(_etype238, _size235) = iprot.readListBegin()
for _i239 in xrange(_size235):
- _elem240 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference()
+ _elem240 = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
_elem240.read(iprot)
self.success.append(_elem240)
iprot.readListEnd()
@@ -37465,7 +37465,7 @@ class getAllGatewayDataStoragePreferences_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('getAllGatewayDataStoragePreferences_result')
+ oprot.writeStructBegin('getAllGatewayStoragePreferences_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
@@ -37947,28 +37947,28 @@ class updateGatewayComputeResourcePreference_result:
def __ne__(self, other):
return not (self == other)
-class updateGatewayDataStoragePreference_args:
+class updateGatewayStoragePreference_args:
"""
Attributes:
- authzToken
- gatewayID
- - dataMoveId
- - dataStoragePreference
+ - storageId
+ - storagePreference
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'gatewayID', None, None, ), # 2
- (3, TType.STRING, 'dataMoveId', None, None, ), # 3
- (4, TType.STRUCT, 'dataStoragePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference.thrift_spec), None, ), # 4
+ (3, TType.STRING, 'storageId', None, None, ), # 3
+ (4, TType.STRUCT, 'storagePreference', (apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference, apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference.thrift_spec), None, ), # 4
)
- def __init__(self, authzToken=None, gatewayID=None, dataMoveId=None, dataStoragePreference=None,):
+ def __init__(self, authzToken=None, gatewayID=None, storageId=None, storagePreference=None,):
self.authzToken = authzToken
self.gatewayID = gatewayID
- self.dataMoveId = dataMoveId
- self.dataStoragePreference = dataStoragePreference
+ self.storageId = storageId
+ self.storagePreference = storagePreference
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -37992,13 +37992,13 @@ class updateGatewayDataStoragePreference_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.dataMoveId = iprot.readString();
+ self.storageId = iprot.readString();
else:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.STRUCT:
- self.dataStoragePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.DataStoragePreference()
- self.dataStoragePreference.read(iprot)
+ self.storagePreference = apache.airavata.model.appcatalog.gatewayprofile.ttypes.StoragePreference()
+ self.storagePreference.read(iprot)
else:
iprot.skip(ftype)
else:
@@ -38010,7 +38010,7 @@ class updateGatewayDataStoragePreference_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateGatewayDataStoragePreference_args')
+ oprot.writeStructBegin('updateGatewayStoragePreference_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -38019,13 +38019,13 @@ class updateGatewayDataStoragePreference_args:
oprot.writeFieldBegin('gatewayID', TType.STRING, 2)
oprot.writeString(self.gatewayID)
oprot.writeFieldEnd()
- if self.dataMoveId is not None:
- oprot.writeFieldBegin('dataMoveId', TType.STRING, 3)
- oprot.writeString(self.dataMoveId)
+ if self.storageId is not None:
+ oprot.writeFieldBegin('storageId', TType.STRING, 3)
+ oprot.writeString(self.storageId)
oprot.writeFieldEnd()
- if self.dataStoragePreference is not None:
- oprot.writeFieldBegin('dataStoragePreference', TType.STRUCT, 4)
- self.dataStoragePreference.write(oprot)
+ if self.storagePreference is not None:
+ oprot.writeFieldBegin('storagePreference', TType.STRUCT, 4)
+ self.storagePreference.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -38035,10 +38035,10 @@ class updateGatewayDataStoragePreference_args:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.gatewayID is None:
raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
- if self.dataMoveId is None:
- raise TProtocol.TProtocolException(message='Required field dataMoveId is unset!')
- if self.dataStoragePreference is None:
- raise TProtocol.TProtocolException(message='Required field dataStoragePreference is unset!')
+ if self.storageId is None:
+ raise TProtocol.TProtocolException(message='Required field storageId is unset!')
+ if self.storagePreference is None:
+ raise TProtocol.TProtocolException(message='Required field storagePreference is unset!')
return
@@ -38046,8 +38046,8 @@ class updateGatewayDataStoragePreference_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.gatewayID)
- value = (value * 31) ^ hash(self.dataMoveId)
- value = (value * 31) ^ hash(self.dataStoragePreference)
+ value = (value * 31) ^ hash(self.storageId)
+ value = (value * 31) ^ hash(self.storagePreference)
return value
def __repr__(self):
@@ -38061,7 +38061,7 @@ class updateGatewayDataStoragePreference_args:
def __ne__(self, other):
return not (self == other)
-class updateGatewayDataStoragePreference_result:
+class updateGatewayStoragePreference_result:
"""
Attributes:
- success
@@ -38133,7 +38133,7 @@ class updateGatewayDataStoragePreference_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('updateGatewayDataStoragePreference_result')
+ oprot.writeStructBegin('updateGatewayStoragePreference_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.BOOL, 0)
oprot.writeBool(self.success)
@@ -38399,25 +38399,25 @@ class deleteGatewayComputeResourcePreference_result:
def __ne__(self, other):
return not (self == other)
-class deleteGatewayDataStoragePreference_args:
+class deleteGatewayStoragePreference_args:
"""
Attributes:
- authzToken
- gatewayID
- - dataMoveId
+ - storageId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'gatewayID', None, None, ), # 2
- (3, TType.STRING, 'dataMoveId', None, None, ), # 3
+ (3, TType.STRING, 'storageId', None, None, ), # 3
)
- def __init__(self, authzToken=None, gatewayID=None, dataMoveId=None,):
+ def __init__(self, authzToken=None, gatewayID=None, storageId=None,):
self.authzToken = authzToken
self.gatewayID = gatewayID
- self.dataMoveId = dataMoveId
+ self.storageId = storageId
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -38441,7 +38441,7 @@ class deleteGatewayDataStoragePreference_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.dataMoveId = iprot.readString();
+ self.storageId = iprot.readString();
else:
iprot.skip(ftype)
else:
@@ -38453,7 +38453,7 @@ class deleteGatewayDataStoragePreference_args:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('deleteGatewayDataStoragePreference_args')
+ oprot.writeStructBegin('deleteGatewayStoragePreference_args')
if self.authzToken is not None:
oprot.writeFieldBegin('authzToken', TType.STRUCT, 1)
self.authzToken.write(oprot)
@@ -38462,9 +38462,9 @@ class deleteGatewayDataStoragePreference_args:
oprot.writeFieldBegin('gatewayID', TType.STRING, 2)
oprot.writeString(self.gatewayID)
oprot.writeFieldEnd()
- if self.dataMoveId is not None:
- oprot.writeFieldBegin('dataMoveId', TType.STRING, 3)
- oprot.writeString(self.dataMoveId)
+ if self.storageId is not None:
+ oprot.writeFieldBegin('storageId', TType.STRING, 3)
+ oprot.writeString(self.storageId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -38474,8 +38474,8 @@ class deleteGatewayDataStoragePreference_args:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.gatewayID is None:
raise TProtocol.TProtocolException(message='Required field gatewayID is unset!')
- if self.dataMoveId is None:
- raise TProtocol.TProtocolException(message='Required field dataMoveId is unset!')
+ if self.storageId is None:
+ raise TProtocol.TProtocolException(message='Required field storageId is unset!')
return
@@ -38483,7 +38483,7 @@ class deleteGatewayDataStoragePreference_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.gatewayID)
- value = (value * 31) ^ hash(self.dataMoveId)
+ value = (value * 31) ^ hash(self.storageId)
return value
def __repr__(self):
@@ -38497,7 +38497,7 @@ class deleteGatewayDataStoragePreference_args:
def __ne__(self, other):
return not (self == other)
-class deleteGatewayDataStoragePreference_result:
+class deleteGatewayStoragePreference_result:
"""
Attributes:
- success
@@ -38569,7 +38569,7 @@ class deleteGatewayDataStoragePreference_result:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('deleteGatewayDataStoragePreference_result')
+ oprot.writeStructBegin('deleteGatewayStoragePreference_result')
if self.success is not None:
oprot.writeFieldBegin('success', TType.BOOL, 0)
oprot.writeBool(self.success)
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
index 9799e52..941655d 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
@@ -225,10 +225,10 @@ class ComputeResourcePreference:
def __ne__(self, other):
return not (self == other)
-class DataStoragePreference:
+class StoragePreference:
"""
Attributes:
- - dataMovememtResourceId
+ - storageResourceId
- loginUserName
- fileSystemRootLocation
- resourceSpecificCredentialStoreToken
@@ -236,14 +236,14 @@ class DataStoragePreference:
thrift_spec = (
None, # 0
- (1, TType.STRING, 'dataMovememtResourceId', None, None, ), # 1
+ (1, TType.STRING, 'storageResourceId', None, None, ), # 1
(2, TType.STRING, 'loginUserName', None, None, ), # 2
(3, TType.STRING, 'fileSystemRootLocation', None, None, ), # 3
(4, TType.STRING, 'resourceSpecificCredentialStoreToken', None, None, ), # 4
)
- def __init__(self, dataMovememtResourceId=None, loginUserName=None, fileSystemRootLocation=None, resourceSpecificCredentialStoreToken=None,):
- self.dataMovememtResourceId = dataMovememtResourceId
+ def __init__(self, storageResourceId=None, loginUserName=None, fileSystemRootLocation=None, resourceSpecificCredentialStoreToken=None,):
+ self.storageResourceId = storageResourceId
self.loginUserName = loginUserName
self.fileSystemRootLocation = fileSystemRootLocation
self.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken
@@ -259,7 +259,7 @@ class DataStoragePreference:
break
if fid == 1:
if ftype == TType.STRING:
- self.dataMovememtResourceId = iprot.readString();
+ self.storageResourceId = iprot.readString();
else:
iprot.skip(ftype)
elif fid == 2:
@@ -286,10 +286,10 @@ class DataStoragePreference:
if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
- oprot.writeStructBegin('DataStoragePreference')
- if self.dataMovememtResourceId is not None:
- oprot.writeFieldBegin('dataMovememtResourceId', TType.STRING, 1)
- oprot.writeString(self.dataMovememtResourceId)
+ oprot.writeStructBegin('StoragePreference')
+ if self.storageResourceId is not None:
+ oprot.writeFieldBegin('storageResourceId', TType.STRING, 1)
+ oprot.writeString(self.storageResourceId)
oprot.writeFieldEnd()
if self.loginUserName is not None:
oprot.writeFieldBegin('loginUserName', TType.STRING, 2)
@@ -307,14 +307,14 @@ class DataStoragePreference:
oprot.writeStructEnd()
def validate(self):
- if self.dataMovememtResourceId is None:
- raise TProtocol.TProtocolException(message='Required field dataMovememtResourceId is unset!')
+ if self.storageResourceId is None:
+ raise TProtocol.TProtocolException(message='Required field storageResourceId is unset!')
return
def __hash__(self):
value = 17
- value = (value * 31) ^ hash(self.dataMovememtResourceId)
+ value = (value * 31) ^ hash(self.storageResourceId)
value = (value * 31) ^ hash(self.loginUserName)
value = (value * 31) ^ hash(self.fileSystemRootLocation)
value = (value * 31) ^ hash(self.resourceSpecificCredentialStoreToken)
@@ -349,7 +349,7 @@ class GatewayResourceProfile:
- gatewayID
- credentialStoreToken
- computeResourcePreferences
- - dataStoragePreferences
+ - storagePreferences
"""
thrift_spec = (
@@ -357,14 +357,14 @@ class GatewayResourceProfile:
(1, TType.STRING, 'gatewayID', None, None, ), # 1
(2, TType.STRING, 'credentialStoreToken', None, None, ), # 2
(3, TType.LIST, 'computeResourcePreferences', (TType.STRUCT,(ComputeResourcePreference, ComputeResourcePreference.thrift_spec)), None, ), # 3
- (4, TType.LIST, 'dataStoragePreferences', (TType.STRUCT,(DataStoragePreference, DataStoragePreference.thrift_spec)), None, ), # 4
+ (4, TType.LIST, 'storagePreferences', (TType.STRUCT,(StoragePreference, StoragePreference.thrift_spec)), None, ), # 4
)
- def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, dataStoragePreferences=None,):
+ def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None,):
self.gatewayID = gatewayID
self.credentialStoreToken = credentialStoreToken
self.computeResourcePreferences = computeResourcePreferences
- self.dataStoragePreferences = dataStoragePreferences
+ self.storagePreferences = storagePreferences
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -398,12 +398,12 @@ class GatewayResourceProfile:
iprot.skip(ftype)
elif fid == 4:
if ftype == TType.LIST:
- self.dataStoragePreferences = []
+ self.storagePreferences = []
(_etype9, _size6) = iprot.readListBegin()
for _i10 in xrange(_size6):
- _elem11 = DataStoragePreference()
+ _elem11 = StoragePreference()
_elem11.read(iprot)
- self.dataStoragePreferences.append(_elem11)
+ self.storagePreferences.append(_elem11)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -432,10 +432,10 @@ class GatewayResourceProfile:
iter12.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.dataStoragePreferences is not None:
- oprot.writeFieldBegin('dataStoragePreferences', TType.LIST, 4)
- oprot.writeListBegin(TType.STRUCT, len(self.dataStoragePreferences))
- for iter13 in self.dataStoragePreferences:
+ if self.storagePreferences is not None:
+ oprot.writeFieldBegin('storagePreferences', TType.LIST, 4)
+ oprot.writeListBegin(TType.STRUCT, len(self.storagePreferences))
+ for iter13 in self.storagePreferences:
iter13.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
@@ -453,7 +453,7 @@ class GatewayResourceProfile:
value = (value * 31) ^ hash(self.gatewayID)
value = (value * 31) ^ hash(self.credentialStoreToken)
value = (value * 31) ^ hash(self.computeResourcePreferences)
- value = (value * 31) ^ hash(self.dataStoragePreferences)
+ value = (value * 31) ^ hash(self.storagePreferences)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/13b50f7a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
deleted file mode 100644
index c309d41..0000000
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
+++ /dev/null
@@ -1,728 +0,0 @@
-/**
- * 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.
- */
-
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.airavata.model.appcatalog.gatewayprofile;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-11-17")
-public class DataStoragePreference implements org.apache.thrift.TBase<DataStoragePreference, DataStoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<DataStoragePreference> {
- private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStoragePreference");
-
- private static final org.apache.thrift.protocol.TField DATA_MOVEMEMT_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovememtResourceId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField LOGIN_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("loginUserName", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField FILE_SYSTEM_ROOT_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSystemRootLocation", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSpecificCredentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)4);
-
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new DataStoragePreferenceStandardSchemeFactory());
- schemes.put(TupleScheme.class, new DataStoragePreferenceTupleSchemeFactory());
- }
-
- private String dataMovememtResourceId; // required
- private String loginUserName; // optional
- private String fileSystemRootLocation; // optional
- private String resourceSpecificCredentialStoreToken; // optional
-
- /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- DATA_MOVEMEMT_RESOURCE_ID((short)1, "dataMovememtResourceId"),
- LOGIN_USER_NAME((short)2, "loginUserName"),
- FILE_SYSTEM_ROOT_LOCATION((short)3, "fileSystemRootLocation"),
- RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)4, "resourceSpecificCredentialStoreToken");
-
- 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 1: // DATA_MOVEMEMT_RESOURCE_ID
- return DATA_MOVEMEMT_RESOURCE_ID;
- case 2: // LOGIN_USER_NAME
- return LOGIN_USER_NAME;
- case 3: // FILE_SYSTEM_ROOT_LOCATION
- return FILE_SYSTEM_ROOT_LOCATION;
- case 4: // RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN
- return RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN;
- 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 _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.FILE_SYSTEM_ROOT_LOCATION,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN};
- 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.DATA_MOVEMEMT_RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("dataMovememtResourceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.LOGIN_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("loginUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.FILE_SYSTEM_ROOT_LOCATION, new org.apache.thrift.meta_data.FieldMetaData("fileSystemRootLocation", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("resourceSpecificCredentialStoreToken", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- metaDataMap = Collections.unmodifiableMap(tmpMap);
- org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DataStoragePreference.class, metaDataMap);
- }
-
- public DataStoragePreference() {
- }
-
- public DataStoragePreference(
- String dataMovememtResourceId)
- {
- this();
- this.dataMovememtResourceId = dataMovememtResourceId;
- }
-
- /**
- * Performs a deep copy on <i>other</i>.
- */
- public DataStoragePreference(DataStoragePreference other) {
- if (other.isSetDataMovememtResourceId()) {
- this.dataMovememtResourceId = other.dataMovememtResourceId;
- }
- if (other.isSetLoginUserName()) {
- this.loginUserName = other.loginUserName;
- }
- if (other.isSetFileSystemRootLocation()) {
- this.fileSystemRootLocation = other.fileSystemRootLocation;
- }
- if (other.isSetResourceSpecificCredentialStoreToken()) {
- this.resourceSpecificCredentialStoreToken = other.resourceSpecificCredentialStoreToken;
- }
- }
-
- public DataStoragePreference deepCopy() {
- return new DataStoragePreference(this);
- }
-
- @Override
- public void clear() {
- this.dataMovememtResourceId = null;
- this.loginUserName = null;
- this.fileSystemRootLocation = null;
- this.resourceSpecificCredentialStoreToken = null;
- }
-
- public String getDataMovememtResourceId() {
- return this.dataMovememtResourceId;
- }
-
- public void setDataMovememtResourceId(String dataMovememtResourceId) {
- this.dataMovememtResourceId = dataMovememtResourceId;
- }
-
- public void unsetDataMovememtResourceId() {
- this.dataMovememtResourceId = null;
- }
-
- /** Returns true if field dataMovememtResourceId is set (has been assigned a value) and false otherwise */
- public boolean isSetDataMovememtResourceId() {
- return this.dataMovememtResourceId != null;
- }
-
- public void setDataMovememtResourceIdIsSet(boolean value) {
- if (!value) {
- this.dataMovememtResourceId = null;
- }
- }
-
- public String getLoginUserName() {
- return this.loginUserName;
- }
-
- public void setLoginUserName(String loginUserName) {
- this.loginUserName = loginUserName;
- }
-
- public void unsetLoginUserName() {
- this.loginUserName = null;
- }
-
- /** Returns true if field loginUserName is set (has been assigned a value) and false otherwise */
- public boolean isSetLoginUserName() {
- return this.loginUserName != null;
- }
-
- public void setLoginUserNameIsSet(boolean value) {
- if (!value) {
- this.loginUserName = null;
- }
- }
-
- public String getFileSystemRootLocation() {
- return this.fileSystemRootLocation;
- }
-
- public void setFileSystemRootLocation(String fileSystemRootLocation) {
- this.fileSystemRootLocation = fileSystemRootLocation;
- }
-
- public void unsetFileSystemRootLocation() {
- this.fileSystemRootLocation = null;
- }
-
- /** Returns true if field fileSystemRootLocation is set (has been assigned a value) and false otherwise */
- public boolean isSetFileSystemRootLocation() {
- return this.fileSystemRootLocation != null;
- }
-
- public void setFileSystemRootLocationIsSet(boolean value) {
- if (!value) {
- this.fileSystemRootLocation = null;
- }
- }
-
- public String getResourceSpecificCredentialStoreToken() {
- return this.resourceSpecificCredentialStoreToken;
- }
-
- public void setResourceSpecificCredentialStoreToken(String resourceSpecificCredentialStoreToken) {
- this.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken;
- }
-
- public void unsetResourceSpecificCredentialStoreToken() {
- this.resourceSpecificCredentialStoreToken = null;
- }
-
- /** Returns true if field resourceSpecificCredentialStoreToken is set (has been assigned a value) and false otherwise */
- public boolean isSetResourceSpecificCredentialStoreToken() {
- return this.resourceSpecificCredentialStoreToken != null;
- }
-
- public void setResourceSpecificCredentialStoreTokenIsSet(boolean value) {
- if (!value) {
- this.resourceSpecificCredentialStoreToken = null;
- }
- }
-
- public void setFieldValue(_Fields field, Object value) {
- switch (field) {
- case DATA_MOVEMEMT_RESOURCE_ID:
- if (value == null) {
- unsetDataMovememtResourceId();
- } else {
- setDataMovememtResourceId((String)value);
- }
- break;
-
- case LOGIN_USER_NAME:
- if (value == null) {
- unsetLoginUserName();
- } else {
- setLoginUserName((String)value);
- }
- break;
-
- case FILE_SYSTEM_ROOT_LOCATION:
- if (value == null) {
- unsetFileSystemRootLocation();
- } else {
- setFileSystemRootLocation((String)value);
- }
- break;
-
- case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
- if (value == null) {
- unsetResourceSpecificCredentialStoreToken();
- } else {
- setResourceSpecificCredentialStoreToken((String)value);
- }
- break;
-
- }
- }
-
- public Object getFieldValue(_Fields field) {
- switch (field) {
- case DATA_MOVEMEMT_RESOURCE_ID:
- return getDataMovememtResourceId();
-
- case LOGIN_USER_NAME:
- return getLoginUserName();
-
- case FILE_SYSTEM_ROOT_LOCATION:
- return getFileSystemRootLocation();
-
- case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
- return getResourceSpecificCredentialStoreToken();
-
- }
- 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 DATA_MOVEMEMT_RESOURCE_ID:
- return isSetDataMovememtResourceId();
- case LOGIN_USER_NAME:
- return isSetLoginUserName();
- case FILE_SYSTEM_ROOT_LOCATION:
- return isSetFileSystemRootLocation();
- case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
- return isSetResourceSpecificCredentialStoreToken();
- }
- throw new IllegalStateException();
- }
-
- @Override
- public boolean equals(Object that) {
- if (that == null)
- return false;
- if (that instanceof DataStoragePreference)
- return this.equals((DataStoragePreference)that);
- return false;
- }
-
- public boolean equals(DataStoragePreference that) {
- if (that == null)
- return false;
-
- boolean this_present_dataMovememtResourceId = true && this.isSetDataMovememtResourceId();
- boolean that_present_dataMovememtResourceId = true && that.isSetDataMovememtResourceId();
- if (this_present_dataMovememtResourceId || that_present_dataMovememtResourceId) {
- if (!(this_present_dataMovememtResourceId && that_present_dataMovememtResourceId))
- return false;
- if (!this.dataMovememtResourceId.equals(that.dataMovememtResourceId))
- return false;
- }
-
- boolean this_present_loginUserName = true && this.isSetLoginUserName();
- boolean that_present_loginUserName = true && that.isSetLoginUserName();
- if (this_present_loginUserName || that_present_loginUserName) {
- if (!(this_present_loginUserName && that_present_loginUserName))
- return false;
- if (!this.loginUserName.equals(that.loginUserName))
- return false;
- }
-
- boolean this_present_fileSystemRootLocation = true && this.isSetFileSystemRootLocation();
- boolean that_present_fileSystemRootLocation = true && that.isSetFileSystemRootLocation();
- if (this_present_fileSystemRootLocation || that_present_fileSystemRootLocation) {
- if (!(this_present_fileSystemRootLocation && that_present_fileSystemRootLocation))
- return false;
- if (!this.fileSystemRootLocation.equals(that.fileSystemRootLocation))
- return false;
- }
-
- boolean this_present_resourceSpecificCredentialStoreToken = true && this.isSetResourceSpecificCredentialStoreToken();
- boolean that_present_resourceSpecificCredentialStoreToken = true && that.isSetResourceSpecificCredentialStoreToken();
- if (this_present_resourceSpecificCredentialStoreToken || that_present_resourceSpecificCredentialStoreToken) {
- if (!(this_present_resourceSpecificCredentialStoreToken && that_present_resourceSpecificCredentialStoreToken))
- return false;
- if (!this.resourceSpecificCredentialStoreToken.equals(that.resourceSpecificCredentialStoreToken))
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_dataMovememtResourceId = true && (isSetDataMovememtResourceId());
- list.add(present_dataMovememtResourceId);
- if (present_dataMovememtResourceId)
- list.add(dataMovememtResourceId);
-
- boolean present_loginUserName = true && (isSetLoginUserName());
- list.add(present_loginUserName);
- if (present_loginUserName)
- list.add(loginUserName);
-
- boolean present_fileSystemRootLocation = true && (isSetFileSystemRootLocation());
- list.add(present_fileSystemRootLocation);
- if (present_fileSystemRootLocation)
- list.add(fileSystemRootLocation);
-
- boolean present_resourceSpecificCredentialStoreToken = true && (isSetResourceSpecificCredentialStoreToken());
- list.add(present_resourceSpecificCredentialStoreToken);
- if (present_resourceSpecificCredentialStoreToken)
- list.add(resourceSpecificCredentialStoreToken);
-
- return list.hashCode();
- }
-
- @Override
- public int compareTo(DataStoragePreference other) {
- if (!getClass().equals(other.getClass())) {
- return getClass().getName().compareTo(other.getClass().getName());
- }
-
- int lastComparison = 0;
-
- lastComparison = Boolean.valueOf(isSetDataMovememtResourceId()).compareTo(other.isSetDataMovememtResourceId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetDataMovememtResourceId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dataMovememtResourceId, other.dataMovememtResourceId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetLoginUserName()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loginUserName, other.loginUserName);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetFileSystemRootLocation()).compareTo(other.isSetFileSystemRootLocation());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetFileSystemRootLocation()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSystemRootLocation, other.fileSystemRootLocation);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = Boolean.valueOf(isSetResourceSpecificCredentialStoreToken()).compareTo(other.isSetResourceSpecificCredentialStoreToken());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetResourceSpecificCredentialStoreToken()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceSpecificCredentialStoreToken, other.resourceSpecificCredentialStoreToken);
- 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("DataStoragePreference(");
- boolean first = true;
-
- sb.append("dataMovememtResourceId:");
- if (this.dataMovememtResourceId == null) {
- sb.append("null");
- } else {
- sb.append(this.dataMovememtResourceId);
- }
- first = false;
- if (isSetLoginUserName()) {
- if (!first) sb.append(", ");
- sb.append("loginUserName:");
- if (this.loginUserName == null) {
- sb.append("null");
- } else {
- sb.append(this.loginUserName);
- }
- first = false;
- }
- if (isSetFileSystemRootLocation()) {
- if (!first) sb.append(", ");
- sb.append("fileSystemRootLocation:");
- if (this.fileSystemRootLocation == null) {
- sb.append("null");
- } else {
- sb.append(this.fileSystemRootLocation);
- }
- first = false;
- }
- if (isSetResourceSpecificCredentialStoreToken()) {
- if (!first) sb.append(", ");
- sb.append("resourceSpecificCredentialStoreToken:");
- if (this.resourceSpecificCredentialStoreToken == null) {
- sb.append("null");
- } else {
- sb.append(this.resourceSpecificCredentialStoreToken);
- }
- first = false;
- }
- sb.append(")");
- return sb.toString();
- }
-
- public void validate() throws org.apache.thrift.TException {
- // check for required fields
- if (!isSetDataMovememtResourceId()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'dataMovememtResourceId' is unset! Struct:" + toString());
- }
-
- // 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 {
- 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 DataStoragePreferenceStandardSchemeFactory implements SchemeFactory {
- public DataStoragePreferenceStandardScheme getScheme() {
- return new DataStoragePreferenceStandardScheme();
- }
- }
-
- private static class DataStoragePreferenceStandardScheme extends StandardScheme<DataStoragePreference> {
-
- public void read(org.apache.thrift.protocol.TProtocol iprot, DataStoragePreference 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: // DATA_MOVEMEMT_RESOURCE_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.dataMovememtResourceId = iprot.readString();
- struct.setDataMovememtResourceIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 2: // LOGIN_USER_NAME
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.loginUserName = iprot.readString();
- struct.setLoginUserNameIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 3: // FILE_SYSTEM_ROOT_LOCATION
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.fileSystemRootLocation = iprot.readString();
- struct.setFileSystemRootLocationIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 4: // RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.resourceSpecificCredentialStoreToken = iprot.readString();
- struct.setResourceSpecificCredentialStoreTokenIsSet(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();
- struct.validate();
- }
-
- public void write(org.apache.thrift.protocol.TProtocol oprot, DataStoragePreference struct) throws org.apache.thrift.TException {
- struct.validate();
-
- oprot.writeStructBegin(STRUCT_DESC);
- if (struct.dataMovememtResourceId != null) {
- oprot.writeFieldBegin(DATA_MOVEMEMT_RESOURCE_ID_FIELD_DESC);
- oprot.writeString(struct.dataMovememtResourceId);
- oprot.writeFieldEnd();
- }
- if (struct.loginUserName != null) {
- if (struct.isSetLoginUserName()) {
- oprot.writeFieldBegin(LOGIN_USER_NAME_FIELD_DESC);
- oprot.writeString(struct.loginUserName);
- oprot.writeFieldEnd();
- }
- }
- if (struct.fileSystemRootLocation != null) {
- if (struct.isSetFileSystemRootLocation()) {
- oprot.writeFieldBegin(FILE_SYSTEM_ROOT_LOCATION_FIELD_DESC);
- oprot.writeString(struct.fileSystemRootLocation);
- oprot.writeFieldEnd();
- }
- }
- if (struct.resourceSpecificCredentialStoreToken != null) {
- if (struct.isSetResourceSpecificCredentialStoreToken()) {
- oprot.writeFieldBegin(RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC);
- oprot.writeString(struct.resourceSpecificCredentialStoreToken);
- oprot.writeFieldEnd();
- }
- }
- oprot.writeFieldStop();
- oprot.writeStructEnd();
- }
-
- }
-
- private static class DataStoragePreferenceTupleSchemeFactory implements SchemeFactory {
- public DataStoragePreferenceTupleScheme getScheme() {
- return new DataStoragePreferenceTupleScheme();
- }
- }
-
- private static class DataStoragePreferenceTupleScheme extends TupleScheme<DataStoragePreference> {
-
- @Override
- public void write(org.apache.thrift.protocol.TProtocol prot, DataStoragePreference struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeString(struct.dataMovememtResourceId);
- BitSet optionals = new BitSet();
- if (struct.isSetLoginUserName()) {
- optionals.set(0);
- }
- if (struct.isSetFileSystemRootLocation()) {
- optionals.set(1);
- }
- if (struct.isSetResourceSpecificCredentialStoreToken()) {
- optionals.set(2);
- }
- oprot.writeBitSet(optionals, 3);
- if (struct.isSetLoginUserName()) {
- oprot.writeString(struct.loginUserName);
- }
- if (struct.isSetFileSystemRootLocation()) {
- oprot.writeString(struct.fileSystemRootLocation);
- }
- if (struct.isSetResourceSpecificCredentialStoreToken()) {
- oprot.writeString(struct.resourceSpecificCredentialStoreToken);
- }
- }
-
- @Override
- public void read(org.apache.thrift.protocol.TProtocol prot, DataStoragePreference struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.dataMovememtResourceId = iprot.readString();
- struct.setDataMovememtResourceIdIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
- if (incoming.get(0)) {
- struct.loginUserName = iprot.readString();
- struct.setLoginUserNameIsSet(true);
- }
- if (incoming.get(1)) {
- struct.fileSystemRootLocation = iprot.readString();
- struct.setFileSystemRootLocationIsSet(true);
- }
- if (incoming.get(2)) {
- struct.resourceSpecificCredentialStoreToken = iprot.readString();
- struct.setResourceSpecificCredentialStoreTokenIsSet(true);
- }
- }
- }
-
-}
-