You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/08/30 15:26:41 UTC
airavata git commit: fixing AIRAVATA-1808
Repository: airavata
Updated Branches:
refs/heads/master 4d70d3ce7 -> 1f065a3a4
fixing AIRAVATA-1808
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1f065a3a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1f065a3a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1f065a3a
Branch: refs/heads/master
Commit: 1f065a3a41cde5b3828bf310146add8067b3afbe
Parents: 4d70d3c
Author: Supun Nakandala <sc...@apache.org>
Authored: Sun Aug 30 18:10:48 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Sun Aug 30 18:10:48 2015 +0530
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 2 +-
.../app/catalog/impl/ComputeResourceImpl.java | 28 ++++++++++++++++++--
.../airavata/registry/cpi/ComputeResource.java | 11 +++++---
3 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1f065a3a/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 2fff346..c032a2a 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
@@ -2295,7 +2295,7 @@ public class AiravataServerHandler implements Airavata.Iface {
try {
appCatalog = RegistryFactory.getAppCatalog();
ApplicationDeployment applicationDeployment = appCatalog.getApplicationDeployment();
- Map<String, String> allComputeResources = appCatalog.getComputeResource().getAllComputeResourceIdList();
+ Map<String, String> allComputeResources = appCatalog.getComputeResource().getAvailableComputeResourceIdList();
Map<String, String> availableComputeResources = new HashMap<String, String>();
ApplicationInterfaceDescription applicationInterface =
appCatalog.getApplicationInterface().getApplicationInterface(appInterfaceId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/1f065a3a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
index df383aa..554a4c5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java
@@ -21,8 +21,6 @@
package org.apache.airavata.registry.core.app.catalog.impl;
-import java.util.*;
-
import org.apache.airavata.model.appcatalog.computeresource.*;
import org.apache.airavata.registry.core.app.catalog.resources.*;
import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion;
@@ -32,6 +30,11 @@ import org.apache.airavata.registry.cpi.ComputeResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class ComputeResourceImpl implements ComputeResource {
private final static Logger logger = LoggerFactory.getLogger(ComputeResourceImpl.class);
@@ -473,6 +476,27 @@ public class ComputeResourceImpl implements ComputeResource {
}
}
+ @Override
+ public Map<String, String> getAvailableComputeResourceIdList() throws AppCatalogException {
+ try {
+ Map<String, String> computeResourceMap = new HashMap<String, String>();
+ ComputeResourceResource resource = new ComputeResourceResource();
+ List<AppCatalogResource> allComputeResources = resource.getAll();
+ if (allComputeResources != null && !allComputeResources.isEmpty()){
+ for (AppCatalogResource cm : allComputeResources){
+ ComputeResourceResource cmr = (ComputeResourceResource)cm;
+ if(cmr.isEnabled()) {
+ computeResourceMap.put(cmr.getResourceId(), cmr.getHostName());
+ }
+ }
+ }
+ return computeResourceMap;
+ }catch (Exception e){
+ logger.error("Error while retrieving compute resource list...", e);
+ throw new AppCatalogException(e);
+ }
+ }
+
// @Override
// public GSISSHJobSubmission getGSISSHJobSubmission(String submissionId) throws AppCatalogException {
// try {
http://git-wip-us.apache.org/repos/asf/airavata/blob/1f065a3a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
index ca2cd49..85525d8 100644
--- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
+++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ComputeResource.java
@@ -19,11 +19,11 @@
package org.apache.airavata.registry.cpi;
+import org.apache.airavata.model.appcatalog.computeresource.*;
+
import java.util.List;
import java.util.Map;
-import org.apache.airavata.model.appcatalog.computeresource.*;
-
public interface ComputeResource {
/**
* This function will add a compute resource description to the database
@@ -138,7 +138,12 @@ public interface ComputeResource {
*/
Map<String, String> getAllComputeResourceIdList () throws AppCatalogException;
-
+ /**
+ * This method will retrieve all the enabled compute resource id with it's name
+ * @return
+ * @throws AppCatalogException
+ */
+ Map<String, String> getAvailableComputeResourceIdList() throws AppCatalogException;
// /**
// * This method will retrieve GlobusJobSubmission object