From 5d6fe0ceb521a4e5983577a6ba94a7852d7d33bc Mon Sep 17 00:00:00 2001 From: Nunzio Andrea Galante Date: Thu, 11 May 2017 15:03:59 +0000 Subject: [PATCH] git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@148478 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../poolmanager/ansiblebridge/AnsibleBridge.java | 9 +++++---- .../ansiblebridge/template/AlgorithmPackage.java | 12 ++++++++---- .../dataminer/poolmanager/clients/ISClient.java | 2 +- .../dataminer/poolmanager/rest/RestPoolManager.java | 9 +++++---- .../poolmanager/service/DataminerPoolManager.java | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java index 21a38b9..a35156f 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/AnsibleBridge.java @@ -96,7 +96,7 @@ public class AnsibleBridge { List algoRoles = new Vector<>(); ***REMOVED*** add algorithms and dependencies to the worker - for (Role r : this.generateRoles(algorithm)) { + for (Role r : this.generateRoles(algorithm,includeAlgorithmDependencies)) { algoRoles.add(r); worker.addRole(r); ***REMOVED*** @@ -333,9 +333,10 @@ public class AnsibleBridge { return roles; ***REMOVED*** - public Collection generateRoles(Algorithm a) { - AlgorithmPackage pkg = new AlgorithmPackage(a); + public Collection generateRoles(Algorithm a,boolean includeAlgorithmDependencies) { + AlgorithmPackage pkg = new AlgorithmPackage(a,includeAlgorithmDependencies); return pkg.getRoles(this.getTemplateManager()); - ***REMOVED*** + + ***REMOVED*** ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/template/AlgorithmPackage.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/template/AlgorithmPackage.java index a81bfc3..07bb33a 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/template/AlgorithmPackage.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/ansiblebridge/template/AlgorithmPackage.java @@ -14,11 +14,14 @@ import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.Dependency; public class AlgorithmPackage { private Algorithm algorithm; - - public AlgorithmPackage(Algorithm a) { + private boolean includeAlgorithmDependencies; + public AlgorithmPackage(Algorithm a,boolean includeAlgorithmDependencies) { this.algorithm = a; + this.includeAlgorithmDependencies = includeAlgorithmDependencies; + ***REMOVED*** - + + protected Map getDictionary(Algorithm a) { Map out = new HashMap(); out.put("name", a.getName()); @@ -32,9 +35,10 @@ public class AlgorithmPackage { out.put("description", a.getDescription()); String deps = ""; + if(includeAlgorithmDependencies){ for(Dependency d:a.getDependencies()) { deps+=String.format("- { role: %s ***REMOVED***\n", d.getType()+"-"+d.getName().replaceAll("/", "-")); - ***REMOVED*** + ***REMOVED******REMOVED*** deps = deps.trim(); out.put("dependencies", deps); return out; diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/ISClient.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/ISClient.java index 044103e..c1c0ce8 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/ISClient.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/clients/ISClient.java @@ -223,7 +223,7 @@ public class ISClient { a.profile().newBody(this.getAlgoBody(algo)); try { SecurityTokenProvider.instance.set(token); - publishScopedResource(a, Arrays.asList(new String[] { ScopeProvider.instance.get() ***REMOVED***)); + publishScopedResource(a, Arrays.asList(new String[] { SecurityTokenProvider.instance.get() ***REMOVED***)); ***REMOVED*** catch (Exception e) { e.printStackTrace(); ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java index 0808a11..0f52be7 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/rest/RestPoolManager.java @@ -69,10 +69,11 @@ public class RestPoolManager implements PoolManager { ***REMOVED*** ProxySelector.setDefault(new ***REMOVED*** PropertiesBasedProxySelector("/home/ngalante/.proxy-settings")); - ***REMOVED***ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab"); - SecurityTokenProvider.instance.set("3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462"); - - + ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab"); + ***REMOVED***SecurityTokenProvider.instance.set("3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462"); + RestPoolManager a = new RestPoolManager(); + ***REMOVED***a.stageAlgorithm("http:***REMOVED***data.d4science.org/MnovRjZIdGV5WlB0WXE5NVNaZnRoRVg0SU8xZWpWQlFHbWJQNStIS0N6Yz0"); + a.publishAlgorithm("http:***REMOVED***data.d4science.org/MnovRjZIdGV5WlB0WXE5NVNaZnRoRVg0SU8xZWpWQlFHbWJQNStIS0N6Yz0", "3a23bfa4-4dfe-44fc-988f-194b91071dd2-843339462"); ***REMOVED*** PoolManager aa = new DataminerPoolManager(); ***REMOVED*** System.out.println(aa.getAlgoById("ICHTHYOP_MODEL_ONE_BY_ONE@3141d3aa-5f93-409f-b6f8-9fae0a6c0ee3")); ***REMOVED*** System.out.println(aa.getAlgoFromIs()); diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java index c4387a5..91426ee 100644 --- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java +++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/service/DataminerPoolManager.java @@ -146,7 +146,7 @@ public class DataminerPoolManager { if(retValue == 0) { updateSVNDependencies(algo, stagingVRE); - createISResource(algo, targetVREToken); + ***REMOVED***createISResource(algo, targetVREToken); ***REMOVED*** ***REMOVED*** destroy the worker worker.destroy();