Feature/24026 #3

Merged
giancarlo.panichi merged 194 commits from Feature/24026 into master 2023-11-09 19:12:54 +01:00
3 changed files with 58 additions and 1 deletions
Showing only changes of commit c919d6b0d0 - Show all commits

View File

@ -9,6 +9,7 @@ import org.gcube.dataanalysis.dataminer.poolmanager.ansiblebridge.AnsibleBridge;
import org.gcube.dataanalysis.dataminer.poolmanager.clients.HAProxy;
import org.gcube.dataanalysis.dataminer.poolmanager.clients.ISClient;
import org.gcube.dataanalysis.dataminer.poolmanager.datamodel.*;
import org.gcube.dataanalysis.dataminer.poolmanager.util.Props;
import org.gcube.dataanalysis.dataminer.poolmanager.util.SVNUpdater;
import org.gcube.informationsystem.publisher.AdvancedScopedPublisher;
import org.gcube.informationsystem.publisher.RegistryPublisherFactory;
@ -72,8 +73,9 @@ public class DataminerPoolManager {
private Cluster getStagingDataminerCluster(){
Cluster cluster = new Cluster();
Host h = new Host();
Props p = new Props();
***REMOVED***TODO: read this from configuration or IS?
h.setName("dataminer1-devnext.d4science.org");
h.setName(p.getStagingHost());
cluster.addHost(h);
return cluster;
***REMOVED***

View File

@ -0,0 +1,52 @@
package org.gcube.dataanalysis.dataminer.poolmanager.util;
***REMOVED***
import java.util.Properties;
public class Props {
public static String home = System.getProperty("user.home");
public Props() {
***REMOVED***
public String getCSVUrl() {
Properties props = new Properties();
java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
***REMOVED*** loading properites from properties file
try {
props.load(input);
***REMOVED*** catch (IOException e) {
***REMOVED*** TODO Auto-generated catch block
e.printStackTrace();
***REMOVED***
***REMOVED*** reading proeprty
String path = props.getProperty("HAPROXY_CSV");
return path;
***REMOVED***
public String getStagingHost() {
Properties props = new Properties();
java.io.InputStream input = Props.class.getClassLoader().getResourceAsStream("service.properties");
***REMOVED*** loading properites from properties file
try {
props.load(input);
***REMOVED*** catch (IOException e) {
***REMOVED*** TODO Auto-generated catch block
e.printStackTrace();
***REMOVED***
***REMOVED*** reading proeprty
String path = props.getProperty("STAGING_HOST");
return path;
***REMOVED***
public static void main(String[] args) {
Props a = new Props();
System.out.println(a.getStagingHost());
***REMOVED***
***REMOVED***

View File

@ -0,0 +1,3 @@
#YML node file
STAGING_HOST: dataminer1-devnext.d4science.org
#HAPROXY_CSV: http:***REMOVED***data.d4science.org/Yk4zSFF6V3JOSytNd3JkRDlnRFpDUUR5TnRJZEw2QjRHbWJQNStIS0N6Yz0