Init dcae.controller

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

38 files changed, 4597 insertions, 0 deletions

diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/ControllerCluster.yaml b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/ControllerCluster.yaml
new file mode 100644
index 0000000..a3d8f3d
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/ControllerCluster.yaml
@@ -0,0 +1,25 @@
+operations:
+  pushData: {}
+  receiveData: {}
+  REMOTE_pushData:
+    decription: Remote call pushData
+  REMOTE_receiveData:
+    decription: Remote call receiveData
+messages:
+  dummy: {}
+  pushData:
+    errorCode: pushData-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  receiveData:
+    errorCode: receiveData-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE_pushData:
+    errorCode: REMOTE-pushData-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_receiveData:
+    errorCode: REMOTE-receiveData-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/ControllerVirtualMachineService.yaml b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/ControllerVirtualMachineService.yaml
new file mode 100644
index 0000000..6ac8c34
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/ControllerVirtualMachineService.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-core/dcae-controller-platform-server/src/main/sirius-gen/DcaePlatformController.yaml b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaePlatformController.yaml
new file mode 100644
index 0000000..08497ed
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/DcaePlatformController.yaml
@@ -0,0 +1,135 @@
+operations:
+  logs: {}
+  metrics: {}
+  properties: {}
+  uploadInfo: {}
+  getValues: {}
+  getValuesAll: {}
+  getMessages: {}
+  getRequestLogger: {}
+  evaluate: {}
+  update: {}
+  deployDescriptor: {}
+  refreshDataBus: {}
+  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
+  REMOTE_deployDescriptor:
+    decription: Remote call deployDescriptor
+  REMOTE_refreshDataBus:
+    decription: Remote call refreshDataBus
+messages:
+  dummy: {}
+  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
+  deployDescriptor:
+    errorCode: deployDescriptor-FAILED-5001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  refreshDataBus:
+    errorCode: refreshDataBus-FAILED-5001W
+    messageFormat: '{0}'
+    description: 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
+  REMOTE_deployDescriptor:
+    errorCode: REMOTE-deployDescriptor-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE_refreshDataBus:
+    errorCode: REMOTE-refreshDataBus-FAILED-5001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/GuiClientApi.yaml
new file mode 100644
index 0000000..bf3d69d
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerCluster.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerCluster.java
new file mode 100644
index 0000000..05b41bf
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerCluster.java
@@ -0,0 +1,145 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
+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.eclipse.emf.ecore.EObject;
+import org.json.JSONObject;
+
+import java.util.Date;
+
+import org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerClusterOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerClusterMessageEnum;
+
+
+
+
+import org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterImpl;
+
+
+
+public class DcaeControllerCluster extends ControllerClusterImpl implements ISiriusPlugin {
+	public static final Logger logger = Logger.getLogger(DcaeControllerCluster.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public DcaeControllerClusterProvider controller;
+	ISiriusServer server;
+
+	public DcaeControllerCluster(ISiriusServer server) {
+		this.server = server;
+		this.controller = new DcaeControllerClusterProvider(server,this);
+	}
+
+	public void pushData(java.lang.String serverName, java.lang.String dataName) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "pushData", ApiRequestStatus.START, duration_,serverName,dataName);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerClusterOperationEnum.pushData);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		try {
+			 controller.pushData(serverName,dataName);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "pushData", ApiRequestStatus.ERROR, duration_,serverName,dataName);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(ControllerClusterMessageEnum.pushData, e.toString());
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "pushData", ApiRequestStatus.OKAY, duration_,serverName,dataName);
+		
+	}
+
+	public void receiveData(java.lang.String serverName, java.lang.String dataName, java.util.Date time, java.lang.String content) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "receiveData", ApiRequestStatus.START, duration_,serverName,dataName,time,content);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerClusterOperationEnum.receiveData);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		try {
+			 controller.receiveData(serverName,dataName,time,content);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "receiveData", ApiRequestStatus.ERROR, duration_,serverName,dataName,time,content);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(ControllerClusterMessageEnum.receiveData, e.toString());
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "receiveData", ApiRequestStatus.OKAY, duration_,serverName,dataName,time,content);
+		
+	}
+
+
+
+
+
+
+
+
+	@Override
+	public void start() {
+		controller.start();
+	}
+
+	public static void ecoreSetup() {
+		DcaeControllerClusterProvider.ecoreSetup();
+	}
+	public DcaeControllerClusterProvider getSomfProvider() {
+		return controller;
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterClient.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterClient.java
new file mode 100644
index 0000000..a274556
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterClient.java
@@ -0,0 +1,107 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+// Autogenerated
+// Do not edit. No need to extend this class.
+package org.openecomp.dcae.controller.platform.servers.controller;
+
+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.platform.controller.impl.ControllerClusterImpl;
+import org.openecomp.dcae.controller.platform.controller.ControllerPackage;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerClusterOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerClusterMessageEnum;
+
+
+import org.openecomp.dcae.controller.platform.servers.controller.DcaeDcaePlatformController; 
+
+
+
+ 
+@SuppressWarnings("unchecked")
+public class DcaeControllerClusterClient extends ControllerClusterImpl {
+	public static final Logger logger = Logger.getLogger(DcaeControllerClusterClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public AbstractClient client;
+
+	public DcaeControllerClusterClient(String file, String name) {
+		DcaeDcaePlatformController.ecoreSetup(); 
+		client = new GenericHttpClient(file,name);
+		client.add("/cluster", this);
+	}
+
+	public DcaeControllerClusterClient(String file, String name1, String name2) {
+		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
+		client = client1.all; // requests should be forwarded to all.
+		client.add("/cluster", this);
+	}
+	
+	public DcaeControllerClusterClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+	}
+
+
+
+	
+	public void pushData(String path, java.lang.String serverName, java.lang.String dataName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerCluster(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerClusterOperationEnum.REMOTE_pushData);
+		
+		try {
+		  client.operationPath(path, c, "pushData", null, serverName,dataName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerClusterMessageEnum.REMOTE_pushData, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pushData: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public void receiveData(String path, java.lang.String serverName, java.lang.String dataName, java.util.Date time, java.lang.String content) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerCluster(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerClusterOperationEnum.REMOTE_receiveData);
+		
+		try {
+		  client.operationPath(path, c, "receiveData", null, serverName,dataName,time,content);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerClusterMessageEnum.REMOTE_receiveData, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@receiveData: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterConsole.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterConsole.java
new file mode 100644
index 0000000..00c0b5f
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterConsole.java
@@ -0,0 +1,79 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+
+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 DcaeControllerClusterConsole extends Console {
+	public static final Logger logger = Logger.getLogger(DcaeControllerClusterConsole.class);
+    protected DcaeControllerClusterClient controller;
+    
+
+
+
+    public DcaeControllerClusterConsole(String filename, String name) {
+            super(filename, name);
+            controller = new DcaeControllerClusterClient(filename,name);
+            client = controller.client;
+
+    }
+    
+	public DcaeControllerClusterConsole(AbstractClient c) {
+        controller = new DcaeControllerClusterClient(c);
+        client = controller.client;
+    }
+
+
+	public void pushData(String path, java.lang.String serverName, java.lang.String dataName) {
+		
+		try {
+			 controller.pushData(path,serverName,dataName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void receiveData(String path, java.lang.String serverName, java.lang.String dataName, java.util.Date time, java.lang.String content) {
+		
+		try {
+			 controller.receiveData(path,serverName,dataName,time,content);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProviderTemplate.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProviderTemplate.java
new file mode 100644
index 0000000..6726313
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProviderTemplate.java
@@ -0,0 +1,77 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.function.FunctionUtils;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+
+
+import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+
+
+import org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterImpl;
+import org.openecomp.dcae.controller.platform.controller.ControllerCluster;
+
+
+public class DcaeControllerClusterProviderTemplate extends BasicAdaptorProvider {
+	private static final Logger logger = Logger.getLogger(DcaeControllerClusterProviderTemplate.class);
+	ControllerCluster o;
+
+	public DcaeControllerClusterProviderTemplate(ISiriusServer controller, ControllerCluster o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+	public void pushData(java.lang.String serverName, java.lang.String dataName) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void receiveData(java.lang.String serverName, java.lang.String dataName, java.util.Date time, java.lang.String content) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerFactory.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerFactory.java
new file mode 100644
index 0000000..a4d1bc0
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerFactory.java
@@ -0,0 +1,66 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.apache.log4j.Logger;
+
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+
+import org.openecomp.dcae.controller.platform.controller.DcaePlatformController;
+import org.openecomp.dcae.controller.platform.controller.ControllerPackage;
+import org.openecomp.dcae.controller.platform.controller.impl.ControllerFactoryImpl;
+
+
+
+
+import org.openecomp.dcae.controller.platform.controller.ControllerCluster;
+import org.openecomp.dcae.controller.platform.controller.ControllerVirtualMachineService;
+
+public class DcaeControllerFactory extends ControllerFactoryImpl {
+	public static final Logger logger = Logger.getLogger(DcaeControllerFactory.class);
+	ISiriusServer server = null;
+	@Override
+	public EPackage getEPackage() { return ControllerPackage.eINSTANCE; }
+	public DcaeControllerFactory(ISiriusServer server) {
+		this.server = server;
+	}
+	@Override
+	public DcaePlatformController createDcaePlatformController() {
+		return new DcaeDcaePlatformController(server);
+	}
+	
+    
+	@Override
+	public ControllerCluster createControllerCluster() {
+		return new DcaeControllerCluster(server);
+	}
+    
+	@Override
+	public ControllerVirtualMachineService createControllerVirtualMachineService() {
+		return new DcaeControllerVirtualMachineService(server);
+	}
+	
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineService.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineService.java
new file mode 100644
index 0000000..f83bac3
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineService.java
@@ -0,0 +1,415 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
+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.eclipse.emf.ecore.EObject;
+import org.json.JSONObject;
+
+import java.util.Date;
+
+import org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerVirtualMachineServiceOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerVirtualMachineServiceMessageEnum;
+
+
+
+
+import org.openecomp.dcae.controller.platform.controller.impl.ControllerVirtualMachineServiceImpl;
+
+
+
+public class DcaeControllerVirtualMachineService extends ControllerVirtualMachineServiceImpl implements ISiriusPlugin {
+	public static final Logger logger = Logger.getLogger(DcaeControllerVirtualMachineService.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public DcaeControllerVirtualMachineServiceProvider controller;
+	ISiriusServer server;
+
+	public DcaeControllerVirtualMachineService(ISiriusServer server) {
+		this.server = server;
+		this.controller = new DcaeControllerVirtualMachineServiceProvider(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(ControllerVirtualMachineServiceOperationEnum.deploy);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.deploy, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.undeploy);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.undeploy, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.test);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.test, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.suspend);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.suspend, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.resume);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.resume, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.pushManagerConfiguration);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.pushManagerConfiguration, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.pollManagerConfiguration);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.pollManagerConfiguration, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.managerConfiguration);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.managerConfiguration, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.managerOperation);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.managerOperation, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.updateConfigurationFromPolicy);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.updateConfigurationFromPolicy, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.runHealthTests);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.runHealthTests, e.toString());
+			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(ControllerVirtualMachineServiceOperationEnum.updateDeploymentStatus);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.updateDeploymentStatus, e.toString());
+			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() {
+		DcaeControllerVirtualMachineServiceProvider.ecoreSetup();
+	}
+	public DcaeControllerVirtualMachineServiceProvider getSomfProvider() {
+		return controller;
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceClient.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceClient.java
new file mode 100644
index 0000000..09d2371
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceClient.java
@@ -0,0 +1,277 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+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.platform.controller.impl.ControllerVirtualMachineServiceImpl;
+import org.openecomp.dcae.controller.platform.controller.ControllerPackage;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerVirtualMachineServiceOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerVirtualMachineServiceMessageEnum;
+
+
+import org.openecomp.dcae.controller.platform.servers.controller.DcaeDcaePlatformController; 
+
+
+
+ 
+@SuppressWarnings("unchecked")
+public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtualMachineServiceImpl {
+	public static final Logger logger = Logger.getLogger(DcaeControllerVirtualMachineServiceClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public AbstractClient client;
+
+	public DcaeControllerVirtualMachineServiceClient(String file, String name) {
+		DcaeDcaePlatformController.ecoreSetup(); 
+		client = new GenericHttpClient(file,name);
+		client.add("/cont", this);
+	}
+
+	public DcaeControllerVirtualMachineServiceClient(String file, String name1, String name2) {
+		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
+		client = client1.all; // requests should be forwarded to all.
+		client.add("/cont", this);
+	}
+	
+	public DcaeControllerVirtualMachineServiceClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+	}
+
+
+
+	
+	public void deploy(String path, java.lang.String instanceName, java.lang.String containerPath) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_deploy);
+		
+		try {
+		  client.operationPath(path, c, "deploy", null, instanceName,containerPath);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_deploy, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@deploy: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public void undeploy(String path, java.lang.String instanceName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_undeploy);
+		
+		try {
+		  client.operationPath(path, c, "undeploy", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_undeploy, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeploy: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(String path, java.lang.String instanceName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_test);
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
+		try {
+		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath(path, c, "test", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_test, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	
+	public void suspend(String path, java.lang.String instanceName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_suspend);
+		
+		try {
+		  client.operationPath(path, c, "suspend", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_suspend, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public void resume(String path, java.lang.String instanceName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_resume);
+		
+		try {
+		  client.operationPath(path, c, "resume", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_resume, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public void pushManagerConfiguration(String path, java.lang.String instanceName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		
+		try {
+		  client.operationPath(path, c, "pushManagerConfiguration", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pushManagerConfiguration: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public void pollManagerConfiguration(String path, java.lang.String instanceName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		
+		try {
+		  client.operationPath(path, c, "pollManagerConfiguration", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pollManagerConfiguration: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public org.eclipse.emf.ecore.EObject managerConfiguration(String path, java.lang.String instanceName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_managerConfiguration);
+		org.eclipse.emf.ecore.EObject res;
+		try {
+		  res = (org.eclipse.emf.ecore.EObject) client.operationPath(path, c, "managerConfiguration", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerConfiguration: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	
+	public org.json.JSONObject managerOperation(String path, java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_managerOperation);
+		org.json.JSONObject res;
+		try {
+		  res = (org.json.JSONObject) client.operationPath(path, c, "managerOperation", null, instanceName,operation,parameters);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_managerOperation, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerOperation: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	
+	public void updateConfigurationFromPolicy(String path, java.lang.String instanceName) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		
+		try {
+		  client.operationPath(path, c, "updateConfigurationFromPolicy", null, instanceName);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateConfigurationFromPolicy: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public void runHealthTests(String path) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_runHealthTests);
+		
+		try {
+		  client.operationPath(path, c, "runHealthTests", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_runHealthTests, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@runHealthTests: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	
+	public void updateDeploymentStatus(String path) {
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_updateDeploymentStatus);
+		
+		try {
+		  client.operationPath(path, c, "updateDeploymentStatus", null);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_updateDeploymentStatus, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateDeploymentStatus: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceConsole.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceConsole.java
new file mode 100644
index 0000000..ada979d
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceConsole.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.platform.servers.controller;
+
+
+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 DcaeControllerVirtualMachineServiceConsole extends Console {
+	public static final Logger logger = Logger.getLogger(DcaeControllerVirtualMachineServiceConsole.class);
+    protected DcaeControllerVirtualMachineServiceClient controller;
+    
+
+
+
+    public DcaeControllerVirtualMachineServiceConsole(String filename, String name) {
+            super(filename, name);
+            controller = new DcaeControllerVirtualMachineServiceClient(filename,name);
+            client = controller.client;
+
+    }
+    
+	public DcaeControllerVirtualMachineServiceConsole(AbstractClient c) {
+        controller = new DcaeControllerVirtualMachineServiceClient(c);
+        client = controller.client;
+    }
+
+
+	public void deploy(String path, java.lang.String instanceName, java.lang.String containerPath) {
+		
+		try {
+			 controller.deploy(path,instanceName,containerPath);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void undeploy(String path, java.lang.String instanceName) {
+		
+		try {
+			 controller.undeploy(path,instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(String path, java.lang.String instanceName) {
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res = null;
+		try {
+			res =  controller.test(path,instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void suspend(String path, java.lang.String instanceName) {
+		
+		try {
+			 controller.suspend(path,instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void resume(String path, java.lang.String instanceName) {
+		
+		try {
+			 controller.resume(path,instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void pushManagerConfiguration(String path, java.lang.String instanceName) {
+		
+		try {
+			 controller.pushManagerConfiguration(path,instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void pollManagerConfiguration(String path, java.lang.String instanceName) {
+		
+		try {
+			 controller.pollManagerConfiguration(path,instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public org.eclipse.emf.ecore.EObject managerConfiguration(String path, java.lang.String instanceName) {
+		org.eclipse.emf.ecore.EObject res = null;
+		try {
+			res =  controller.managerConfiguration(path,instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public org.json.JSONObject managerOperation(String path, java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
+		org.json.JSONObject res = null;
+		try {
+			res =  controller.managerOperation(path,instanceName,operation,parameters);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public void updateConfigurationFromPolicy(String path, java.lang.String instanceName) {
+		
+		try {
+			 controller.updateConfigurationFromPolicy(path,instanceName);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void runHealthTests(String path) {
+		
+		try {
+			 controller.runHealthTests(path);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void updateDeploymentStatus(String path) {
+		
+		try {
+			 controller.updateDeploymentStatus(path);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceProviderTemplate.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceProviderTemplate.java
new file mode 100644
index 0000000..0847e77
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerVirtualMachineServiceProviderTemplate.java
@@ -0,0 +1,137 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.function.FunctionUtils;
+
+import org.apache.log4j.Logger;
+import org.eclipse.emf.common.util.EList;
+import org.json.JSONObject;
+
+
+
+import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+
+
+import org.openecomp.dcae.controller.platform.controller.impl.ControllerVirtualMachineServiceImpl;
+import org.openecomp.dcae.controller.platform.controller.ControllerVirtualMachineService;
+
+
+public class DcaeControllerVirtualMachineServiceProviderTemplate extends BasicAdaptorProvider {
+	private static final Logger logger = Logger.getLogger(DcaeControllerVirtualMachineServiceProviderTemplate.class);
+	ControllerVirtualMachineService o;
+
+	public DcaeControllerVirtualMachineServiceProviderTemplate(ISiriusServer controller, ControllerVirtualMachineService o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void undeploy(java.lang.String instanceName) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
+		org.openecomp.dcae.controller.core.service.HealthTestResponse res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void suspend(java.lang.String instanceName) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void resume(java.lang.String instanceName) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void pushManagerConfiguration(java.lang.String instanceName) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void pollManagerConfiguration(java.lang.String instanceName) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
+		org.eclipse.emf.ecore.EObject res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
+		org.json.JSONObject res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void runHealthTests() {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void updateDeploymentStatus() {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformController.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformController.java
new file mode 100644
index 0000000..402f708
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformController.java
@@ -0,0 +1,448 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
+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.eclipse.emf.ecore.EObject;
+import org.json.JSONObject;
+
+import java.util.Date;
+
+import org.openecomp.dcae.controller.platform.servers.controller.logging.DcaePlatformControllerOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.DcaePlatformControllerMessageEnum;
+
+
+
+
+
+
+
+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.platform.controller.impl.DcaePlatformControllerImpl;
+
+
+
+public class DcaeDcaePlatformController extends DcaePlatformControllerImpl implements IRequestHandler, ISwaggerHandler, ISiriusPlugin {
+	public static final Logger logger = Logger.getLogger(DcaeDcaePlatformController.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public DcaeDcaePlatformControllerProvider controller;
+	ISiriusServer server;
+
+	public DcaeDcaePlatformController(ISiriusServer server) {
+		this.server = server;
+		this.controller = new DcaeDcaePlatformControllerProvider(server,this);
+	}
+
+	public void deployDescriptor(java.lang.String name) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "deployDescriptor", ApiRequestStatus.START, duration_,name);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.deployDescriptor);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		try {
+			 controller.deployDescriptor(name);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "deployDescriptor", ApiRequestStatus.ERROR, duration_,name);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.deployDescriptor, e.toString());
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "deployDescriptor", ApiRequestStatus.OKAY, duration_,name);
+		
+	}
+
+	public void refreshDataBus(java.lang.String nameMatch) {
+		
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "refreshDataBus", ApiRequestStatus.START, duration_,nameMatch);
+		Date now_ = new Date();
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.refreshDataBus);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		try {
+			 controller.refreshDataBus(nameMatch);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "refreshDataBus", ApiRequestStatus.ERROR, duration_,nameMatch);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.refreshDataBus, e.toString());
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "refreshDataBus", ApiRequestStatus.OKAY, duration_,nameMatch);
+		
+	}
+
+	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(DcaePlatformControllerOperationEnum.logs);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.logs, e.toString());
+			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(DcaePlatformControllerOperationEnum.metrics);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.metrics, e.toString());
+			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(DcaePlatformControllerOperationEnum.properties);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.properties, e.toString());
+			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(DcaePlatformControllerOperationEnum.uploadInfo);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.uploadInfo, e.toString());
+			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(DcaePlatformControllerOperationEnum.getValues);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.getValues, e.toString());
+			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(DcaePlatformControllerOperationEnum.getValuesAll);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.getValuesAll, e.toString());
+			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(DcaePlatformControllerOperationEnum.getMessages);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.getMessages, e.toString());
+			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(DcaePlatformControllerOperationEnum.getRequestLogger);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.getRequestLogger, e.toString());
+			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(DcaePlatformControllerOperationEnum.evaluate);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.evaluate, e.toString());
+			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(DcaePlatformControllerOperationEnum.update);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.update, e.toString());
+			throw e;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "update", ApiRequestStatus.OKAY, duration_,path,function);
+		
+	}
+
+
+
+	@Override
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context) {
+		return controller.handleJson(userName,action,resourcePath,json,context);
+	}
+
+	@Override
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return controller.handleBinary(userName,action,resourcePath,in);
+	}
+
+
+
+@Override
+public void updateSwagger(String path, SwaggerUtils swagger) {
+	controller.updateSwagger(path,swagger);
+}
+
+
+
+
+	@Override
+	public void start() {
+		controller.start();
+	}
+
+	public static void ecoreSetup() {
+		DcaeDcaePlatformControllerProvider.ecoreSetup();
+	}
+	public DcaeDcaePlatformControllerProvider getSomfProvider() {
+		return controller;
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerClient.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerClient.java
new file mode 100644
index 0000000..e9409b3
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerClient.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.platform.servers.controller;
+
+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.platform.controller.impl.DcaePlatformControllerImpl;
+import org.openecomp.dcae.controller.platform.controller.ControllerPackage;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.DcaePlatformControllerOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.logging.DcaePlatformControllerMessageEnum;
+
+
+
+
+
+ 
+@SuppressWarnings("unchecked")
+public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl {
+	public static final Logger logger = Logger.getLogger(DcaeDcaePlatformControllerClient.class);
+	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	public AbstractClient client;
+
+	public DcaeDcaePlatformControllerClient(String file, String name) {
+		DcaeDcaePlatformController.ecoreSetup(); 
+		client = new GenericHttpClient(file,name);
+		client.add("/resources", this);
+	}
+
+	public DcaeDcaePlatformControllerClient(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 DcaeDcaePlatformControllerClient(AbstractClient c) {
+		client = c;
+		client.add("/resources", this);
+	}
+
+
+
+	@Override
+	public void deployDescriptor(java.lang.String name) {
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_deployDescriptor);
+		
+		try {
+		  client.operationPath("/resources", c, "deployDescriptor", null, name);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.REMOTE_deployDescriptor, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@deployDescriptor: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void refreshDataBus(java.lang.String nameMatch) {
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_refreshDataBus);
+		
+		try {
+		  client.operationPath("/resources", c, "refreshDataBus", null, nameMatch);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.REMOTE_refreshDataBus, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@refreshDataBus: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_logs);
+		
+		try {
+		  client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.REMOTE_logs, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@logs: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_metrics);
+		
+		try {
+		  client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.REMOTE_metrics, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@metrics: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_properties);
+		
+		try {
+		  client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.REMOTE_properties, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@properties: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+	@Override
+	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_uploadInfo);
+		
+		try {
+		  client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.REMOTE_uploadInfo, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@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 = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.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(DcaePlatformControllerMessageEnum.REMOTE_getValues, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@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 = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.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(DcaePlatformControllerMessageEnum.REMOTE_getValuesAll, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@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 = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.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(DcaePlatformControllerMessageEnum.REMOTE_getMessages, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@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 = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.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(DcaePlatformControllerMessageEnum.REMOTE_getRequestLogger, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@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 = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.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(DcaePlatformControllerMessageEnum.REMOTE_evaluate, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@evaluate: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
+		ecomplogger.recordMetricEventStart();
+		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_update);
+		
+		try {
+		  client.operationPath("/resources", c, "update", null, path,function);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(DcaePlatformControllerMessageEnum.REMOTE_update, e.toString());
+			throw new RuntimeException("remote call failed: " + client.getRemote() + "@update: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerConsole.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerConsole.java
new file mode 100644
index 0000000..0ad6540
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerConsole.java
@@ -0,0 +1,197 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+
+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.platform.servers.controller.gui.DcaeGuiClientApiConsole;   
+
+
+public class DcaeDcaePlatformControllerConsole extends Console {
+	public static final Logger logger = Logger.getLogger(DcaeDcaePlatformControllerConsole.class);
+    protected DcaeDcaePlatformControllerClient controller;
+    
+    
+        DcaeControllerClusterConsole cluster;       
+        DcaeControllerVirtualMachineServiceConsole cont;       
+        DcaeGuiClientApiConsole gui;   
+
+
+    public DcaeDcaePlatformControllerConsole(String filename, String name) {
+            super(filename, name);
+            controller = new DcaeDcaePlatformControllerClient(filename,name);
+            client = controller.client;
+    
+            cluster = new  DcaeControllerClusterConsole(filename,name);       
+            cont = new  DcaeControllerVirtualMachineServiceConsole(filename,name);       
+            gui = new  DcaeGuiClientApiConsole(filename,name);   
+    }
+    
+	public DcaeDcaePlatformControllerConsole(AbstractClient c) {
+        controller = new DcaeDcaePlatformControllerClient(c);
+        client = controller.client;
+    }
+
+
+	public void deployDescriptor(java.lang.String name) {
+		
+		try {
+			 controller.deployDescriptor(name);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		
+	}
+
+	public void refreshDataBus(java.lang.String nameMatch) {
+		
+		try {
+			 controller.refreshDataBus(nameMatch);
+		}
+		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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProviderTemplate.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProviderTemplate.java
new file mode 100644
index 0000000..09a439c
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProviderTemplate.java
@@ -0,0 +1,96 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+
+
+
+
+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.ncomp.sirius.manager.BasicManagementServerProvider;
+
+
+import org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformControllerImpl;
+import org.openecomp.dcae.controller.platform.controller.DcaePlatformController;
+
+
+public class DcaeDcaePlatformControllerProviderTemplate extends BasicManagementServerProvider {
+	private static final Logger logger = Logger.getLogger(DcaeDcaePlatformControllerProviderTemplate.class);
+	DcaePlatformController o;
+
+	public DcaeDcaePlatformControllerProviderTemplate(ISiriusServer controller, DcaePlatformController o) {
+		super(controller, o);
+		this.o = o;
+	}
+
+	public void deployDescriptor(java.lang.String name) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public void refreshDataBus(java.lang.String nameMatch) {
+		
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+
+public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+
+
+
+
+	
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerServer.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerServer.java
new file mode 100644
index 0000000..2dc725f
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerServer.java
@@ -0,0 +1,129 @@
+
+/*-
+ * ============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.platform.servers.controller;
+
+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.platform.controller.DcaePlatformController;
+
+    
+import org.openecomp.dcae.controller.platform.servers.controller.DcaeControllerFactory;
+    
+import org.openecomp.dcae.controller.platform.servers.controller.DcaeControllerFactory;
+    
+import org.openecomp.dcae.controller.platform.servers.controller.gui.DcaeModelFactory;
+
+
+
+
+
+public class DcaeDcaePlatformControllerServer implements ISiriusServer {
+    public static final Logger logger = Logger.getLogger(DcaeDcaePlatformControllerServer.class);
+    String serverPath;
+    ManagementServer server;
+    DcaeDcaePlatformController controller;
+    String directory = "data";
+//      LocationControllerApi api ;
+    Jetty8Server webServer;
+    DcaeControllerFactory f = new DcaeControllerFactory(this);
+	
+    
+    String clusterPath;
+    ManagementServer clusterServer;
+    
+    String contPath;
+    ManagementServer contServer;
+    
+    String guiPath;
+    ManagementServer guiServer;
+
+
+    public DcaeDcaePlatformControllerServer(String filename) throws IOException {
+		logger.warn("controller restarting");
+		DcaeDcaePlatformController.ecoreSetup(); 
+		props = getPropertiesFromClasspath(filename);
+        serverPath = (String) props.get("server.dir");
+        server = new ManagementServer(f, "DcaePlatformController", serverPath, filename);
+        server.addFactory(f);
+    
+		server.addFactory(new org.openecomp.ncomp.servers.openstack.OsOpenstackFactory(this));
+  
+    
+		server.addFactory(new org.openecomp.ncomp.servers.openstack.loc.OsLocationFactory(this));
+  
+
+        server.addRuntimeFactories(this);
+        server.start();
+    }
+    public void runWebserver() throws IOException {
+        controller = (DcaeDcaePlatformController) server.find("/").o;
+        webServer = new Jetty8Server("controller.properties");
+        webServer.add("/resources",server);
+   
+		webServer.add("/test",controller);
+   
+		webServer.add("/swagger",controller);
+
+
+    
+		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"));
+            
+            DcaeDcaePlatformControllerServer s = new DcaeDcaePlatformControllerServer("controller.properties");
+            s.runWebserver();
+    }
+	public DcaePlatformController getController() {
+		return controller;
+	}
+	public ManagementServer getServer() {
+		return server;
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApi.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApi.java
new file mode 100644
index 0000000..7fc89db
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApi.java
@@ -0,0 +1,278 @@
+
+/*-
+ * ============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.platform.servers.controller.gui;
+
+
+
+
+
+
+import java.io.InputStream;
+
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
+import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
+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.eclipse.emf.ecore.EObject;
+import org.json.JSONObject;
+
+import java.util.Date;
+
+import org.openecomp.dcae.controller.platform.servers.controller.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.gui.logging.GuiClientApiMessageEnum;
+
+
+
+
+
+
+
+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);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(GuiClientApiMessageEnum.getTree, e.toString());
+			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);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(GuiClientApiMessageEnum.getObject, e.toString());
+			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);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(GuiClientApiMessageEnum.getTimeSerie, e.toString());
+			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);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(GuiClientApiMessageEnum.getTable, e.toString());
+			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);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(GuiClientApiMessageEnum.getHtml, e.toString());
+			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);
+		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		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);
+			ecomplogger.warn(GuiClientApiMessageEnum.getGraph, e.toString());
+			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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApiClient.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApiClient.java
new file mode 100644
index 0000000..720cae3
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/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.platform.servers.controller.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.platform.servers.controller.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.dcae.controller.platform.servers.controller.gui.logging.GuiClientApiMessageEnum;
+
+
+import org.openecomp.dcae.controller.platform.servers.controller.DcaeDcaePlatformController; 
+
+
+
+ 
+@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) {
+		DcaeDcaePlatformController.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: " + client.getRemote() + "@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: " + client.getRemote() + "@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: " + client.getRemote() + "@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: " + client.getRemote() + "@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: " + client.getRemote() + "@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: " + client.getRemote() + "@getGraph: " + e);
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApiConsole.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApiConsole.java
new file mode 100644
index 0000000..1e3b7a6
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/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.platform.servers.controller.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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApiProviderTemplate.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeGuiClientApiProviderTemplate.java
new file mode 100644
index 0000000..efdcdab
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/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.platform.servers.controller.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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeModelFactory.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/DcaeModelFactory.java
new file mode 100644
index 0000000..e2ff048
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/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.platform.servers.controller.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.platform.servers.controller.DcaeDcaePlatformControllerServer; 
+
+
+
+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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/logging/GuiClientApi.properties b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/logging/GuiClientApi.properties
new file mode 100644
index 0000000..8705ab8
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/logging/GuiClientApiMessageEnum.java
new file mode 100644
index 0000000..9a5d804
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/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.platform.servers.controller.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.platform.servers.controller.gui.logging.GuiClientApi");
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/gui/logging/GuiClientApiOperationEnum.java
new file mode 100644
index 0000000..aa3a949
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/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.platform.servers.controller.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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerCluster.properties b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerCluster.properties
new file mode 100644
index 0000000..5866f65
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerCluster.properties
@@ -0,0 +1,30 @@
+
+dummy=\
+  null|\
+  null|\
+  null|\
+  null
+
+pushData=\
+  pushData-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+receiveData=\
+  receiveData-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REMOTE_pushData=\
+  REMOTE-pushData-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_receiveData=\
+  REMOTE-receiveData-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerClusterMessageEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerClusterMessageEnum.java
new file mode 100644
index 0000000..10ec310
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerClusterMessageEnum.java
@@ -0,0 +1,39 @@
+
+/*-
+ * ============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.platform.servers.controller.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum ControllerClusterMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  pushData,
+  receiveData,
+  REMOTE_pushData,
+  REMOTE_receiveData;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerCluster");
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerClusterOperationEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerClusterOperationEnum.java
new file mode 100644
index 0000000..cece429
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerClusterOperationEnum.java
@@ -0,0 +1,33 @@
+
+/*-
+ * ============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.platform.servers.controller.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum ControllerClusterOperationEnum implements EcompOperationEnum {
+
+  pushData,
+  receiveData,
+  REMOTE_pushData,
+  REMOTE_receiveData;
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineService.properties b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineService.properties
new file mode 100644
index 0000000..d32cf07
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineService.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-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineServiceMessageEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineServiceMessageEnum.java
new file mode 100644
index 0000000..65f5139
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineServiceMessageEnum.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.platform.servers.controller.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum ControllerVirtualMachineServiceMessageEnum 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.platform.servers.controller.logging.ControllerVirtualMachineService");
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineServiceOperationEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineServiceOperationEnum.java
new file mode 100644
index 0000000..771b696
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/ControllerVirtualMachineServiceOperationEnum.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.platform.servers.controller.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum ControllerVirtualMachineServiceOperationEnum 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;
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeController.properties b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeController.properties
new file mode 100644
index 0000000..b8275ac
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeController.properties
@@ -0,0 +1,24 @@
+
+HEALTHCHECK_SERVICE_FAILED=\
+  DCAE-CONTROLLER-HEALTHCHECK-SERVICE-FAILED-5001W|\
+  {0}|\
+  Contact Tier 4. This is a software bug.|\
+  Heath Check on the service level fails.
+
+POLICY_POLLING_FAILED=\
+  DCAE-CONTROLLER-POLICY-POLLING-FAILED-5001W|\
+  {0} {1}|\
+  Contact Tier 4. This is a software bug.|\
+  Police Polling on the service level fails.
+
+DATABUS_POLLING_FAILED=\
+  DCAE-CONTROLLER-DATABUS-POLLING-FAILED-5001W|\
+  {0}|\
+  Contact Tier 4. This is a software bug.|\
+  Databus Polling on the service level fails.
+
+CLUSTER_DATA_REPLICATION_FAILED=\
+  DCAE-CONTROLLER-CLUSTER_DATA_REPLICATION-FAILED-5001W|\
+  {0}|\
+  Contact Tier 4. This is a software bug.|\
+  Data Replication fails.
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerMessageEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerMessageEnum.java
new file mode 100644
index 0000000..f026d66
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerMessageEnum.java
@@ -0,0 +1,38 @@
+
+/*-
+ * ============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.platform.servers.controller.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum DcaeControllerMessageEnum implements EcompMessageEnum {
+
+  HEALTHCHECK_SERVICE_FAILED,
+  POLICY_POLLING_FAILED,
+  DATABUS_POLLING_FAILED,
+  CLUSTER_DATA_REPLICATION_FAILED;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.platform.servers.controller.logging.DcaeController");
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerOperationEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerOperationEnum.java
new file mode 100644
index 0000000..44c7454
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaeControllerOperationEnum.java
@@ -0,0 +1,33 @@
+
+/*-
+ * ============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.platform.servers.controller.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum DcaeControllerOperationEnum implements EcompOperationEnum {
+
+  HEALTHCHECK,
+  POLICY_POLLING,
+  DATABUS_POLLING,
+  CLUSTER_DATA_REPLICATION;
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformController.properties b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformController.properties
new file mode 100644
index 0000000..a426ec8
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformController.properties
@@ -0,0 +1,150 @@
+
+dummy=\
+  null|\
+  null|\
+  null|\
+  null
+
+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
+
+deployDescriptor=\
+  deployDescriptor-FAILED-5001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+refreshDataBus=\
+  refreshDataBus-FAILED-5001W|\
+  {0}|\
+  null|\
+  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
+
+REMOTE_deployDescriptor=\
+  REMOTE-deployDescriptor-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_refreshDataBus=\
+  REMOTE-refreshDataBus-FAILED-5001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformControllerMessageEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformControllerMessageEnum.java
new file mode 100644
index 0000000..973543f
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformControllerMessageEnum.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.platform.servers.controller.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum DcaePlatformControllerMessageEnum implements EcompMessageEnum {
+
+  dummy,
+  logs,
+  metrics,
+  properties,
+  uploadInfo,
+  getValues,
+  getValuesAll,
+  getMessages,
+  getRequestLogger,
+  evaluate,
+  update,
+  deployDescriptor,
+  refreshDataBus,
+  REMOTE_logs,
+  REMOTE_metrics,
+  REMOTE_properties,
+  REMOTE_uploadInfo,
+  REMOTE_getValues,
+  REMOTE_getValuesAll,
+  REMOTE_getMessages,
+  REMOTE_getRequestLogger,
+  REMOTE_evaluate,
+  REMOTE_update,
+  REMOTE_deployDescriptor,
+  REMOTE_refreshDataBus;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.platform.servers.controller.logging.DcaePlatformController");
+	}
+}
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformControllerOperationEnum.java b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformControllerOperationEnum.java
new file mode 100644
index 0000000..f5e0562
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/sirius-gen/org/openecomp/dcae/controller/platform/servers/controller/logging/DcaePlatformControllerOperationEnum.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.platform.servers.controller.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum DcaePlatformControllerOperationEnum implements EcompOperationEnum {
+
+  logs,
+  metrics,
+  properties,
+  uploadInfo,
+  getValues,
+  getValuesAll,
+  getMessages,
+  getRequestLogger,
+  evaluate,
+  update,
+  deployDescriptor,
+  refreshDataBus,
+  REMOTE_logs,
+  REMOTE_metrics,
+  REMOTE_properties,
+  REMOTE_uploadInfo,
+  REMOTE_getValues,
+  REMOTE_getValuesAll,
+  REMOTE_getMessages,
+  REMOTE_getRequestLogger,
+  REMOTE_evaluate,
+  REMOTE_update,
+  REMOTE_deployDescriptor,
+  REMOTE_refreshDataBus;
+}