[DCAE-15] Changes related to version 1.1

See Jira for details

Change-Id: I29280abce45f53e80adf675f48cf1e0fff9e2c0a
Signed-off-by: Carsten Lund <lund@research.att.com>

2 files changed, 50 insertions, 11 deletions

diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/manager/tools/Generator.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/manager/tools/Generator.java
index ec75e64..cffb304 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/manager/tools/Generator.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/manager/tools/Generator.java
@@ -53,12 +53,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

 		dir = "src/main/sirius-gen/" + dir.replace('.', '/');

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

-		m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");

+		m.setTemplateDirectory("../../../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCdapClusterManager");

 		m.setTitle("ControllerServiceCdapClusterManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

+		g.setVersion("ONAP-R2");
 		g.setEnableIRequestHandler(false);

 		g.setEnableISiriusPlugin(false);

 		g.addFactory("org.openecomp.ncomp.servers.cdap.CdapCdapFactory");

@@ -81,12 +82,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+"$", "") + "servers." + p.getNsPrefix();

 		dir = "src/main/sirius-gen/" + dir.replace('.', '/');

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

-		m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");

+		m.setTemplateDirectory("../../../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCdapClusterService");

 		m.setTitle("ControllerServiceCdapClusterService");

 		ControllerGenerator g = new ControllerGenerator(o, m);

+		g.setVersion("ONAP-R2");
 		g.setEnableIRequestHandler(false);

 		g.setEnableISiriusPlugin(true);

 		g.setProvider(VmFactory.eINSTANCE.createVirtualMachineService(), "Dcae");

diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java
index aad5563..772cf46 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java
@@ -25,6 +25,7 @@ import org.openecomp.ncomp.cdap.CdapCluster;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
+import org.openecomp.ncomp.utils.ShellCmd;
 import org.openecomp.dcae.controller.core.service.HealthTestResponse;
 import org.openecomp.dcae.controller.core.service.HealthTestStatus;
 import org.openecomp.dcae.controller.core.service.ServiceFactory;
@@ -39,23 +40,46 @@ public class DcaeCdapClusterManagerProvider extends DcaeVirtualMachineManagerPro
 		super(controller, o);
 		this.o = o;
 	}
+
+	private CdapCluster getCluster() {
+		if (o.getCluster() == null) {
+			logger.warn("Unable to find cluster");
+			throw new RuntimeException("Unable to find cluster");
+		}
+		return o.getCluster();
+	}
+	
 	@Override
 	public HealthTestResponse test() {
+		String s = run(o.getHealthCheckScript(), o.getTestTimeout());
+		String a[] = s.split(":");
+		int index = s.indexOf(":");
+		String msg = index < 0 ? null : s.substring(index);
 		HealthTestResponse res = ServiceFactory.eINSTANCE.createHealthTestResponse();
-		res.setStatus(HealthTestStatus.GREEN);
-		if (o.getCluster() == null || o.getCluster().getConfigurations().size() == 0) {
-			res.setMessageCode("CDAP not working");
+		if ("GREEN".equalsIgnoreCase(a[0])) {
+			res.setStatus(HealthTestStatus.GREEN);
+			res.setMessageCode(msg);
+		} else if ("YELLOW".equalsIgnoreCase(a[0])) {
+			res.setStatus(HealthTestStatus.YELLOW);
+			res.setMessageCode(msg);
+		} else if ("RED".equalsIgnoreCase(a[0])) {
 			res.setStatus(HealthTestStatus.RED);
+			res.setMessageCode(msg);
+		} else {
+			res.setStatus(HealthTestStatus.RED);
+			res.setMessageCode("Bad return string: " + s);
 		}
 		return res;
 	}
-
-	private CdapCluster getCluster() {
-		if (o.getCluster() == null) {
-			logger.warn("Unable to find cluster");
-			throw new RuntimeException("Unable to find cluster");
+	
+	private String run(String cmd, long wait) {
+		try {
+			ShellCmd worker = new ShellCmd(cmd);
+			return worker.result(wait);
+		} catch (Exception e) {
+			logger.warn("Unable to run cmd: " + cmd + " " + e);
+			return "RED:Unable to run cmd: " + cmd + " " + e;
 		}
-		return o.getCluster();
 	}
 
 	public String loadArtifact(String namespace, String artifactName, String jarfile, String version) {
@@ -216,4 +240,17 @@ public class DcaeCdapClusterManagerProvider extends DcaeVirtualMachineManagerPro
 		return getCluster().setPreferencesService(namespace, prefsString, appId, serviceId);
 	}
 
+	public String resumeSchedule(String namespace, String appId, String scheduleId) {
+		return getCluster().resumeSchedule(namespace, appId, scheduleId);
+	}
+
+	public String suspendSchedule(String namespace, String appId, String scheduleId) {
+		return getCluster().suspendSchedule(namespace, appId, scheduleId);
+	}
+
+	public String loadArtifactWithConfig(String namespace, String artifactName, String jarfile, String version,
+			String config) {
+		return getCluster().loadArtifactWithConfig(namespace, artifactName, jarfile, version, config);
+	}
+
 }