Init dcae.controller

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

43 files changed, 5043 insertions, 0 deletions

diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/assembly/assemble_zip.xml b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/assembly/assemble_zip.xml
new file mode 100644
index 0000000..59638ef
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/assembly/assemble_zip.xml
@@ -0,0 +1,61 @@
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>runtime</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<!-- we want "system" and related files right at the root level as this 
+		file is suppose to be unzip on top of a karaf distro. -->
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>dcae-controller-service-dmaap-drsub-manager-${project.version}.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target/assembly/</directory>
+			<outputDirectory>.</outputDirectory>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>.</directory>
+			<outputDirectory>lib</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server-gen/bin</directory>
+			<outputDirectory>bin</outputDirectory>
+			<fileMode>0744</fileMode>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server/bin</directory>
+			<outputDirectory>bin</outputDirectory>
+			<fileMode>0744</fileMode>
+			<excludes>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server-gen/scripts</directory>
+			<outputDirectory>scripts</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/server/scripts</directory>
+			<outputDirectory>scripts</outputDirectory>
+		</fileSet>
+	</fileSets>
+
+</assembly>
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/manager/tools/Generator.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/manager/tools/Generator.java
new file mode 100644
index 0000000..c05b8eb
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/manager/tools/Generator.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.dmaap.drsub.manager.tools;

+

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

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

+

+import org.openecomp.dcae.controller.service.vm.VmFactory;

+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.gwt.siriusportal.model.*;

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

+import org.openecomp.dcae.controller.service.vmmanager.VmmanagerFactory;

+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServiceFactory;

+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerFactory;

+import org.openecomp.utils.YamlToJava;

+

+public class Generator {

+

+	/**

+	 * @param args

+	 */

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

+		@SuppressWarnings("unused")

+		ServerPackage f = ServerPackage.eINSTANCE;

+		genManager();

+		genService();

+	}

+

+	public static void genManager() {

+		EObject o = ManagerFactory.eINSTANCE.createControllerServiceDmaapDrsubManager();

+		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("ControllerServiceDmaapDrsubManager");

+		m.setTitle("ControllerServiceDmaapDrsubManager");

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

+		g.setEnableIRequestHandler(false);

+		g.setEnableISiriusPlugin(false);

+		g.addFactory(ServiceFactory.eINSTANCE);

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

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

+		g.setProvider(VmmanagerFactory.eINSTANCE.createVirtualMachineManager(), "Dcae");

+		g.generate(dir);

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

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

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

+		YamlToJava.convert("src/main/sirius-gen/ControllerServiceDmaapDrsubManager.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() {

+		EObject o = ServiceFactory.eINSTANCE.createControllerServiceDmaapDrsubService();

+		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("ControllerServiceDmaapDrsubService");

+		m.setTitle("ControllerServiceDmaapDrsubService");

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

+		g.setEnableIRequestHandler(false);

+		g.setEnableISiriusPlugin(true);

+		g.addFactory(ServiceFactory.eINSTANCE);

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

+		g.generate(dir);

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

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

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

+	}

+

+}

diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProvider.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProvider.java
new file mode 100644
index 0000000..79401dd
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProvider.java
@@ -0,0 +1,203 @@
+
+/*-
+ * ============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============================================
+ */
+	
+
+/*
+Copyright (c) 2015-16 AT&T Intellectual Property. All rights reserved.
+THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF AT&T
+The copyright notice above does not evidence any
+actual or intended publication of such source code.
+ */
+
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.json.JSONObject;
+
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+
+import org.openecomp.dcae.controller.service.servers.vmmanager.DcaeVirtualMachineManagerProvider;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager;
+
+/**
+ * Service Manager for DMaaP Data Router Subscriber. 
+ * 
+ */
+public class DcaeControllerServiceDmaapDrsubManagerProvider extends DcaeVirtualMachineManagerProvider {
+	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubManagerProvider.class);
+	ControllerServiceDmaapDrsubManager o;
+
+	private static final String APP_HOME_ENV = System.getenv("APP_DRSUB_HOME");
+	private static final String APP_HOME = "/opt/app/dcae-analytics-dmaap-drsub";
+	private static final String CTL_SCRIPT = "dmaapAfSub.sh";	// Subscriber control script 
+	private static final int JSON_INDENT_FACTOR = 0;
+	
+	public DcaeControllerServiceDmaapDrsubManagerProvider(ISiriusServer controller, ControllerServiceDmaapDrsubManager o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+    @Override
+    public void configurationChanged() {
+       // important to call the super methods for handling DMaaP setup.
+       setDmaapConfigurationFile(o.getDmaapConfFile());
+       super.configurationChanged();
+    
+       // we expect all configuration to be available at once
+       // there is no support for individual parameter changes
+       JSONObject json = new JSONObject();
+       json.put("hdfs.uri", o.getHdfsUri());
+       json.put("hdfs.uri_descr", o.getHdfsUriDescr());
+       json.put("hdfs.persist.loc", o.getHdfsPersistLoc());
+       json.put("hdfs.persist.loc_descr", o.getHdfsPersistLocDescr());
+       json.put("dmaap.conf.file", o.getDmaapConfFile());
+       json.put("dmaap.conf.file_descr", o.getDmaapConfFileDescr());
+       json.put("dmaap.streamid", o.getDmaapStreamid());
+       json.put("dmaap.streamid_descr", o.getDmaapStreamidDescr());
+       
+       String jsonStr = json.toString(JSON_INDENT_FACTOR);
+       logger.info("JSON: " + jsonStr);
+
+       String confFile = APP_HOME_ENV == null || APP_HOME_ENV == "" ?
+    		   APP_HOME + "/conf/conf.json" :
+    		   APP_HOME_ENV + "/conf/conf.json";
+       logger.info("confFile: " + confFile);
+       
+       // save backup copy of configuration file
+       try {
+	       Path confFilePath = Paths.get(confFile);
+	       if (Files.exists(confFilePath)) {
+	    	   Files.move(confFilePath, Paths.get(confFile + ".bak"), StandardCopyOption.REPLACE_EXISTING);
+	       }
+       } catch (IOException e) {
+    	   logger.warn("Couldn't rename " + confFile + " to " + confFile + ".bak");
+    	   e.printStackTrace();
+       }
+       
+       // write new configuration
+       Writer w = null;
+       try {
+    	   w = new BufferedWriter(new FileWriter(confFile));
+    	   w.write(jsonStr);
+       } catch (IOException e) {
+    	   logger.error("Error writing " + confFile);
+    	   e.printStackTrace();
+       } finally {
+    	   if (w != null) {
+    		   try {
+    			   w.close();
+    		   } catch (IOException ee) {
+    		   	   ee.printStackTrace();
+    		   }
+    	   }
+       }
+
+       // restart controlled process for config changes to take effect
+       resume();
+    }
+    
+    @Override
+    public void suspend() {
+    	super.suspend();
+    	
+		List<String> command = new ArrayList<String>();
+		logger.info("stopping");
+		command.add(CTL_SCRIPT);
+		command.add("stop");
+		runScript(command);
+	}
+
+    @Override
+    public void resume() {
+    	super.resume();
+
+    	List<String> command = new ArrayList<String>();
+		logger.info("(re)starting");
+		command.add(CTL_SCRIPT);
+		command.add("restart");
+		runScript(command);	}
+
+	private void runScript(List<String> command) {
+		String appBin = APP_HOME_ENV;
+			    
+		if (appBin == null || appBin.equals("")) {
+		    appBin=APP_HOME;
+		}
+		appBin += "/bin";
+		if (command.size() == 2) {
+			File cmdFile = new File(appBin+"/"+command.get(0));
+			if (cmdFile.exists()) {
+			    try {
+			    	ProcessBuilder builder = new ProcessBuilder(appBin+"/"+command.get(0),command.get(1));
+			    	logger.info("command: ["+appBin+"/"+command.get(0)+" "+command.get(1)+"]");
+			    	System.out.println("command: ["+appBin+"/"+command.get(0)+" "+command.get(1)+"]");
+			        Process process = builder.start();
+			        InputStream inStream = process.getInputStream();
+			        process.waitFor();
+			        System.out.println(convertStreamToStr(inStream));
+			    } catch (InterruptedException|IOException e) {
+			            e.printStackTrace();
+			    }
+			} else {
+		    	logger.error("\""+appBin+"/"+command.get(0)+"\" does not exist.");
+		    }
+		}
+    }
+	
+	public static String convertStreamToStr(InputStream is) throws IOException {
+
+		if (is != null) {
+		   Writer writer = new StringWriter();
+
+		   char[] buffer = new char[1024];
+		   try {
+		       Reader reader = new BufferedReader(new InputStreamReader(is,"UTF-8"));
+		       int n;
+		       while ((n = reader.read(buffer)) != -1) {
+		            writer.write(buffer, 0, n);
+		       }
+		   } finally {
+		       is.close();
+		   }
+		   return writer.toString();
+		} else {
+		   return "";
+		}
+	}	
+	
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiProvider.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiProvider.java
new file mode 100644
index 0000000..74b91fd
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/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.dmaap.drsub.servers.manager.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/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProvider.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProvider.java
new file mode 100644
index 0000000..5e0588a
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProvider.java
@@ -0,0 +1,121 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.service;
+
+import org.openecomp.ncomp.core.DeploymentStatus;
+
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+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.Subject;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+import org.openecomp.dcae.controller.core.server.DcaeBasicServer;
+import org.openecomp.dcae.controller.service.servers.vm.DcaeVirtualMachineServiceProvider;
+import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance;
+import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerFactory;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubServiceInstance;
+
+public class DcaeControllerServiceDmaapDrsubServiceProvider extends DcaeVirtualMachineServiceProvider {
+	private static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubServiceProvider.class);
+	ControllerServiceDmaapDrsubService o;
+
+	public DcaeControllerServiceDmaapDrsubServiceProvider(ISiriusServer controller, ControllerServiceDmaapDrsubService o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+	@Override
+	public void deploy(String instanceName, String containerPath) {
+		logger.info("entering deploy");
+		executeCmd(instanceName, "pushManagerConfiguration");
+	}
+
+	@Override
+	public void undeploy(String instanceName) {
+		logger.info("entering undeploy");
+		executeCmd(instanceName, "undeploy");
+	}
+
+	private void executeCmd(String instanceName, String cmd) {
+		ControllerServiceDmaapDrsubServiceInstance i = (ControllerServiceDmaapDrsubServiceInstance) findInstance(instanceName);
+		String cdapServiceName = i.getCdapServiceName();
+		logger.info("cdapServiceName: " + cdapServiceName);
+
+		if (cdapServiceName != null) {
+			String path = "/services/" + cdapServiceName + "/instances/" + instanceName;
+			Subject s = controller.getServer().find(path);
+			if (s != null && s.o != null 
+					&& ((CdapClusterServiceInstance) s.o).getStatus() == DeploymentStatus.DEPLOYED) {
+				i.setCdapClusterInstance((CdapClusterServiceInstance) s.o);
+				switch (cmd) {
+				case "pushManagerConfiguration":
+					o.pushManagerConfiguration(instanceName);
+					break;
+				case "undeploy":
+					// for 1610 undeploy is defined as "stop the DR Subscriber"
+					o.suspend(instanceName);
+					break;
+				}
+			} else {
+				logger.error("Couldn't find deployed CDAP service");
+				throw new RuntimeException("Couldn't find deployed CDAP service");
+			}
+		}
+	}
+
+	@Override
+	public EObject managerConfiguration(String instanceName) {
+		EObject o1 = ManagerFactory.eINSTANCE.createControllerServiceDmaapDrsubManager();
+		ManagementServer.copy(findInstance(instanceName), o1);
+		return o1;
+	}
+
+	@Override
+	public AbstractClient getClient(VirtualMachineServiceInstance i, DcaeBasicServer s) {
+		ControllerServiceDmaapDrsubServiceInstance i1 = (ControllerServiceDmaapDrsubServiceInstance) i;
+		CdapClusterServiceInstance ii = i1.getCdapClusterInstance();
+		JavaHttpClient c = (JavaHttpClient) super.getClient(ii, s);
+		String str = c.getBaseAddress().replace(ii.getManagerPortNumber().toString(),
+				i.getManagerPortNumber().toString());
+		c.setBaseAddress(str);
+		System.err.println("QQQQQ: other-af-dr-sub: baseaddress: " + c.getBaseAddress());
+		return c;
+	}
+	
+	@Override
+	protected EList<DcaeBasicServer> getServers(VirtualMachineServiceInstance i) {
+		ControllerServiceDmaapDrsubServiceInstance i1 = (ControllerServiceDmaapDrsubServiceInstance) i;
+		CdapClusterServiceInstance ii = i1.getCdapClusterInstance();
+		if (ii.getStatus() != DeploymentStatus.DEPLOYED) {
+			logger.error("CDAP service is not deployed - NOT calling getServers()");			
+			throw new RuntimeException("CDAP service is not deployed");
+		}
+		return ii.getServers();
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server-gen/bin/controller-service-dmaap-drsub-manager-controller b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server-gen/bin/controller-service-dmaap-drsub-manager-controller
new file mode 100644
index 0000000..6c007b9
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server-gen/bin/controller-service-dmaap-drsub-manager-controller
@@ -0,0 +1,138 @@
+#!/bin/bash 
+
+# setup env if needed. java 6 required
+## JAVA_HOME=
+  
+############################## DO NOT EDIT BELOW ##########################
+
+SNAME="Dcae Controller"
+PNAME=controller-service-dmaap-drsub-manager-controller
+CLASS=org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.DcaeControllerServiceDmaapDrsubManagerServer
+
+############################## COMMON BELOW ##########################
+
+check_status ()
+{
+    if [ -f "${_PIDFILE}" ]; then
+        _PID=`cat "${_PIDFILE}"`
+        check_status_of_pid $_PID
+    else
+        _STATUS="$SNAME (no pidfile) is NOT running"
+        _RUNNING=0
+    fi
+}
+
+
+check_status_of_pid ()
+{
+    if [ -n "$1" ] && kill -0 $1 2>/dev/null ; then
+        _STATUS="$SNAME (pid $1) is running"
+        _RUNNING=1
+    else
+        _STATUS="$SNAME (pid $1) is NOT running"
+        _RUNNING=0
+    fi
+}
+
+
+check_status_of_pid ()
+{
+    if [ -n "$1" ] && kill -0 $1 2>/dev/null ; then
+        _STATUS="$SNAME (pid $1) is running"
+        _RUNNING=1
+    else
+        _STATUS="$SNAME (pid $1) is NOT running"
+        _RUNNING=0
+    fi
+}
+
+remove_pid_file ()
+{
+   if [ -f "${_PIDFILE}" ]; then
+      rm "${_PIDFILE}"
+   fi
+}
+
+
+_DIR=`dirname "$0"`
+_DIR=`dirname "$_DIR"`
+
+_PIDFILE=$_DIR/PID
+
+CMD=$1
+shift
+
+check_status
+
+CP=$(find $_DIR/lib/*/* -name \*.jar 2>/dev/null | xargs -I X printf ":%s" X)
+
+JVMARGS=$(grep 'server.jvmargs' $_DIR/config/manager.properties | sed -e 's/.*=//')
+
+case $CMD in 
+  status)
+    echo $_STATUS
+    exit 0
+    ;;
+  console)
+    $GROOVY_HOME/bin/groovysh -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP 
+    ;;
+  run)
+    $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@"
+    ;;
+  groovy)
+    $GROOVY_HOME/bin/groovy -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@"
+    ;;
+   start)
+    if [ "$_RUNNING" = "1" ]; then
+      echo $_STATUS
+      exit 0
+    fi
+    mkdir -p $_DIR/logs
+    if [ -e $_DIR/logs/$PNAME.out.1 ]; then mv $_DIR/logs/$PNAME.out.1 $_DIR/logs/$PNAME.out.2; fi
+    if [ -e $_DIR/logs/$PNAME.err.1 ]; then mv $_DIR/logs/$PNAME.err.1 $_DIR/logs/$PNAME.err.2; fi
+    if [ -e $_DIR/logs/$PNAME.out ]; then mv $_DIR/logs/$PNAME.out $_DIR/logs/$PNAME.out.1; fi
+    if [ -e $_DIR/logs/$PNAME.err ]; then mv $_DIR/logs/$PNAME.err $_DIR/logs/$PNAME.err.1; fi
+
+    nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS >> $_DIR/logs/$PNAME.out 2>> $_DIR/logs/$PNAME.err  &
+
+    _PID=$!
+    echo $_PID > $_PIDFILE
+    sleep 5
+    check_status
+    echo $_STATUS
+    if [ "$_RUNNING" = "1" ]; then
+       exit 0
+    else
+       echo "Failed to start - make sure the $SNAME is fully configured properly"
+       exit 1
+    fi
+    ;;
+  stop)
+    if [ "$_RUNNING" = "0" ]; then
+       echo $_STATUS
+       remove_pid_file
+       exit 0
+    fi
+    echo "Stopping $SNAME..."
+    _PID_TO_KILL=$_PID;
+    echo "$SNAME (pid=${_PID_TO_KILL}) is stopping..."
+    kill -TERM $_PID_TO_KILL
+    sleep 5
+    check_status_of_pid $_PID_TO_KILL
+    if [ "$_RUNNING" = "1" ]; then
+       kill -TERM $_PID_TO_KILL
+    fi
+    while [ "$_RUNNING" = "1" ]; do
+       sleep 2
+       check_status_of_pid $_PID_TO_KILL
+    done
+    remove_pid_file
+    echo "$SNAME has stopped."
+    exit 0
+    ;;
+  *)
+    echo "$0 start|stop"
+    ;;
+esac
+
+
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/bin/manager.sh b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/bin/manager.sh
new file mode 100644
index 0000000..a1735c0
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/bin/manager.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+export JAVA_HOME=/opt/app/java/jdk/jdk170
+export GROOVY_HOME=/opt/app/groovy/246
+
+PATH=$JAVA_HOME/bin:$GROOVY_HOME/bin:$PATH
+
+cd $(dirname $(dirname $0))
+
+ROOT=$(pwd)
+CMD=$ROOT/bin/controller-service-dmaap-drsub-manager-controller
+
+mkdir -p logs/
+echo $(date) bin/manager.sh "$@" >> logs/manager.sh.log
+
+CMD1=$1
+shift
+
+VMTYPE=other-af-dr-subscriber
+
+case $CMD1 in
+  start) 
+    JVMARGS=$(cat config/manager.properties | grep JVMARGS | sed 's/[^=]*=//')
+    $CMD $CMD1 $JVMARGS
+    ;;
+  stop|console) 
+    $CMD $CMD1  
+    ;;
+  config) 
+    CONFIGDIR=/var/config/DCAE/chef
+    if [ ! -e $CONFIGDIR/$VMTYPE-manager.properties ]; then CONFIGDIR=/tmp; fi
+    mkdir -p config
+    for FILE in $CONFIGDIR/$VMTYPE-*; do
+      FILE2=$(echo $FILE | sed s/.*$VMTYPE-//)
+      cp $FILE config/$FILE2
+    done
+    /opt/app/dcae-controller-core-utils/bin/setup_https.sh config/manager.properties
+    ;;
+  restore|clean) 
+    ;;
+  restart) 
+    $0 stop
+    $0 start 
+    ;;
+  restart2) 
+    $CMD stop
+    JVMARGS=$(cat config/manager.properties | grep JVMARGS | sed 's/[^=]*=//')
+    $CMD start $JVMARGS
+    ;;
+   *) 
+    echo unknown command: $CMD1 
+    ;;  
+esac
+
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/console.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/console.properties
new file mode 100644
index 0000000..4b63607
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/console.properties
@@ -0,0 +1,3 @@
+localhost.endpoint=http://localhost:PORT
+localhost.user=console
+localhost.password=CONSOLE_PW
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/gui.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/gui.properties
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/gui.properties
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/log4j.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/log4j.properties
new file mode 100644
index 0000000..676ae11
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/log4j.properties
@@ -0,0 +1,26 @@
+#log4j.debug=0
+log4j.rootLogger=warn, file
+log4j.logger.org.openecomp.ncomp=info, file
+log4j.additivity.org.openecomp.ncomp=false
+log4j.logger.org.openecomp.ncomp.datarouter=warn, file
+log4j.additivity.org.openecomp.ncomp.datarouter=false
+log4j.logger.org.apache.http.headers=debug, file
+log4j.logger.org.apache.http.wire=debug, file
+log4j.logger.org.openecomp.dcae.controller.service=info,file
+log4j.additivity.org.openecomp.dcae.controller.service=false
+
+## uploaded logger
+log4j.logger.org.openecomp.ncomp.sirius.manager.uploaded=info, uploaded
+log4j.additivity.org.openecomp.ncomp.sirius.manager.uploaded=false
+## request logging
+log4j.logger.org.openecomp.ncomp.sirius.manager.ManagementServer.requests=info, requests
+log4j.additivity.org.openecomp.ncomp.sirius.manager.ManagementServer.requests=false
+
+
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=logs/BBBB.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d %5p [%t] %m %C:%L%n
+log4j.appender.file.MaxFileSize=50MB
+log4j.appender.file.MaxBackupIndex=5 
+
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/makefile b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/makefile
new file mode 100644
index 0000000..e272181
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/makefile
@@ -0,0 +1,9 @@
+
+restart: stop start
+
+start:
+	M2_HOME=$(HOME)/.m2 bin/BBBB-controller start
+stop:
+	bin/BBBB-controller stop
+console:
+	bin/BBBB-controller console
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/manager.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/manager.properties
new file mode 100644
index 0000000..4605389
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/manager.properties
@@ -0,0 +1,7 @@
+server.dir = data/resources
+metrics.dir = data/metrics
+properties.dir = data/properties
+server.port = PORT
+server.user.console = CONSOLE_PW
+server.user.gui = GUI_PW
+server.user.client = CLIENT_PW
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/pw.sh.sh b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/pw.sh.sh
new file mode 100644
index 0000000..cd022ae
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/config/pw.sh.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+### used to generate random passwords
+
+
+echo '#!/bin/bash'
+echo ""
+
+echo 'cat \'
+
+for i in CONSOLE GUI CLIENT
+do 
+  echo  '  |' sed s/${i}_PW/$(echo $i:$(date +%s) | sha256sum | base64 | head -c 20 ; echo)/ \\
+done
+  
\ No newline at end of file
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/scripts/console.groovy b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/scripts/console.groovy
new file mode 100644
index 0000000..bce2031
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/server/scripts/console.groovy
@@ -0,0 +1,27 @@
+
+/*-
+ * ============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============================================
+ */
+	
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.DcaeControllerServiceDmaapDrsubManagerConsole
+import org.openecomp.ncomp.sirius.manager.console.Utils
+
+manager = new DcaeControllerServiceDmaapDrsubManagerConsole("console.properties","localhost")
+
+def p(x) { Utils.object2json(x).toString(2) }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubManager.yaml b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubManager.yaml
new file mode 100644
index 0000000..63cb773
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubManager.yaml
@@ -0,0 +1,179 @@
+operations:
+  test: {}
+  suspend: {}
+  resume: {}
+  publicKey: {}
+  configurationChanged: {}
+  updateStreams: {}
+  logs: {}
+  metrics: {}
+  properties: {}
+  uploadInfo: {}
+  getValues: {}
+  getValuesAll: {}
+  getMessages: {}
+  getRequestLogger: {}
+  evaluate: {}
+  update: {}
+  REMOTE_test:
+    decription: Remote call test
+  REMOTE_suspend:
+    decription: Remote call suspend
+  REMOTE_resume:
+    decription: Remote call resume
+  REMOTE_publicKey:
+    decription: Remote call publicKey
+  REMOTE_configurationChanged:
+    decription: Remote call configurationChanged
+  REMOTE_updateStreams:
+    decription: Remote call updateStreams
+  REMOTE_logs:
+    decription: Remote call logs
+  REMOTE_metrics:
+    decription: Remote call metrics
+  REMOTE_properties:
+    decription: Remote call properties
+  REMOTE_uploadInfo:
+    decription: Remote call uploadInfo
+  REMOTE_getValues:
+    decription: Remote call getValues
+  REMOTE_getValuesAll:
+    decription: Remote call getValuesAll
+  REMOTE_getMessages:
+    decription: Remote call getMessages
+  REMOTE_getRequestLogger:
+    decription: Remote call getRequestLogger
+  REMOTE_evaluate:
+    decription: Remote call evaluate
+  REMOTE_update:
+    decription: Remote call update
+messages:
+  dummy: {}
+  test:
+    errorCode: test-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  suspend:
+    errorCode: suspend-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  resume:
+    errorCode: resume-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  publicKey:
+    errorCode: publicKey-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  configurationChanged:
+    errorCode: configurationChanged-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  updateStreams:
+    errorCode: updateStreams-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  logs:
+    errorCode: logs-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  metrics:
+    errorCode: metrics-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  properties:
+    errorCode: properties-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  uploadInfo:
+    errorCode: uploadInfo-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getValues:
+    errorCode: getValues-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getValuesAll:
+    errorCode: getValuesAll-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getMessages:
+    errorCode: getMessages-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getRequestLogger:
+    errorCode: getRequestLogger-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  evaluate:
+    errorCode: evaluate-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  update:
+    errorCode: update-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE_test:
+    errorCode: REMOTE-test-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_suspend:
+    errorCode: REMOTE-suspend-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_resume:
+    errorCode: REMOTE-resume-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_publicKey:
+    errorCode: REMOTE-publicKey-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_configurationChanged:
+    errorCode: REMOTE-configurationChanged-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_updateStreams:
+    errorCode: REMOTE-updateStreams-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_logs:
+    errorCode: REMOTE-logs-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_metrics:
+    errorCode: REMOTE-metrics-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_properties:
+    errorCode: REMOTE-properties-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_uploadInfo:
+    errorCode: REMOTE-uploadInfo-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getValues:
+    errorCode: REMOTE-getValues-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getValuesAll:
+    errorCode: REMOTE-getValuesAll-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getMessages:
+    errorCode: REMOTE-getMessages-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getRequestLogger:
+    errorCode: REMOTE-getRequestLogger-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_evaluate:
+    errorCode: REMOTE-evaluate-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_update:
+    errorCode: REMOTE-update-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubService.yaml b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubService.yaml
new file mode 100644
index 0000000..6ac8c34
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubService.yaml
@@ -0,0 +1,135 @@
+operations:
+  deploy: {}
+  undeploy: {}
+  test: {}
+  suspend: {}
+  resume: {}
+  pushManagerConfiguration: {}
+  pollManagerConfiguration: {}
+  managerConfiguration: {}
+  managerOperation: {}
+  updateConfigurationFromPolicy: {}
+  runHealthTests: {}
+  updateDeploymentStatus: {}
+  REMOTE_deploy:
+    decription: Remote call deploy
+  REMOTE_undeploy:
+    decription: Remote call undeploy
+  REMOTE_test:
+    decription: Remote call test
+  REMOTE_suspend:
+    decription: Remote call suspend
+  REMOTE_resume:
+    decription: Remote call resume
+  REMOTE_pushManagerConfiguration:
+    decription: Remote call pushManagerConfiguration
+  REMOTE_pollManagerConfiguration:
+    decription: Remote call pollManagerConfiguration
+  REMOTE_managerConfiguration:
+    decription: Remote call managerConfiguration
+  REMOTE_managerOperation:
+    decription: Remote call managerOperation
+  REMOTE_updateConfigurationFromPolicy:
+    decription: Remote call updateConfigurationFromPolicy
+  REMOTE_runHealthTests:
+    decription: Remote call runHealthTests
+  REMOTE_updateDeploymentStatus:
+    decription: Remote call updateDeploymentStatus
+messages:
+  dummy: {}
+  deploy:
+    errorCode: deploy-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  undeploy:
+    errorCode: undeploy-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  test:
+    errorCode: test-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  suspend:
+    errorCode: suspend-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  resume:
+    errorCode: resume-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  pushManagerConfiguration:
+    errorCode: pushManagerConfiguration-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  pollManagerConfiguration:
+    errorCode: pollManagerConfiguration-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  managerConfiguration:
+    errorCode: managerConfiguration-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  managerOperation:
+    errorCode: managerOperation-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  updateConfigurationFromPolicy:
+    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  runHealthTests:
+    errorCode: runHealthTests-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  updateDeploymentStatus:
+    errorCode: updateDeploymentStatus-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE_deploy:
+    errorCode: REMOTE-deploy-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_undeploy:
+    errorCode: REMOTE-undeploy-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_test:
+    errorCode: REMOTE-test-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_suspend:
+    errorCode: REMOTE-suspend-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_resume:
+    errorCode: REMOTE-resume-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_pushManagerConfiguration:
+    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_pollManagerConfiguration:
+    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_managerConfiguration:
+    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_managerOperation:
+    errorCode: REMOTE-managerOperation-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_updateConfigurationFromPolicy:
+    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_runHealthTests:
+    errorCode: REMOTE-runHealthTests-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_updateDeploymentStatus:
+    errorCode: REMOTE-updateDeploymentStatus-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/GuiClientApi.yaml
new file mode 100644
index 0000000..bf3d69d
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/GuiClientApi.yaml
@@ -0,0 +1,69 @@
+operations:
+  getTree: {}
+  getObject: {}
+  getTimeSerie: {}
+  getTable: {}
+  getHtml: {}
+  getGraph: {}
+  REMOTE_getTree:
+    decription: Remote call getTree
+  REMOTE_getObject:
+    decription: Remote call getObject
+  REMOTE_getTimeSerie:
+    decription: Remote call getTimeSerie
+  REMOTE_getTable:
+    decription: Remote call getTable
+  REMOTE_getHtml:
+    decription: Remote call getHtml
+  REMOTE_getGraph:
+    decription: Remote call getGraph
+messages:
+  dummy: {}
+  getTree:
+    errorCode: getTree-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getObject:
+    errorCode: getObject-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getTimeSerie:
+    errorCode: getTimeSerie-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getTable:
+    errorCode: getTable-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getHtml:
+    errorCode: getHtml-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  getGraph:
+    errorCode: getGraph-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE_getTree:
+    errorCode: REMOTE-getTree-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getObject:
+    errorCode: REMOTE-getObject-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getTimeSerie:
+    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getTable:
+    errorCode: REMOTE-getTable-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getHtml:
+    errorCode: REMOTE-getHtml-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_getGraph:
+    errorCode: REMOTE-getGraph-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManager.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManager.java
new file mode 100644
index 0000000..bdf2fe4
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManager.java
@@ -0,0 +1,494 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager;
+
+
+
+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.openecomp.ncomp.component.ApiRequestStatus;
+
+import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+import java.util.Date;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.logging.ControllerServiceDmaapDrsubManagerOperationEnum;
+
+
+
+
+
+
+
+import java.util.Date;
+
+
+
+
+
+import org.openecomp.ncomp.sirius.manager.server.LoggerInfo;
+
+
+
+
+
+import org.openecomp.ncomp.sirius.manager.server.ServerFactory;
+
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl;
+
+
+
+public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDmaapDrsubManagerImpl {
+	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubManager.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public DcaeControllerServiceDmaapDrsubManagerProvider controller;
+	ISiriusServer server;
+
+	public DcaeControllerServiceDmaapDrsubManager(ISiriusServer server) {
+		this.server = server;
+		this.controller = new DcaeControllerServiceDmaapDrsubManagerProvider(server,this);
+	}
+
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.test);
+		try {
+			res =  controller.test();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "test", ApiRequestStatus.OKAY, duration_);
+		return res;
+	}
+
+	public void suspend() {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.suspend);
+		try {
+			 controller.suspend();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.OKAY, duration_);
+		
+	}
+
+	public void resume() {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.resume);
+		try {
+			 controller.resume();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.OKAY, duration_);
+		
+	}
+
+	public java.lang.String publicKey() {
+		java.lang.String res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.publicKey);
+		try {
+			res =  controller.publicKey();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.OKAY, duration_);
+		return res;
+	}
+
+	public void configurationChanged() {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.configurationChanged);
+		try {
+			 controller.configurationChanged();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.OKAY, duration_);
+		
+	}
+
+	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.updateStreams);
+		try {
+			 controller.updateStreams(inputStreams,outputStreams);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.OKAY, duration_,inputStreams,outputStreams);
+		
+	}
+
+	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.logs);
+		try {
+			 controller.logs(cx,logs);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.OKAY, duration_,cx,logs);
+		
+	}
+
+	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.metrics);
+		try {
+			 controller.metrics(cx,metrics);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.OKAY, duration_,cx,metrics);
+		
+	}
+
+	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.properties);
+		try {
+			 controller.properties(cx,l);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.OKAY, duration_,cx,l);
+		
+	}
+
+	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.uploadInfo);
+		try {
+			 controller.uploadInfo(cx,info);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.OKAY, duration_,cx,info);
+		
+	}
+
+	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
+		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.START, duration_,cx,path,start,end,option,relativeInterval);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.getValues);
+		try {
+			res =  controller.getValues(cx,path,start,end,option,relativeInterval);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.ERROR, duration_,cx,path,start,end,option,relativeInterval);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.OKAY, duration_,cx,path,start,end,option,relativeInterval);
+		return res;
+	}
+
+	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
+		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.START, duration_,cx,path,metrics,start,end,option,relativeInterval);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.getValuesAll);
+		try {
+			res =  controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.ERROR, duration_,cx,path,metrics,start,end,option,relativeInterval);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.OKAY, duration_,cx,path,metrics,start,end,option,relativeInterval);
+		return res;
+	}
+
+	public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) {
+		EList<org.openecomp.ncomp.core.logs.LogMessage> res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.getMessages);
+		try {
+			res =  controller.getMessages(cx,path,start,end);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.OKAY, duration_,cx,path,start,end);
+		return res;
+	}
+
+	public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) {
+		org.openecomp.ncomp.sirius.manager.server.LoggerInfo res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.getRequestLogger);
+		try {
+			res =  controller.getRequestLogger(userName,action,resourcePath,context);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.OKAY, duration_,userName,action,resourcePath,context);
+		return res;
+	}
+
+	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
+		EList<org.openecomp.ncomp.core.function.ValuePair> res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.evaluate);
+		try {
+			res =  controller.evaluate(path,function);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.OKAY, duration_,path,function);
+		return res;
+	}
+
+	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.update);
+		try {
+			 controller.update(path,function);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "update", ApiRequestStatus.OKAY, duration_,path,function);
+		
+	}
+
+
+
+
+
+
+	public static void ecoreSetup() {
+		DcaeControllerServiceDmaapDrsubManagerProvider.ecoreSetup();
+	}
+	public DcaeControllerServiceDmaapDrsubManagerProvider getSomfProvider() {
+		return controller;
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerClient.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerClient.java
new file mode 100644
index 0000000..4b1cefa
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerClient.java
@@ -0,0 +1,344 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager;
+
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient;
+import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
+
+import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.logging.ControllerServiceDmaapDrsubManagerOperationEnum;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.logging.ControllerServiceDmaapDrsubManagerMessageEnum;
+
+
+
+
+
+ 
+@SuppressWarnings("unchecked")
+public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServiceDmaapDrsubManagerImpl {
+	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubManagerClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public AbstractClient client;
+
+	public DcaeControllerServiceDmaapDrsubManagerClient(String file, String name) {
+		DcaeControllerServiceDmaapDrsubManager.ecoreSetup(); 
+		client = new GenericHttpClient(file,name);
+		client.add("/resources", this);
+	}
+
+	public DcaeControllerServiceDmaapDrsubManagerClient(String file, String name1, String name2) {
+		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
+		client = client1.all; // requests should be forwarded to all.
+		client.add("/resources", this);
+	}
+	
+	public DcaeControllerServiceDmaapDrsubManagerClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+	}
+
+
+
+	@Override
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_test);
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
+		try {
+		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_test, e.toString());
+			throw new RuntimeException("remote call failed:  test", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public void suspend() {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_suspend);
+		
+		try {
+		  client.operationPath("/resources", c, "suspend", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_suspend, e.toString());
+			throw new RuntimeException("remote call failed:  suspend", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void resume() {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_resume);
+		
+		try {
+		  client.operationPath("/resources", c, "resume", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_resume, e.toString());
+			throw new RuntimeException("remote call failed:  resume", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public java.lang.String publicKey() {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_publicKey);
+		java.lang.String res;
+		try {
+		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_publicKey, e.toString());
+			throw new RuntimeException("remote call failed:  publicKey", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public void configurationChanged() {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_configurationChanged);
+		
+		try {
+		  client.operationPath("/resources", c, "configurationChanged", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_configurationChanged, e.toString());
+			throw new RuntimeException("remote call failed:  configurationChanged", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_updateStreams);
+		
+		try {
+		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_updateStreams, e.toString());
+			throw new RuntimeException("remote call failed:  updateStreams", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_logs);
+		
+		try {
+		  client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_logs, e.toString());
+			throw new RuntimeException("remote call failed:  logs", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_metrics);
+		
+		try {
+		  client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_metrics, e.toString());
+			throw new RuntimeException("remote call failed:  metrics", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_properties);
+		
+		try {
+		  client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_properties, e.toString());
+			throw new RuntimeException("remote call failed:  properties", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_uploadInfo);
+		
+		try {
+		  client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_uploadInfo, e.toString());
+			throw new RuntimeException("remote call failed:  uploadInfo", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_getValues);
+		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res;
+		try {
+		  res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValues", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end,option,relativeInterval);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_getValues, e.toString());
+			throw new RuntimeException("remote call failed:  getValues", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_getValuesAll);
+		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res;
+		try {
+		  res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValuesAll", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,metrics,start,end,option,relativeInterval);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_getValuesAll, e.toString());
+			throw new RuntimeException("remote call failed:  getValuesAll", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_getMessages);
+		EList<org.openecomp.ncomp.core.logs.LogMessage> res;
+		try {
+		  res = (EList<org.openecomp.ncomp.core.logs.LogMessage>) client.operationPath("/resources", c, "getMessages", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_getMessages, e.toString());
+			throw new RuntimeException("remote call failed:  getMessages", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_getRequestLogger);
+		org.openecomp.ncomp.sirius.manager.server.LoggerInfo res;
+		try {
+		  res = (org.openecomp.ncomp.sirius.manager.server.LoggerInfo) client.operationPath("/resources", c, "getRequestLogger", null, userName,action,resourcePath,context);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_getRequestLogger, e.toString());
+			throw new RuntimeException("remote call failed:  getRequestLogger", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_evaluate);
+		EList<org.openecomp.ncomp.core.function.ValuePair> res;
+		try {
+		  res = (EList<org.openecomp.ncomp.core.function.ValuePair>) client.operationPath("/resources", c, "evaluate", null, path,function);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_evaluate, e.toString());
+			throw new RuntimeException("remote call failed:  evaluate", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_update);
+		
+		try {
+		  client.operationPath("/resources", c, "update", null, path,function);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_update, e.toString());
+			throw new RuntimeException("remote call failed:  update", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerConsole.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerConsole.java
new file mode 100644
index 0000000..0432188
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerConsole.java
@@ -0,0 +1,237 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit but extend this class as needed
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager;
+
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+
+import org.openecomp.ncomp.sirius.manager.console.Console;
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.ManagementServerError;
+
+    
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.DcaeGuiClientApiConsole;   
+
+
+public class DcaeControllerServiceDmaapDrsubManagerConsole extends Console {
+	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubManagerConsole.class);
+    protected DcaeControllerServiceDmaapDrsubManagerClient controller;
+    
+    
+        DcaeGuiClientApiConsole gui;   
+
+
+    public DcaeControllerServiceDmaapDrsubManagerConsole(String filename, String name) {
+            super(filename, name);
+            controller = new DcaeControllerServiceDmaapDrsubManagerClient(filename,name);
+            client = controller.client;
+    
+            gui = new  DcaeGuiClientApiConsole(filename,name);   
+    }
+    
+	public DcaeControllerServiceDmaapDrsubManagerConsole(AbstractClient c) {
+        controller = new DcaeControllerServiceDmaapDrsubManagerClient(c);
+        client = controller.client;
+    }
+
+
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res = null;
+		try {
+			res =  controller.test();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void suspend() {
+		
+		try {
+			 controller.suspend();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void resume() {
+		
+		try {
+			 controller.resume();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public java.lang.String publicKey() {
+		java.lang.String res = null;
+		try {
+			res =  controller.publicKey();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void configurationChanged() {
+		
+		try {
+			 controller.configurationChanged();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
+		
+		try {
+			 controller.updateStreams(inputStreams,outputStreams);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void logs(EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
+		
+		try {
+			 controller.logs(null,logs);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void metrics(EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
+		
+		try {
+			 controller.metrics(null,metrics);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void properties(EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
+		
+		try {
+			 controller.properties(null,l);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void uploadInfo(EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
+		
+		try {
+			 controller.uploadInfo(null,info);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
+		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res = null;
+		try {
+			res =  controller.getValues(null,path,start,end,option,relativeInterval);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
+		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res = null;
+		try {
+			res =  controller.getValuesAll(null,path,metrics,start,end,option,relativeInterval);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(java.lang.String path, java.lang.Long start, java.lang.Long end) {
+		EList<org.openecomp.ncomp.core.logs.LogMessage> res = null;
+		try {
+			res =  controller.getMessages(null,path,start,end);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) {
+		org.openecomp.ncomp.sirius.manager.server.LoggerInfo res = null;
+		try {
+			res =  controller.getRequestLogger(userName,action,resourcePath,context);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
+		EList<org.openecomp.ncomp.core.function.ValuePair> res = null;
+		try {
+			res =  controller.evaluate(path,function);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
+		
+		try {
+			 controller.update(path,function);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProviderTemplate.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProviderTemplate.java
new file mode 100644
index 0000000..2d2fe2d
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProviderTemplate.java
@@ -0,0 +1,72 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.manager;
+
+
+
+
+
+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 java.util.Date;
+
+
+import org.openecomp.ncomp.sirius.manager.server.LoggerInfo;
+
+
+import org.openecomp.ncomp.sirius.manager.server.ServerFactory;
+
+
+import org.openecomp.dcae.controller.service.servers.vmmanager.DcaeVirtualMachineManagerProvider;
+
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ControllerServiceDmaapDrsubManagerImpl;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager;
+
+
+public class DcaeControllerServiceDmaapDrsubManagerProviderTemplate extends DcaeVirtualMachineManagerProvider {
+	private static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubManagerProviderTemplate.class);
+	ControllerServiceDmaapDrsubManager o;
+
+	public DcaeControllerServiceDmaapDrsubManagerProviderTemplate(ISiriusServer controller, ControllerServiceDmaapDrsubManager o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerServer.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerServer.java
new file mode 100644
index 0000000..01b7df1
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerServer.java
@@ -0,0 +1,112 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit but extend this class as needed
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager;
+
+import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
+
+import java.io.IOException;
+import java.util.Properties;
+import java.util.TimeZone;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EFactory;
+
+import org.openecomp.entity.EcompComponent;
+import org.openecomp.entity.EcompSubComponent;
+import org.openecomp.entity.EcompSubComponentInstance;
+import org.openecomp.ncomp.sirius.manager.Jetty8Server;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager;
+
+    
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.DcaeModelFactory;
+
+
+
+
+
+public class DcaeControllerServiceDmaapDrsubManagerServer implements ISiriusServer {
+    public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubManagerServer.class);
+    String serverPath;
+    ManagementServer server;
+    DcaeControllerServiceDmaapDrsubManager controller;
+    String directory = "data";
+//      LocationControllerApi api ;
+    Jetty8Server webServer;
+    DcaeManagerFactory f = new DcaeManagerFactory(this);
+	
+    
+    String guiPath;
+    ManagementServer guiServer;
+
+
+    public DcaeControllerServiceDmaapDrsubManagerServer(String filename) throws IOException {
+		logger.warn("controller restarting");
+		DcaeControllerServiceDmaapDrsubManager.ecoreSetup(); 
+		props = getPropertiesFromClasspath(filename);
+        serverPath = (String) props.get("server.dir");
+        server = new ManagementServer(f, "ControllerServiceDmaapDrsubManager", serverPath, filename);
+        server.addFactory(f);
+
+		server.addFactory(org.openecomp.dcae.controller.service.dmaap.drsub.service.ServiceFactory.eINSTANCE);
+  
+
+        server.addRuntimeFactories(this);
+        server.start();
+    }
+    public void runWebserver() throws IOException {
+        controller = (DcaeControllerServiceDmaapDrsubManager) server.find("/").o;
+        webServer = new Jetty8Server("manager.properties");
+        webServer.add("/resources",server);
+
+
+    
+		EFactory guiFactory = new DcaeModelFactory(this);
+		guiPath = serverPath + "/gui";
+		guiServer = new ManagementServer(guiFactory, "GuiClientApi", guiPath, "gui.properties");
+		guiServer.start();
+		webServer.add("/gui",guiServer);
+
+
+
+        logger.info("Joining webserver");
+        webServer.join();
+    }
+    static Properties props = null;
+    public static void main(String []args) throws IOException {
+            // ALWAYS USE GMT.
+            TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+            
+            DcaeControllerServiceDmaapDrsubManagerServer s = new DcaeControllerServiceDmaapDrsubManagerServer("manager.properties");
+            s.runWebserver();
+    }
+	public ControllerServiceDmaapDrsubManager getController() {
+		return controller;
+	}
+	public ManagementServer getServer() {
+		return server;
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeManagerFactory.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeManagerFactory.java
new file mode 100644
index 0000000..7bf2edb
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeManagerFactory.java
@@ -0,0 +1,54 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ManagerPackage;
+import org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.ManagerFactoryImpl;
+
+
+
+
+
+public class DcaeManagerFactory extends ManagerFactoryImpl {
+	public static final Logger logger = Logger.getLogger(DcaeManagerFactory.class);
+	ISiriusServer server = null;
+	@Override
+	public EPackage getEPackage() { return ManagerPackage.eINSTANCE; }
+	public DcaeManagerFactory(ISiriusServer server) {
+		this.server = server;
+	}
+	@Override
+	public ControllerServiceDmaapDrsubManager createControllerServiceDmaapDrsubManager() {
+		return new DcaeControllerServiceDmaapDrsubManager(server);
+	}
+	
+	
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApi.java
new file mode 100644
index 0000000..99b9703
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApi.java
@@ -0,0 +1,256 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.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.openecomp.ncomp.component.ApiRequestStatus;
+
+import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+import java.util.Date;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.logging.GuiClientApiOperationEnum;
+
+
+
+
+
+
+
+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.gwt.siriusportal.model.impl.GuiClientApiImpl;
+
+
+
+public class DcaeGuiClientApi extends GuiClientApiImpl {
+	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public DcaeGuiClientApiProvider controller;
+	ISiriusServer server;
+
+	public DcaeGuiClientApi(ISiriusServer server) {
+		this.server = server;
+		this.controller = new DcaeGuiClientApiProvider(server,this);
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.getTree);
+		try {
+			res =  controller.getTree();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.OKAY, duration_);
+		return res;
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.getObject);
+		try {
+			res =  controller.getObject(path);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.OKAY, duration_,path);
+		return res;
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie getTimeSerie(java.lang.String path, java.lang.String start, java.lang.String end, java.lang.String duration) {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.START, duration_,path,start,end,duration);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.getTimeSerie);
+		try {
+			res =  controller.getTimeSerie(path,start,end,duration);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.OKAY, duration_,path,start,end,duration);
+		return res;
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTable getTable(java.lang.String path, java.lang.String start, java.lang.String end) {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.START, duration_,path,start,end);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.getTable);
+		try {
+			res =  controller.getTable(path,start,end);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.OKAY, duration_,path,start,end);
+		return res;
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml getHtml(java.lang.String path, java.lang.String start, java.lang.String end) {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.START, duration_,path,start,end);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.getHtml);
+		try {
+			res =  controller.getHtml(path,start,end);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.OKAY, duration_,path,start,end);
+		return res;
+	}
+
+	public org.openecomp.ncomp.sirius.manager.graph.GuiGraph getGraph(java.lang.String path, java.lang.String start, java.lang.String end) {
+		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.START, duration_,path,start,end);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.getGraph);
+		try {
+			res =  controller.getGraph(path,start,end);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.OKAY, duration_,path,start,end);
+		return res;
+	}
+
+
+
+
+
+
+	public static void ecoreSetup() {
+		DcaeGuiClientApiProvider.ecoreSetup();
+	}
+	public DcaeGuiClientApiProvider getSomfProvider() {
+		return controller;
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiClient.java
new file mode 100644
index 0000000..3d5c489
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiClient.java
@@ -0,0 +1,175 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui;
+
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient;
+import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
+
+import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+
+import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
+import org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.logging.GuiClientApiMessageEnum;
+
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.DcaeControllerServiceDmaapDrsubManager; 
+
+
+
+ 
+@SuppressWarnings("unchecked")
+public class DcaeGuiClientApiClient extends GuiClientApiImpl {
+	public static final Logger logger = Logger.getLogger(DcaeGuiClientApiClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public AbstractClient client;
+
+	public DcaeGuiClientApiClient(String file, String name) {
+		DcaeControllerServiceDmaapDrsubManager.ecoreSetup(); 
+		client = new GenericHttpClient(file,name);
+		client.add("/gui", this);
+	}
+
+	public DcaeGuiClientApiClient(String file, String name1, String name2) {
+		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
+		client = client1.all; // requests should be forwarded to all.
+		client.add("/gui", this);
+	}
+	
+	public DcaeGuiClientApiClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+	}
+
+
+
+	@Override
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTree, e.toString());
+			throw new RuntimeException("remote call failed:  getTree", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) {
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getObject);
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getObject, e.toString());
+			throw new RuntimeException("remote call failed:  getObject", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie getTimeSerie(java.lang.String path, java.lang.String start, java.lang.String end, java.lang.String duration) {
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTimeSerie);
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTimeSerie, e.toString());
+			throw new RuntimeException("remote call failed:  getTimeSerie", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTable getTable(java.lang.String path, java.lang.String start, java.lang.String end) {
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTable);
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTable, e.toString());
+			throw new RuntimeException("remote call failed:  getTable", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml getHtml(java.lang.String path, java.lang.String start, java.lang.String end) {
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getHtml);
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res;
+		try {
+		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getHtml, e.toString());
+			throw new RuntimeException("remote call failed:  getHtml", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.openecomp.ncomp.sirius.manager.graph.GuiGraph getGraph(java.lang.String path, java.lang.String start, java.lang.String end) {
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getGraph);
+		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res;
+		try {
+		  res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getGraph, e.toString());
+			throw new RuntimeException("remote call failed:  getGraph", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiConsole.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiConsole.java
new file mode 100644
index 0000000..35a9bb7
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiConsole.java
@@ -0,0 +1,123 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit but extend this class as needed
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui;
+
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+
+import org.openecomp.ncomp.sirius.manager.console.Console;
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.ManagementServerError;
+
+
+
+
+public class DcaeGuiClientApiConsole extends Console {
+	public static final Logger logger = Logger.getLogger(DcaeGuiClientApiConsole.class);
+    protected DcaeGuiClientApiClient controller;
+    
+
+
+
+    public DcaeGuiClientApiConsole(String filename, String name) {
+            super(filename, name);
+            controller = new DcaeGuiClientApiClient(filename,name);
+            client = controller.client;
+
+    }
+    
+	public DcaeGuiClientApiConsole(AbstractClient c) {
+        controller = new DcaeGuiClientApiClient(c);
+        client = controller.client;
+    }
+
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res = null;
+		try {
+			res =  controller.getTree();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res = null;
+		try {
+			res =  controller.getObject(path);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie getTimeSerie(java.lang.String path, java.lang.String start, java.lang.String end, java.lang.String duration) {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res = null;
+		try {
+			res =  controller.getTimeSerie(path,start,end,duration);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTable getTable(java.lang.String path, java.lang.String start, java.lang.String end) {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res = null;
+		try {
+			res =  controller.getTable(path,start,end);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml getHtml(java.lang.String path, java.lang.String start, java.lang.String end) {
+		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res = null;
+		try {
+			res =  controller.getHtml(path,start,end);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.openecomp.ncomp.sirius.manager.graph.GuiGraph getGraph(java.lang.String path, java.lang.String start, java.lang.String end) {
+		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res = null;
+		try {
+			res =  controller.getGraph(path,start,end);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiProviderTemplate.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiProviderTemplate.java
new file mode 100644
index 0000000..46749ba
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiProviderTemplate.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.dmaap.drsub.servers.manager.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 DcaeGuiClientApiProviderTemplate extends BasicGuiClientApiProvider {
+	private static final Logger logger = Logger.getLogger(DcaeGuiClientApiProviderTemplate.class);
+	GuiClientApi o;
+
+	public DcaeGuiClientApiProviderTemplate(ISiriusServer controller, GuiClientApi o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeModelFactory.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeModelFactory.java
new file mode 100644
index 0000000..2fb962f
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeModelFactory.java
@@ -0,0 +1,54 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+
+import org.openecomp.ncomp.gwt.siriusportal.model.GuiClientApi;
+import org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage;
+import org.openecomp.ncomp.gwt.siriusportal.model.impl.ModelFactoryImpl;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.DcaeControllerServiceDmaapDrsubManagerServer; 
+
+
+
+public class DcaeModelFactory extends ModelFactoryImpl {
+	public static final Logger logger = Logger.getLogger(DcaeModelFactory.class);
+	ISiriusServer server = null;
+	@Override
+	public EPackage getEPackage() { return ModelPackage.eINSTANCE; }
+	public DcaeModelFactory(ISiriusServer server) {
+		this.server = server;
+	}
+	@Override
+	public GuiClientApi createGuiClientApi() {
+		return new DcaeGuiClientApi(server);
+	}
+	
+	
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApi.properties
new file mode 100644
index 0000000..8705ab8
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApi.properties
@@ -0,0 +1,78 @@
+
+dummy=\
+  null|\
+  null|\
+  null|\
+  null
+
+getTree=\
+  getTree-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getObject=\
+  getObject-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getTimeSerie=\
+  getTimeSerie-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getTable=\
+  getTable-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getHtml=\
+  getHtml-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getGraph=\
+  getGraph-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REMOTE_getTree=\
+  REMOTE-getTree-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getObject=\
+  REMOTE-getObject-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getTimeSerie=\
+  REMOTE-getTimeSerie-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getTable=\
+  REMOTE-getTable-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getHtml=\
+  REMOTE-getHtml-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getGraph=\
+  REMOTE-getGraph-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiMessageEnum.java
new file mode 100644
index 0000000..56c6b9f
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiMessageEnum.java
@@ -0,0 +1,47 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.manager.gui.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum GuiClientApiMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  getTree,
+  getObject,
+  getTimeSerie,
+  getTable,
+  getHtml,
+  getGraph,
+  REMOTE_getTree,
+  REMOTE_getObject,
+  REMOTE_getTimeSerie,
+  REMOTE_getTable,
+  REMOTE_getHtml,
+  REMOTE_getGraph;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.logging.GuiClientApi");
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiOperationEnum.java
new file mode 100644
index 0000000..0b177b6
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiOperationEnum.java
@@ -0,0 +1,41 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.manager.gui.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum GuiClientApiOperationEnum implements EcompOperationEnum {
+
+  getTree,
+  getObject,
+  getTimeSerie,
+  getTable,
+  getHtml,
+  getGraph,
+  REMOTE_getTree,
+  REMOTE_getObject,
+  REMOTE_getTimeSerie,
+  REMOTE_getTable,
+  REMOTE_getHtml,
+  REMOTE_getGraph;
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManager.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManager.properties
new file mode 100644
index 0000000..9eb6331
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManager.properties
@@ -0,0 +1,198 @@
+
+dummy=\
+  null|\
+  null|\
+  null|\
+  null
+
+test=\
+  test-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+suspend=\
+  suspend-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+resume=\
+  resume-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+publicKey=\
+  publicKey-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+configurationChanged=\
+  configurationChanged-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+updateStreams=\
+  updateStreams-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+logs=\
+  logs-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+metrics=\
+  metrics-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+properties=\
+  properties-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+uploadInfo=\
+  uploadInfo-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getValues=\
+  getValues-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getValuesAll=\
+  getValuesAll-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getMessages=\
+  getMessages-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+getRequestLogger=\
+  getRequestLogger-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+evaluate=\
+  evaluate-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+update=\
+  update-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REMOTE_test=\
+  REMOTE-test-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_suspend=\
+  REMOTE-suspend-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_resume=\
+  REMOTE-resume-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_publicKey=\
+  REMOTE-publicKey-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_configurationChanged=\
+  REMOTE-configurationChanged-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_updateStreams=\
+  REMOTE-updateStreams-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_logs=\
+  REMOTE-logs-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_metrics=\
+  REMOTE-metrics-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_properties=\
+  REMOTE-properties-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_uploadInfo=\
+  REMOTE-uploadInfo-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getValues=\
+  REMOTE-getValues-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getValuesAll=\
+  REMOTE-getValuesAll-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getMessages=\
+  REMOTE-getMessages-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_getRequestLogger=\
+  REMOTE-getRequestLogger-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_evaluate=\
+  REMOTE-evaluate-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_update=\
+  REMOTE-update-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerMessageEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerMessageEnum.java
new file mode 100644
index 0000000..2f98bc9
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerMessageEnum.java
@@ -0,0 +1,67 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.manager.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum ControllerServiceDmaapDrsubManagerMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  test,
+  suspend,
+  resume,
+  publicKey,
+  configurationChanged,
+  updateStreams,
+  logs,
+  metrics,
+  properties,
+  uploadInfo,
+  getValues,
+  getValuesAll,
+  getMessages,
+  getRequestLogger,
+  evaluate,
+  update,
+  REMOTE_test,
+  REMOTE_suspend,
+  REMOTE_resume,
+  REMOTE_publicKey,
+  REMOTE_configurationChanged,
+  REMOTE_updateStreams,
+  REMOTE_logs,
+  REMOTE_metrics,
+  REMOTE_properties,
+  REMOTE_uploadInfo,
+  REMOTE_getValues,
+  REMOTE_getValuesAll,
+  REMOTE_getMessages,
+  REMOTE_getRequestLogger,
+  REMOTE_evaluate,
+  REMOTE_update;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.logging.ControllerServiceDmaapDrsubManager");
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerOperationEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerOperationEnum.java
new file mode 100644
index 0000000..6e9b169
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerOperationEnum.java
@@ -0,0 +1,61 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.manager.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum ControllerServiceDmaapDrsubManagerOperationEnum implements EcompOperationEnum {
+
+  test,
+  suspend,
+  resume,
+  publicKey,
+  configurationChanged,
+  updateStreams,
+  logs,
+  metrics,
+  properties,
+  uploadInfo,
+  getValues,
+  getValuesAll,
+  getMessages,
+  getRequestLogger,
+  evaluate,
+  update,
+  REMOTE_test,
+  REMOTE_suspend,
+  REMOTE_resume,
+  REMOTE_publicKey,
+  REMOTE_configurationChanged,
+  REMOTE_updateStreams,
+  REMOTE_logs,
+  REMOTE_metrics,
+  REMOTE_properties,
+  REMOTE_uploadInfo,
+  REMOTE_getValues,
+  REMOTE_getValuesAll,
+  REMOTE_getMessages,
+  REMOTE_getRequestLogger,
+  REMOTE_evaluate,
+  REMOTE_update;
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubService.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubService.java
new file mode 100644
index 0000000..5d8c902
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubService.java
@@ -0,0 +1,381 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.service;
+
+
+
+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.openecomp.ncomp.component.ApiRequestStatus;
+
+import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+import java.util.Date;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.service.logging.ControllerServiceDmaapDrsubServiceOperationEnum;
+
+
+
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceImpl;
+
+
+
+public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDmaapDrsubServiceImpl implements ISiriusPlugin {
+	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubService.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public DcaeControllerServiceDmaapDrsubServiceProvider controller;
+	ISiriusServer server;
+
+	public DcaeControllerServiceDmaapDrsubService(ISiriusServer server) {
+		this.server = server;
+		this.controller = new DcaeControllerServiceDmaapDrsubServiceProvider(server,this);
+	}
+
+	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.deploy);
+		try {
+			 controller.deploy(instanceName,containerPath);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.OKAY, duration_,instanceName,containerPath);
+		
+	}
+
+	public void undeploy(java.lang.String instanceName) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.undeploy);
+		try {
+			 controller.undeploy(instanceName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.OKAY, duration_,instanceName);
+		
+	}
+
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.test);
+		try {
+			res =  controller.test(instanceName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "test", ApiRequestStatus.OKAY, duration_,instanceName);
+		return res;
+	}
+
+	public void suspend(java.lang.String instanceName) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.suspend);
+		try {
+			 controller.suspend(instanceName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.OKAY, duration_,instanceName);
+		
+	}
+
+	public void resume(java.lang.String instanceName) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.resume);
+		try {
+			 controller.resume(instanceName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.OKAY, duration_,instanceName);
+		
+	}
+
+	public void pushManagerConfiguration(java.lang.String instanceName) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.pushManagerConfiguration);
+		try {
+			 controller.pushManagerConfiguration(instanceName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.OKAY, duration_,instanceName);
+		
+	}
+
+	public void pollManagerConfiguration(java.lang.String instanceName) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.pollManagerConfiguration);
+		try {
+			 controller.pollManagerConfiguration(instanceName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.OKAY, duration_,instanceName);
+		
+	}
+
+	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
+		org.eclipse.emf.ecore.EObject res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.managerConfiguration);
+		try {
+			res =  controller.managerConfiguration(instanceName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.OKAY, duration_,instanceName);
+		return res;
+	}
+
+	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
+		org.json.JSONObject res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.managerOperation);
+		try {
+			res =  controller.managerOperation(instanceName,operation,parameters);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.OKAY, duration_,instanceName,operation,parameters);
+		return res;
+	}
+
+	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.updateConfigurationFromPolicy);
+		try {
+			 controller.updateConfigurationFromPolicy(instanceName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.OKAY, duration_,instanceName);
+		
+	}
+
+	public void runHealthTests() {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.runHealthTests);
+		try {
+			 controller.runHealthTests();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.OKAY, duration_);
+		
+	}
+
+	public void updateDeploymentStatus() {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.START, duration_);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.updateDeploymentStatus);
+		try {
+			 controller.updateDeploymentStatus();
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.ERROR, duration_);
+			System.err.println("ERROR: " + e);
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.OKAY, duration_);
+		
+	}
+
+
+
+
+
+
+	@Override
+	public void start() {
+		controller.start();
+	}
+
+	public static void ecoreSetup() {
+		DcaeControllerServiceDmaapDrsubServiceProvider.ecoreSetup();
+	}
+	public DcaeControllerServiceDmaapDrsubServiceProvider getSomfProvider() {
+		return controller;
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceClient.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceClient.java
new file mode 100644
index 0000000..61034f8
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceClient.java
@@ -0,0 +1,276 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.service;
+
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient;
+import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
+
+import org.apache.log4j.Logger;
+
+import org.openecomp.logger.EcompLogger;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceImpl;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.service.logging.ControllerServiceDmaapDrsubServiceOperationEnum;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.service.logging.ControllerServiceDmaapDrsubServiceMessageEnum;
+
+
+
+
+
+ 
+@SuppressWarnings("unchecked")
+public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServiceDmaapDrsubServiceImpl {
+	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubServiceClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public AbstractClient client;
+
+	public DcaeControllerServiceDmaapDrsubServiceClient(String file, String name) {
+		DcaeControllerServiceDmaapDrsubService.ecoreSetup(); 
+		client = new GenericHttpClient(file,name);
+		client.add("/resources", this);
+	}
+
+	public DcaeControllerServiceDmaapDrsubServiceClient(String file, String name1, String name2) {
+		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
+		client = client1.all; // requests should be forwarded to all.
+		client.add("/resources", this);
+	}
+	
+	public DcaeControllerServiceDmaapDrsubServiceClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+	}
+
+
+
+	@Override
+	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_deploy);
+		
+		try {
+		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_deploy, e.toString());
+			throw new RuntimeException("remote call failed:  deploy", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void undeploy(java.lang.String instanceName) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_undeploy);
+		
+		try {
+		  client.operationPath("/resources", c, "undeploy", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_undeploy, e.toString());
+			throw new RuntimeException("remote call failed:  undeploy", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_test);
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
+		try {
+		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_test, e.toString());
+			throw new RuntimeException("remote call failed:  test", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public void suspend(java.lang.String instanceName) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_suspend);
+		
+		try {
+		  client.operationPath("/resources", c, "suspend", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_suspend, e.toString());
+			throw new RuntimeException("remote call failed:  suspend", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void resume(java.lang.String instanceName) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_resume);
+		
+		try {
+		  client.operationPath("/resources", c, "resume", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_resume, e.toString());
+			throw new RuntimeException("remote call failed:  resume", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void pushManagerConfiguration(java.lang.String instanceName) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		
+		try {
+		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
+			throw new RuntimeException("remote call failed:  pushManagerConfiguration", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void pollManagerConfiguration(java.lang.String instanceName) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		
+		try {
+		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
+			throw new RuntimeException("remote call failed:  pollManagerConfiguration", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_managerConfiguration);
+		org.eclipse.emf.ecore.EObject res;
+		try {
+		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
+			throw new RuntimeException("remote call failed:  managerConfiguration", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_managerOperation);
+		org.json.JSONObject res;
+		try {
+		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_managerOperation, e.toString());
+			throw new RuntimeException("remote call failed:  managerOperation", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		
+		try {
+		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
+			throw new RuntimeException("remote call failed:  updateConfigurationFromPolicy", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void runHealthTests() {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_runHealthTests);
+		
+		try {
+		  client.operationPath("/resources", c, "runHealthTests", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_runHealthTests, e.toString());
+			throw new RuntimeException("remote call failed:  runHealthTests", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void updateDeploymentStatus() {
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_updateDeploymentStatus);
+		
+		try {
+		  client.operationPath("/resources", c, "updateDeploymentStatus", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_updateDeploymentStatus, e.toString());
+			throw new RuntimeException("remote call failed:  updateDeploymentStatus", e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceConsole.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceConsole.java
new file mode 100644
index 0000000..babb1bc
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceConsole.java
@@ -0,0 +1,189 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit but extend this class as needed
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.service;
+
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+
+import org.openecomp.ncomp.sirius.manager.console.Console;
+import org.openecomp.ncomp.sirius.manager.AbstractClient;
+import org.openecomp.ncomp.sirius.manager.ManagementServerError;
+
+
+
+
+public class DcaeControllerServiceDmaapDrsubServiceConsole extends Console {
+	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubServiceConsole.class);
+    protected DcaeControllerServiceDmaapDrsubServiceClient controller;
+    
+
+
+
+    public DcaeControllerServiceDmaapDrsubServiceConsole(String filename, String name) {
+            super(filename, name);
+            controller = new DcaeControllerServiceDmaapDrsubServiceClient(filename,name);
+            client = controller.client;
+
+    }
+    
+	public DcaeControllerServiceDmaapDrsubServiceConsole(AbstractClient c) {
+        controller = new DcaeControllerServiceDmaapDrsubServiceClient(c);
+        client = controller.client;
+    }
+
+
+	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
+		
+		try {
+			 controller.deploy(instanceName,containerPath);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void undeploy(java.lang.String instanceName) {
+		
+		try {
+			 controller.undeploy(instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res = null;
+		try {
+			res =  controller.test(instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void suspend(java.lang.String instanceName) {
+		
+		try {
+			 controller.suspend(instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void resume(java.lang.String instanceName) {
+		
+		try {
+			 controller.resume(instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void pushManagerConfiguration(java.lang.String instanceName) {
+		
+		try {
+			 controller.pushManagerConfiguration(instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void pollManagerConfiguration(java.lang.String instanceName) {
+		
+		try {
+			 controller.pollManagerConfiguration(instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
+		org.eclipse.emf.ecore.EObject res = null;
+		try {
+			res =  controller.managerConfiguration(instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
+		org.json.JSONObject res = null;
+		try {
+			res =  controller.managerOperation(instanceName,operation,parameters);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
+		
+		try {
+			 controller.updateConfigurationFromPolicy(instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void runHealthTests() {
+		
+		try {
+			 controller.runHealthTests();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void updateDeploymentStatus() {
+		
+		try {
+			 controller.updateDeploymentStatus();
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProviderTemplate.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProviderTemplate.java
new file mode 100644
index 0000000..aaf26fe
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProviderTemplate.java
@@ -0,0 +1,65 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.service;
+
+
+
+
+
+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.dcae.controller.service.servers.vm.DcaeVirtualMachineServiceProvider;
+
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ControllerServiceDmaapDrsubServiceImpl;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService;
+
+
+public class DcaeControllerServiceDmaapDrsubServiceProviderTemplate extends DcaeVirtualMachineServiceProvider {
+	private static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubServiceProviderTemplate.class);
+	ControllerServiceDmaapDrsubService o;
+
+	public DcaeControllerServiceDmaapDrsubServiceProviderTemplate(ISiriusServer controller, ControllerServiceDmaapDrsubService o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceServer.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceServer.java
new file mode 100644
index 0000000..3732195
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceServer.java
@@ -0,0 +1,101 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit but extend this class as needed
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.service;
+
+import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
+
+import java.io.IOException;
+import java.util.Properties;
+import java.util.TimeZone;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EFactory;
+
+import org.openecomp.entity.EcompComponent;
+import org.openecomp.entity.EcompSubComponent;
+import org.openecomp.entity.EcompSubComponentInstance;
+import org.openecomp.ncomp.sirius.manager.Jetty8Server;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService;
+
+
+
+
+
+
+public class DcaeControllerServiceDmaapDrsubServiceServer implements ISiriusServer {
+    public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubServiceServer.class);
+    String serverPath;
+    ManagementServer server;
+    DcaeControllerServiceDmaapDrsubService controller;
+    String directory = "data";
+//      LocationControllerApi api ;
+    Jetty8Server webServer;
+    DcaeServiceFactory f = new DcaeServiceFactory(this);
+	
+
+
+    public DcaeControllerServiceDmaapDrsubServiceServer(String filename) throws IOException {
+		logger.warn("controller restarting");
+		DcaeControllerServiceDmaapDrsubService.ecoreSetup(); 
+		props = getPropertiesFromClasspath(filename);
+        serverPath = (String) props.get("server.dir");
+        server = new ManagementServer(f, "ControllerServiceDmaapDrsubService", serverPath, filename);
+        server.addFactory(f);
+
+		server.addFactory(org.openecomp.dcae.controller.service.dmaap.drsub.service.ServiceFactory.eINSTANCE);
+  
+
+        server.addRuntimeFactories(this);
+        server.start();
+    }
+    public void runWebserver() throws IOException {
+        controller = (DcaeControllerServiceDmaapDrsubService) server.find("/").o;
+        webServer = new Jetty8Server("service.properties");
+        webServer.add("/resources",server);
+
+
+
+
+
+        logger.info("Joining webserver");
+        webServer.join();
+    }
+    static Properties props = null;
+    public static void main(String []args) throws IOException {
+            // ALWAYS USE GMT.
+            TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+            
+            DcaeControllerServiceDmaapDrsubServiceServer s = new DcaeControllerServiceDmaapDrsubServiceServer("service.properties");
+            s.runWebserver();
+    }
+	public ControllerServiceDmaapDrsubService getController() {
+		return controller;
+	}
+	public ManagementServer getServer() {
+		return server;
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeServiceFactory.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeServiceFactory.java
new file mode 100644
index 0000000..271c961
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeServiceFactory.java
@@ -0,0 +1,54 @@
+
+/*-
+ * ============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============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.service.dmaap.drsub.servers.service;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.ServicePackage;
+import org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.ServiceFactoryImpl;
+
+
+
+
+
+public class DcaeServiceFactory extends ServiceFactoryImpl {
+	public static final Logger logger = Logger.getLogger(DcaeServiceFactory.class);
+	ISiriusServer server = null;
+	@Override
+	public EPackage getEPackage() { return ServicePackage.eINSTANCE; }
+	public DcaeServiceFactory(ISiriusServer server) {
+		this.server = server;
+	}
+	@Override
+	public ControllerServiceDmaapDrsubService createControllerServiceDmaapDrsubService() {
+		return new DcaeControllerServiceDmaapDrsubService(server);
+	}
+	
+	
+
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubService.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubService.properties
new file mode 100644
index 0000000..d32cf07
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubService.properties
@@ -0,0 +1,150 @@
+
+dummy=\
+  null|\
+  null|\
+  null|\
+  null
+
+deploy=\
+  deploy-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+undeploy=\
+  undeploy-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+test=\
+  test-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+suspend=\
+  suspend-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+resume=\
+  resume-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+pushManagerConfiguration=\
+  pushManagerConfiguration-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+pollManagerConfiguration=\
+  pollManagerConfiguration-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+managerConfiguration=\
+  managerConfiguration-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+managerOperation=\
+  managerOperation-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+updateConfigurationFromPolicy=\
+  updateConfigurationFromPolicy-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+runHealthTests=\
+  runHealthTests-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+updateDeploymentStatus=\
+  updateDeploymentStatus-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REMOTE_deploy=\
+  REMOTE-deploy-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_undeploy=\
+  REMOTE-undeploy-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_test=\
+  REMOTE-test-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_suspend=\
+  REMOTE-suspend-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_resume=\
+  REMOTE-resume-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_pushManagerConfiguration=\
+  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_pollManagerConfiguration=\
+  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_managerConfiguration=\
+  REMOTE-managerConfiguration-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_managerOperation=\
+  REMOTE-managerOperation-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_updateConfigurationFromPolicy=\
+  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_runHealthTests=\
+  REMOTE-runHealthTests-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_updateDeploymentStatus=\
+  REMOTE-updateDeploymentStatus-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceMessageEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceMessageEnum.java
new file mode 100644
index 0000000..0582cf0
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceMessageEnum.java
@@ -0,0 +1,59 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.service.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum ControllerServiceDmaapDrsubServiceMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  deploy,
+  undeploy,
+  test,
+  suspend,
+  resume,
+  pushManagerConfiguration,
+  pollManagerConfiguration,
+  managerConfiguration,
+  managerOperation,
+  updateConfigurationFromPolicy,
+  runHealthTests,
+  updateDeploymentStatus,
+  REMOTE_deploy,
+  REMOTE_undeploy,
+  REMOTE_test,
+  REMOTE_suspend,
+  REMOTE_resume,
+  REMOTE_pushManagerConfiguration,
+  REMOTE_pollManagerConfiguration,
+  REMOTE_managerConfiguration,
+  REMOTE_managerOperation,
+  REMOTE_updateConfigurationFromPolicy,
+  REMOTE_runHealthTests,
+  REMOTE_updateDeploymentStatus;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.dmaap.drsub.servers.service.logging.ControllerServiceDmaapDrsubService");
+	}
+}
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceOperationEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceOperationEnum.java
new file mode 100644
index 0000000..d811721
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceOperationEnum.java
@@ -0,0 +1,53 @@
+
+/*-
+ * ============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.dmaap.drsub.servers.service.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum ControllerServiceDmaapDrsubServiceOperationEnum implements EcompOperationEnum {
+
+  deploy,
+  undeploy,
+  test,
+  suspend,
+  resume,
+  pushManagerConfiguration,
+  pollManagerConfiguration,
+  managerConfiguration,
+  managerOperation,
+  updateConfigurationFromPolicy,
+  runHealthTests,
+  updateDeploymentStatus,
+  REMOTE_deploy,
+  REMOTE_undeploy,
+  REMOTE_test,
+  REMOTE_suspend,
+  REMOTE_resume,
+  REMOTE_pushManagerConfiguration,
+  REMOTE_pollManagerConfiguration,
+  REMOTE_managerConfiguration,
+  REMOTE_managerOperation,
+  REMOTE_updateConfigurationFromPolicy,
+  REMOTE_runHealthTests,
+  REMOTE_updateDeploymentStatus;
+}