diff --git a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleBridge.java b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleBridge.java index 1ba74c0..6060b80 100644 --- a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleBridge.java +++ b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/AnsibleBridge.java @@ -212,17 +212,17 @@ public class AnsibleBridge ***REMOVED*** */ public Collection generateRoles(Dependency d) ***REMOVED*** Collection roles = new Vector<>(); - if("os".equals(d.getType())) ***REMOVED*** + if("os".equalsIgnoreCase(d.getType())) ***REMOVED*** OSDependencyPackage pkg = new OSDependencyPackage(d); if(pkg!=null) ***REMOVED*** roles.addAll(pkg.getRoles(this.getTemplateManager())); ***REMOVED*** - ***REMOVED*** else if("custom".equals(d.getType())) ***REMOVED*** + ***REMOVED*** else if("custom".equalsIgnoreCase(d.getType())) ***REMOVED*** CustomDependencyPackage pkg = new CustomDependencyPackage(d); if(pkg!=null) ***REMOVED*** roles.addAll(pkg.getRoles(this.getCustomRoleManager())); ***REMOVED*** - ***REMOVED*** else if("cran".equals(d.getType())) ***REMOVED*** + ***REMOVED*** else if("cran".equalsIgnoreCase(d.getType())) ***REMOVED*** CranDependencyPackage pkg = new CranDependencyPackage(d); if(pkg!=null) ***REMOVED*** roles.addAll(pkg.getRoles(this.getTemplateManager())); diff --git a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java index 35ff26a..e60067f 100644 --- a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java +++ b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/ansiblebridge/template/AlgorithmPackage.java @@ -22,7 +22,15 @@ public class AlgorithmPackage ***REMOVED*** protected Map getDictionary(Algorithm a) ***REMOVED*** Map out = new HashMap(); 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 = ""; + for(Dependency d:a.getDependencies()) ***REMOVED*** deps+=String.format("- ***REMOVED*** role: %s ***REMOVED***\n", d.getType()+"-"+d.getName()); ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/process/AlgorithmPackageParser.java b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/process/AlgorithmPackageParser.java index b5ceff8..75d3336 100644 --- a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/process/AlgorithmPackageParser.java +++ b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/process/AlgorithmPackageParser.java @@ -159,7 +159,7 @@ public class AlgorithmPackageParser ***REMOVED*** for (String pkg : dependencies) ***REMOVED*** Dependency dep = new Dependency(); dep.setName(pkg); - dep.setType("OS"); + dep.setType("os"); out.addDependency(dep); ***REMOVED*** ***REMOVED*** diff --git a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java index 694691e..4e9b7dc 100644 --- a/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java +++ b/src/main/java/org/gcube/dataanalysys/dataminerpoolmanager/service/DataminerPoolManager.java @@ -119,8 +119,4 @@ public class DataminerPoolManager ***REMOVED*** ***REMOVED*** -***REMOVED*** private void updateClusters() ***REMOVED*** -***REMOVED*** System.out.println("flushing changes to all clusters"); -***REMOVED*** ***REMOVED*** - ***REMOVED***