gCubeSystem
/
dataminer-pool-manager
15
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-analysis/dataminer-pool-manager@134609 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Paolo Fabriani 2016-11-23 16:33:17 +00:00
parent e64e854bf8
commit 893685350e
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleBridge.java
View File

@ -212,17 +212,17 @@ public class AnsibleBridge ***REMOVED***
*/ */
public Collection<Role> generateRoles(Dependency d) ***REMOVED*** public Collection<Role> generateRoles(Dependency d) ***REMOVED***
Collection<Role> roles = new Vector<>(); Collection<Role> roles = new Vector<>();
if("os".equals(d.getType())) ***REMOVED*** if("os".equalsIgnoreCase(d.getType())) ***REMOVED***
OSDependencyPackage pkg = new OSDependencyPackage(d); OSDependencyPackage pkg = new OSDependencyPackage(d);
if(pkg!=null) ***REMOVED*** if(pkg!=null) ***REMOVED***
roles.addAll(pkg.getRoles(this.getTemplateManager())); roles.addAll(pkg.getRoles(this.getTemplateManager()));
***REMOVED*** ***REMOVED***
***REMOVED*** else if("custom".equals(d.getType())) ***REMOVED*** ***REMOVED*** else if("custom".equalsIgnoreCase(d.getType())) ***REMOVED***
CustomDependencyPackage pkg = new CustomDependencyPackage(d); CustomDependencyPackage pkg = new CustomDependencyPackage(d);
if(pkg!=null) ***REMOVED*** if(pkg!=null) ***REMOVED***
roles.addAll(pkg.getRoles(this.getCustomRoleManager())); roles.addAll(pkg.getRoles(this.getCustomRoleManager()));
***REMOVED*** ***REMOVED***
***REMOVED*** else if("cran".equals(d.getType())) ***REMOVED*** ***REMOVED*** else if("cran".equalsIgnoreCase(d.getType())) ***REMOVED***
CranDependencyPackage pkg = new CranDependencyPackage(d); CranDependencyPackage pkg = new CranDependencyPackage(d);
if(pkg!=null) ***REMOVED*** if(pkg!=null) ***REMOVED***
roles.addAll(pkg.getRoles(this.getTemplateManager())); roles.addAll(pkg.getRoles(this.getTemplateManager()));

8
src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java
View File

@ -22,7 +22,15 @@ public class AlgorithmPackage ***REMOVED***
protected Map<String, String> getDictionary(Algorithm a) ***REMOVED*** protected Map<String, String> getDictionary(Algorithm a) ***REMOVED***
Map<String, String> out = new HashMap<String, String>(); Map<String, String> out = new HashMap<String, String>();
out.put("name", a.getName()); out.put("name", a.getName());
out.put("category", a.getCategory());
out.put("class", a.getClazz());
out.put("p5", "TEMP_TRANSDUCERS");
out.put("p6", "TEMP_??");
out.put("vre", "FAKE_VRE");
out.put("packageurl", a.getPackageURL());
out.put("description", a.getDescription());
String deps = ""; String deps = "";
for(Dependency d:a.getDependencies()) ***REMOVED*** for(Dependency d:a.getDependencies()) ***REMOVED***
deps+=String.format("- ***REMOVED*** role: %s ***REMOVED***\n", d.getType()+"-"+d.getName()); deps+=String.format("- ***REMOVED*** role: %s ***REMOVED***\n", d.getType()+"-"+d.getName());
***REMOVED*** ***REMOVED***

2
src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/process/AlgorithmPackageParser.java
View File

@ -159,7 +159,7 @@ public class AlgorithmPackageParser ***REMOVED***
for (String pkg : dependencies) ***REMOVED*** for (String pkg : dependencies) ***REMOVED***
Dependency dep = new Dependency(); Dependency dep = new Dependency();
dep.setName(pkg); dep.setName(pkg);
dep.setType("OS"); dep.setType("os");
out.addDependency(dep); out.addDependency(dep);
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***

4
src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java
View File

@ -119,8 +119,4 @@ public class DataminerPoolManager ***REMOVED***
***REMOVED*** ***REMOVED***
***REMOVED*** private void updateClusters() ***REMOVED***
***REMOVED*** System.out.println("flushing changes to all clusters");
***REMOVED*** ***REMOVED***
***REMOVED*** ***REMOVED***