Init dcae.controller

Change-Id: I460f09494faa84b55d9c5d54112e098b0e74d007
Signed-off-by: lj1412 <lji@research.att.com>

5 files changed, 955 insertions, 0 deletions

diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java
new file mode 100644
index 0000000..0174c12
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java
@@ -0,0 +1,107 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+package org.openecomp.dcae.controller.service.cdap.adaptor.tools;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EPackage;

+

+import org.openecomp.dcae.controller.service.cdap.CdapFactory;

+import org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerFactory;

+import org.openecomp.utils.YamlToJava;

+import org.openecomp.ncomp.gwt.siriusportal.model.ModelFactory;

+import org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel;

+import org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelFactory;

+import org.openecomp.ncomp.sirius.manager.generator.ControllerGenerator;

+import org.openecomp.ncomp.sirius.manager.server.ServerPackage;

+

+

+public class Generator {

+

+	/**

+	 * @param args

+	 */

+	public static void main(String[] args) {

+		@SuppressWarnings("unused")

+		ServerPackage f = ServerPackage.eINSTANCE;

+		genService();

+		genManager();

+	}

+	

+	

+	public static void genManager() {

+		EObject o = CdapmanagerFactory.eINSTANCE.createCdapManager();

+		EPackage p = o.eClass().getEPackage();

+		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.setPrefix("Dcae");

+		m.setPluginName(p.getNsURI());

+		m.setName("ControllerServiceCdapManager");

+		m.setTitle("ControllerServiceCdapManager");

+		ControllerGenerator g = new ControllerGenerator(o, m);

+		g.setEnableIRequestHandler(false);

+		g.setEnableISiriusPlugin(false);

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

+		g.addFactory(CdapFactory.eINSTANCE);

+		EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();

+		g.addObject("gui", gui, m);

+		g.generate(dir);

+		g.generateScripts("src/main/server-gen/bin", "controller-service-Cdap-manager");

+		String pName = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".logging";

+//		YamlToJava.convert("src/main/resources/DockerAdaptor.yaml", dir + "/logging", pName);

+		YamlToJava.convert("src/main/sirius-gen/CdapManager.yaml", dir + "/logging", pName);

+		String pName1 = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".gui.logging";

+		YamlToJava.convert("src/main/sirius-gen/GuiClientApi.yaml", dir + "/gui/logging", pName1);

+	}

+

+	public static void genService() {

+		@SuppressWarnings("unused")

+		ServerPackage f = ServerPackage.eINSTANCE;

+		EObject o = CdapFactory.eINSTANCE.createCdapService();

+		EPackage p = o.eClass().getEPackage();

+		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.setPrefix("Dcae");

+		m.setPluginName(p.getNsURI());

+		m.setName("CdapService");

+		m.setTitle("CdapService");

+		ControllerGenerator g = new ControllerGenerator(o,m); 

+		g.setEnableIRequestHandler(false);

+		g.setEnableISiriusPlugin(true);

+//		EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();

+//		g.addObject("gui",gui,m);

+		//EObject e = adaptorFactory.eINSTANCE.createVpnEnterprise();

+		//g.addApi("e",e,m);

+		//g.addFactory("org.openecomp.ncomp.sirius.servers.openstack.OsOpenstackFactory");

+		//g.enableDrools();

+		g.generate(dir);

+		g.generateScripts("src/main/server-gen/bin","controller-service-cdap-adaptor"); 

+		String pName = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".logging";

+//		YamlToJava.convert("src/main/resources/DcaeServiceCdapHost.yaml", dir + "/logging", pName);

+		YamlToJava.convert("src/main/sirius-gen/CdapService.yaml", dir + "/logging", pName);

+	}

+

+

+}

diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java
new file mode 100644
index 0000000..8e802e1
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java
@@ -0,0 +1,593 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+package org.openecomp.dcae.controller.service.servers.cdap;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.json.JSONObject;
+
+import org.openecomp.dcae.controller.core.server.DcaeBasicServer;
+import org.openecomp.dcae.controller.core.service.HealthTestResponse;
+import org.openecomp.dcae.controller.core.service.HealthTestStatus;
+import org.openecomp.dcae.controller.core.service.ServiceFactory;
+import org.openecomp.dcae.controller.core.stream.DcaeStream;
+import org.openecomp.dcae.controller.core.stream.DmaapStream;
+import org.openecomp.dcae.controller.service.cdap.CdapApplication;
+import org.openecomp.dcae.controller.service.cdap.CdapArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapFactory;
+import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapService;
+import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance;
+import org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.DcaeCdapClusterManagerConsole;
+import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeCdapClusterService;
+import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeCdapClusterServiceProvider;
+import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
+import org.openecomp.ncomp.cdap.CdapEntityWithPreferences;
+import org.openecomp.ncomp.cdap.CdapKeyPair;
+import org.openecomp.ncomp.cdap.CdapNamespace;
+import org.openecomp.ncomp.core.DeploymentStatus;
+import org.openecomp.ncomp.core.NamedEntity;
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.JavaHttpClient;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServerUtils;
+import org.openecomp.ncomp.sirius.manager.Subject;
+import org.openecomp.ncomp.sirius.manager.metrics.MetricStore;
+import org.openecomp.ncomp.utils.StringUtil;
+
+public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
+	private static final Logger logger = Logger.getLogger(DcaeCdapServiceProvider.class);
+	CdapService o;
+
+	public DcaeCdapServiceProvider(ISiriusServer controller, CdapService o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+	public void deploy(String instanceName, String containerPath) {
+		CdapServiceInstance i = findInstance(instanceName);
+		if (containerPath != null) {
+			Subject s = controller.getServer().find(containerPath);
+			if (s == null || s.o == null) {
+				throw new RuntimeException("Unable to find container object: " + containerPath);
+			}
+			if (!(s.o instanceof CdapClusterServiceInstance))
+				throw new RuntimeException("Unable to deploy to this container: " + s.o);
+			i.setClusterService((CdapClusterServiceInstance) s.o);
+		}
+		i.setCdapName(cdapName(i));
+		DcaeCdapClusterManagerConsole console = consoleCluster(i);
+		// console.loadArtifact(i.getCdapNamespace().getName(), i.getName(),
+		// i.getJarFile());
+		try {
+			console.createNamespace(i.getCdapName());
+		} catch (Exception e1) {
+			logger.warn("reusing existing namespace");
+		}
+		try {
+			for (CdapArtifact a : i.getArtifacts()) {
+				if (a.getVersion() != null)
+					console.loadArtifact(i.getCdapName(), a.getName(), a.getJarFile(), a.getVersion());
+				console.deployApp(i.getCdapName(), a.getJarFile());
+			}
+			for (CdapApplication a : i.getApps()) {
+//				System.err.println("CDAP: start app 1");
+				console.loadArtifact(i.getCdapName(), a.getArtifactName(), a.getJarFile(), a.getVersion());
+//				System.err.println("CDAP: start app 2");
+				if (a.getAppConfigFileContent() == null) 
+					console.createApp(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), "user");
+				else
+					console.createAppWithConfig(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), "user",
+						a.getAppConfigFileContent());
+//				System.err.println("CDAP: start app 3");
+			}
+		} catch (Exception e) {
+			logger.warn("unable to start CDAP app: " + ManagementServer.object2ref(i));
+			e.printStackTrace();
+			throw new RuntimeException("Unable to start CDAP app: " + ManagementServer.object2ref(i) + " " + e);
+		}
+		o.pushManagerConfiguration(instanceName);
+	}
+
+	public void undeploy(String instanceName) {
+		CdapServiceInstance i = findInstance(instanceName);
+		DcaeCdapClusterManagerConsole console = consoleCluster(i);
+		if (i.getCdapName() == null) {
+			i.setCdapName(cdapName(i));
+		}
+		for (String f : i.getFlowNames()) {
+			String[] a = f.split("\\.");
+			if (a.length != 2)
+				throw new RuntimeException("Bad flow name: " + f);
+			try {
+				console.stopFlow(i.getCdapName(), a[0], a[1]);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		for (String a : i.getAppNames()) {
+			try {
+				console.stopApp(i.getCdapName(), a);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		for (CdapArtifact a : i.getArtifacts()) {
+			try {
+//				console.stopApp(i.getCdapName(), a.getName());
+				console.deleteApp(i.getCdapName(), a.getName());
+				if (a.getVersion() != null) {
+					console.deleteArtifact(i.getCdapName(), a.getName(), a.getVersion());
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		for (CdapApplication a : i.getApps()) {
+			try {
+				console.stopApp(i.getCdapName(), a.getName());
+				console.deleteApp(i.getCdapName(), a.getName());
+				console.deleteArtifact(i.getCdapName(), a.getArtifactName(), a.getVersion());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+//		console.deleteNamespace(i.getCdapName());
+	}
+
+	public void pushManagerConfiguration(String instanceName) {
+		CdapServiceInstance i = findInstance(instanceName);
+		o.updateInstanceConfiguration(instanceName);
+		DcaeCdapClusterManagerConsole console = consoleCluster(i);
+		for (CdapArtifact a : i.getArtifacts()) {
+			try {
+				console.stopApp(i.getCdapName(), a.getName());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		for (CdapApplication a : i.getApps()) {
+			try {
+				console.stopApp(i.getCdapName(), a.getName());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		for (String f : i.getFlowNames()) {
+			String[] a = f.split("\\.");
+			if (a.length != 2)
+				throw new RuntimeException("Bad flow name: " + f);
+			try {
+				console.stopFlow(i.getCdapName(), a[0], a[1]);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		for (String w : i.getWorkerNames()) {
+			String[] a = w.split("\\.");
+			if (a.length != 2)
+				throw new RuntimeException("Bad worker name: " + w);
+			try {
+				console.stopWorker(i.getCdapName(), a[0], a[1]);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		for (String s : i.getServiceNames()) {
+			String[] a = s.split("\\.");
+			if (a.length != 2)
+				throw new RuntimeException("Bad service name: " + s);
+			try {
+				console.stopService(i.getCdapName(), a[0], a[1]);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		console.setPreferencesNameSpace(i.getCdapName(), list2string(i.getCdapConfiguration().getPreferences()));
+		for (CdapEntityWithPreferences w : i.getCdapConfiguration().getWorkers()) {
+			if (w.getPreferences().size() == 0)
+				continue;
+			String[] a = w.getName().split("\\.");if (a.length != 2)
+				throw new RuntimeException("Bad worker name: " + w.getName());
+			console.setPreferencesWorker(i.getCdapName(), list2string(w.getPreferences()),a[0],a[1]);
+		}
+		for (CdapEntityWithPreferences s : i.getCdapConfiguration().getServices()) {
+			if (s.getPreferences().size() == 0)
+				continue;
+			String[] a = s.getName().split("\\.");if (a.length != 2)
+				throw new RuntimeException("Bad service name: " + s.getName());
+			console.setPreferencesService(i.getCdapName(), list2string(s.getPreferences()),a[0],a[1]);
+		}
+		for (CdapEntityWithPreferences f : i.getCdapConfiguration().getFlows()) {
+			if (f.getPreferences().size() == 0)
+				continue;
+			String[] a = f.getName().split("\\.");if (a.length != 2)
+				throw new RuntimeException("Bad flow name: " + f.getName());
+			console.setPreferencesFlow(i.getCdapName(), list2string(f.getPreferences()), a[0],a[1]);
+		}
+		for (CdapEntityWithPreferences a : i.getCdapConfiguration().getApps()) {
+			if (a.getPreferences().size() == 0)
+				continue;
+			console.setPreferencesApp(i.getCdapName(), list2string(a.getPreferences()), a.getName());
+		}
+		// TODO what should we do. ??
+		for (String f : i.getFlowNames()) {
+			String[] a = f.split("\\.");
+			if (a.length != 2)
+				throw new RuntimeException("Bad flow name: " + f);
+			console.startFlow(i.getCdapName(), a[0], a[1], null);
+		}
+		for (String w : i.getWorkerNames()) {
+			String[] a = w.split("\\.");
+			if (a.length != 2)
+				throw new RuntimeException("Bad worker name: " + w);
+			console.startWorker(i.getCdapName(), a[0], a[1], null);
+		}
+		for (String s : i.getServiceNames()) {
+			String[] a = s.split("\\.");
+			if (a.length != 2)
+				throw new RuntimeException("Bad service name: " + s);
+			console.startService(i.getCdapName(), a[0], a[1], null);
+		}
+		for (CdapArtifact a : i.getArtifacts()) {
+			try {
+				console.startApp(i.getCdapName(), a.getName());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		for (CdapApplication a : i.getApps()) {
+			try {
+				console.startApp(i.getCdapName(), a.getName());
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+
+	}
+
+	public void pollManagerConfiguration(String instanceName) {
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public EObject managerConfiguration(String instanceName) {
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public JSONObject managerOperation(String instanceName, String operation, JSONObject parameters) {
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public void updateConfigurationFromPolicy(String instanceName) {
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public HealthTestResponse test(String instanceName) {
+		CdapServiceInstance i = findInstance(instanceName);
+		HealthTestResponse res = ServiceFactory.eINSTANCE.createHealthTestResponse();
+		
+		// simple check. Verify that namespace exists in cluster.
+		
+		CdapClusterServiceInstance s = i.getClusterService();
+		if (s.getStatus() != DeploymentStatus.DEPLOYED) {
+			res.setStatus(HealthTestStatus.YELLOW);
+			res.setMessageCode("Cluster not deployed");	
+			return res;
+		}
+		if (s.getCluster() == null) {
+			res.setStatus(HealthTestStatus.RED);
+			res.setMessageCode("No Cluster");
+			return res;
+		}
+		if (i.getNamespace() == null) {
+			res.setStatus(HealthTestStatus.RED);
+			res.setMessageCode("No Namepace for instance");
+			return res;
+		}		
+		for (CdapNamespace n : s.getCluster().getNamespaces()) {
+			if (i.getNamespace().equals(n.getName())) {
+				res.setStatus(HealthTestStatus.GREEN);
+				return res;				
+			}
+		}
+		res.setStatus(HealthTestStatus.YELLOW);
+		res.setMessageCode("Not deployed");
+		return res;
+	}
+
+	public void resume(String instanceName) {
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public void suspend(String instanceName) {
+		// TODO IMPLEMENT
+		throw new UnsupportedOperationException();
+	}
+
+	public void runHealthTests() {
+		for (CdapServiceInstance i : o.getInstances()) {
+			HealthTestResponse h = null;
+			try {
+				h = o.test(i.getName());
+			} catch (Exception e) {
+				h = ServiceFactory.eINSTANCE.createHealthTestResponse();
+				h.setMessageCode("Unable to determine health: " + e);
+				h.setStatus(HealthTestStatus.RED);
+			}
+			i.setHealthTestStatus(h.getStatus());
+			i.setHealthTestMessageCode(h.getMessageCode());
+			MetricStore store = controller.getServer().metrics.getStore(i);
+			Date now = new Date();
+			String path = "/lastHealthTest";
+			store.addLongValue(path, now, now.getTime(), "DateMetricAttribute", false);
+		}
+
+	}
+
+	public void updateInstanceConfiguration(String instanceName) {
+		CdapServiceInstance i = findInstance(instanceName);
+		CdapInternalApplicationConfiguration a = CdapFactory.eINSTANCE.createCdapInternalApplicationConfiguration();
+		for (DcaeStream in : i.getInputStreams()) {
+			if (in instanceof DmaapStream) {
+				updateConfigSimple(i, in, "namespace-prefs::dmaap.in." + in.getName() + ".${attrName}", a);
+			}
+		}
+		for (DcaeStream in : i.getOutputStreams()) {
+			if (in instanceof DmaapStream) {
+				updateConfigSimple(i, in, "namespace-prefs::dmaap.out." + in.getName() + ".${attrName}", a);
+			}
+		}
+		updateConfig(i, i, a);
+		i.setCdapConfiguration(a);
+	}
+
+	private String cdapName(CdapServiceInstance i) {
+//		String n = "dcae:" + o.getName() + ":" + i.getName();
+		// return n.replace("-", "X").replace(":", "Y");
+		return i.getNamespace();
+		// return "dcae"+ new Date().getTime();
+	}
+
+	private DcaeCdapClusterManagerConsole consoleCluster(CdapServiceInstance i) {
+		CdapClusterServiceInstance instance = i.getClusterService();
+		// need to assign the leader
+		EList<DcaeBasicServer> l = instance.getServers();
+		instance.setLeaderServer(l.get(l.size() - 1));
+		DcaeCdapClusterService service = (DcaeCdapClusterService) instance.getService();
+		DcaeCdapClusterServiceProvider provider = service.getSomfProvider();
+		AbstractClient c = provider.getClient(instance);
+		return new DcaeCdapClusterManagerConsole(c);
+	}
+
+	private String list2string(EList<CdapKeyPair> l) {
+		StringBuffer buf = new StringBuffer();
+		boolean first = true;
+		for (CdapKeyPair p : l) {
+			if (p.getValue() == null)
+				continue;
+			if (!first)
+				buf.append(" ");
+			first = false;
+			// dmaap.XX.dmaapPassword
+			if (p.getName().startsWith("dmaap") && p.getName().endsWith("dmaapPassword")) {
+				String pw = p.getValue();
+				if (! pw.startsWith("rsa:")) {
+//					System.err.println("ZZZZZ: unencrypted pw: " + ManagementServer.object2ref(p));
+				}
+				try {
+					pw = JavaHttpClient.decryptPassword(pw);
+				} catch (Exception e) {
+//					System.err.println("ZZZZZ: badly encrypted password: " + ManagementServer.object2ref(p));
+					pw = "badly encrypted password";
+				}
+				buf.append(p.getName()).append("=").append(pw);
+			}
+			else {
+				String v = p.getValue();
+				if (v.startsWith("rsa:")) {
+					try {
+						v = JavaHttpClient.decryptPassword(v);
+					} catch (Exception e) {
+						v = "badly encrypted password";
+					}
+				}
+				buf.append(p.getName()).append("=").append(v);
+			}
+		}
+		return buf.toString();
+	}
+
+	protected CdapServiceInstance findInstance(String instanceName) {
+		for (CdapServiceInstance ii : o.getInstances()) {
+			if (ii.getName().equals(instanceName)) {
+				return ii;
+			}
+		}
+		throw new RuntimeException("Unable to find instance: " + instanceName);
+	}
+
+	private void updateConfigSimple(EObject root, EObject i, String destination, CdapInternalApplicationConfiguration a) {
+		if (i == null)
+			return;
+		for (EAttribute attr : i.eClass().getEAllAttributes()) {
+			add(root, i, attr, destination, a);
+		}
+	}
+
+	private void updateConfig(EObject root, EObject i, CdapInternalApplicationConfiguration appConfig) {
+		if (i == null)
+			return;
+		for (EAttribute attr : i.eClass().getEAllAttributes()) {
+			EAnnotation anno = attr.getEAnnotation("http://openecomp.org/cdap");
+			if (anno == null)
+				continue;
+			String destination = anno.getDetails().get("destination");
+//			System.err.println("AAAAA" + attr.getName() + " " + destination);
+			add(root, i, attr, destination, appConfig);
+		}
+		for (EReference ref : i.eClass().getEAllContainments()) {
+			if (ref.isMany()) {
+				@SuppressWarnings("unchecked")
+				EList<EObject> l = (EList<EObject>) i.eGet(ref);
+				for (EObject o : l) {
+					updateConfig(root, o, appConfig);
+				}
+			} else {
+				updateConfig(root, (EObject) i.eGet(ref), appConfig);
+			}
+		}
+//		System.err.println(ManagementServer.ecore2json(appConfig, 1000, null, true).toString(2));
+	}
+
+	private void add(EObject root, EObject i, EAttribute attr, String destination, CdapInternalApplicationConfiguration appConfig) {
+		// Make this more complex later
+		if (i instanceof NamedEntity) {
+			NamedEntity n = (NamedEntity) i;
+			if (n.getName() != null)
+				destination = destination.replace("${name}", n.getName());
+		}
+		destination = destination.replace("${attrName}", attr.getName());
+		String path1 = ManagementServer.object2ref(root);
+		String path2 = ManagementServer.object2ref(i);
+		String path = path2.replace("/", ".").substring(path1.length() + 1);
+		destination = destination.replace("${path}", path );
+		String[] a = destination.split(":");
+		if (a.length != 3) {
+			throw new RuntimeException("Bad CDAP destination annotation: " + destination);
+		}
+		if ("worker-prefs".equals(a[0])) {
+			add(root, appConfig.getWorkers(), a[1], a[2], i, attr);
+		}
+		if ("service-prefs".equals(a[0])) {
+			add(root, appConfig.getServices(), a[1], a[2], i, attr);
+		}
+		if ("flow-prefs".equals(a[0])) {
+			add(root, appConfig.getFlows(), a[1], a[2], i, attr);
+		}
+		if ("app-prefs".equals(a[0])) {
+			add(root, appConfig.getApps(), a[1], a[2], i, attr);
+		}
+		if ("namespace-prefs".equals(a[0])) {
+			add(root, appConfig.getPreferences(), a[2], i, attr);
+		}
+	}
+
+	private org.openecomp.ncomp.cdap.CdapFactory f = org.openecomp.ncomp.cdap.CdapFactory.eINSTANCE;
+
+	private void add(EObject root, EList<CdapEntityWithPreferences> l, String name, String cdapKey, EObject i, EAttribute attr) {
+		CdapEntityWithPreferences p = null;
+		for (CdapEntityWithPreferences p1 : l) {
+			if (p1.getName().equals(name)) {
+				p = p1;
+				break;
+			}
+		}
+		if (p == null) {
+			p = f.createCdapEntityWithPreferences();
+			l.add(p);
+			p.setName(name);
+		}
+		add(root,p.getPreferences(), cdapKey, i, attr);
+	}
+
+	private void add(EObject root, EList<CdapKeyPair> prefs, String cdapKey, EObject i, EAttribute attr) {
+		String value;
+		if (attr.isMany()) {
+			@SuppressWarnings("unchecked")
+			EList<Object> l = (EList<Object>) i.eGet(attr);
+			List<String> l2 = new ArrayList<String>();
+			for (Object o : l) {
+				l2.add((String) ManagementServer.attr2jsonValue(0, o, attr.getEType()));
+			}
+			value = StringUtil.join(l2, ":");
+		}
+		else 
+			value = (String) ManagementServer.attr2jsonValue(0, i.eGet(attr), attr.getEType());
+		CdapKeyPair pair = f.createCdapKeyPair();
+		pair.setName(cdapKey);
+		pair.setValue(value);
+		prefs.add(pair);
+	}
+	
+	public void start() {
+
+		Thread t = new Thread("cdap service: " + o.getName()) {
+			@Override
+			public void run() {
+				while (true) {
+					try {
+						if (!controller.getServer().isSlave) {
+							updateDeploymentStatus();
+						}
+						Thread.sleep(60000); // sleep 60 seconds
+					} catch (Exception e) {
+						ManagementServerUtils.printStackTrace(e);
+						logger.fatal("vm service: " + o.getName() + " : " + e);
+						try {
+							Thread.sleep(30000);
+						} catch (InterruptedException e1) {
+						}
+					}
+				}
+			}
+
+		};
+		t.start();
+	}
+
+	public void updateDeploymentStatus() {
+//		System.out.println("CDAP updateDeploymentStatus 1: ");
+		for (CdapServiceInstance instance : o.getInstances()) {
+			// TODO Docker deployment status
+			instance.setStatus(DeploymentStatus.UNDEPLOYED);
+//			System.out.println("CDAP updateDeploymentStatus 2: " + instance.getName() + " " + instance.getNamespace());
+			if (instance.getClusterService() == null)
+				continue;
+			for (CdapNamespace c : instance.getClusterService().getCluster().getNamespaces()) {
+//				System.out.println("CDAP updateDeploymentStatus 4: " + c.getName());
+				if (instance.getNamespace() != null && instance.getNamespace().equals(c.getName())) {
+					instance.setStatus(DeploymentStatus.DEPLOYED);
+				}
+			}
+		}
+	}
+
+
+}
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/gui/DcaeGuiClientApiProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/gui/DcaeGuiClientApiProvider.java
new file mode 100644
index 0000000..63e179c
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/gui/DcaeGuiClientApiProvider.java
@@ -0,0 +1,78 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+
+package org.openecomp.dcae.controller.service.servers.cdap.gui;
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.function.FunctionUtils;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+
+
+import org.openecomp.ncomp.sirius.gui.tools.*;
+
+
+import org.openecomp.ncomp.gwt.siriusportal.model.*;
+
+
+import org.openecomp.ncomp.sirius.manager.Subject;
+
+
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+
+
+import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
+
+
+import org.openecomp.ncomp.sirius.manager.BasicGuiClientApiProvider;
+
+
+import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
+import org.openecomp.ncomp.gwt.siriusportal.model.GuiClientApi;
+
+
+public class DcaeGuiClientApiProvider extends BasicGuiClientApiProvider {
+	private static final Logger logger = Logger.getLogger(DcaeGuiClientApiProvider.class);
+	GuiClientApi o;
+
+	public DcaeGuiClientApiProvider(ISiriusServer controller, GuiClientApi o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerProvider.java
new file mode 100644
index 0000000..22f56ee
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerProvider.java
@@ -0,0 +1,99 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+
+package org.openecomp.dcae.controller.service.servers.cdapmanager;
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.function.FunctionUtils;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+
+
+import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+
+
+import org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl;
+import org.openecomp.dcae.controller.service.cdapmanager.CdapManager;
+
+
+public class DcaeCdapManagerProvider extends BasicAdaptorProvider {
+	private static final Logger logger = Logger.getLogger(DcaeCdapManagerProvider.class);
+	CdapManager o;
+
+	public DcaeCdapManagerProvider(ISiriusServer controller, CdapManager o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void suspend() {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void resume() {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public java.lang.String publicKey() {
+		java.lang.String res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void configurationChanged() {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiProvider.java
new file mode 100644
index 0000000..89a06b3
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiProvider.java
@@ -0,0 +1,78 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+
+package org.openecomp.dcae.controller.service.servers.cdapmanager.gui;
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.function.FunctionUtils;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+
+
+import org.openecomp.ncomp.sirius.gui.tools.*;
+
+
+import org.openecomp.ncomp.gwt.siriusportal.model.*;
+
+
+import org.openecomp.ncomp.sirius.manager.Subject;
+
+
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+
+
+import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer;
+
+
+import org.openecomp.ncomp.sirius.manager.BasicGuiClientApiProvider;
+
+
+import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
+import org.openecomp.ncomp.gwt.siriusportal.model.GuiClientApi;
+
+
+public class DcaeGuiClientApiProvider extends BasicGuiClientApiProvider {
+	private static final Logger logger = Logger.getLogger(DcaeGuiClientApiProvider.class);
+	GuiClientApi o;
+
+	public DcaeGuiClientApiProvider(ISiriusServer controller, GuiClientApi o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+
+
+
+
+	
+}