[DCAE-15] Changes related to version 1.1

See Jira for details

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

456 files changed, 23315 insertions, 11447 deletions

diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServer.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServer.java
index 5c1beb3..13a2d73 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServer.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/DcaeBasicServer.java
@@ -23,6 +23,7 @@
  */
 package org.openecomp.dcae.controller.core.server;
 
+import org.openecomp.dcae.controller.core.service.HealthTestStatus;
 import org.openecomp.ncomp.core.HasOperationalState;
 import org.openecomp.ncomp.core.NamedEntity;
 import org.openecomp.ncomp.core.logs.LogMessageContainer;
@@ -53,6 +54,9 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHypervisor <em>Hypervisor</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getVmType <em>Vm Type</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getCertificatePassword <em>Certificate Password</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getLastHealthTest <em>Last Health Test</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHealthTestStatus <em>Health Test Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHealthTestMessageCode <em>Health Test Message Code</em>}</li>
  * </ul>
  * </p>
  *
@@ -328,4 +332,85 @@ public interface DcaeBasicServer extends NamedEntity, HasOperationalState, LogMe
 	 */
 	void setCertificatePassword(String value);
 
+	/**
+	 * Returns the value of the '<em><b>Last Health Test</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Health Test</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Last Health Test</em>' attribute.
+	 * @see #setLastHealthTest(DateMetricAttribute)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_LastHealthTest()
+	 * @model unique="false" dataType="org.openecomp.ncomp.core.DateMetricAttribute" transient="true"
+	 * @generated
+	 */
+	DateMetricAttribute getLastHealthTest();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getLastHealthTest <em>Last Health Test</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Last Health Test</em>' attribute.
+	 * @see #getLastHealthTest()
+	 * @generated
+	 */
+	void setLastHealthTest(DateMetricAttribute value);
+
+	/**
+	 * Returns the value of the '<em><b>Health Test Status</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.openecomp.dcae.controller.core.service.HealthTestStatus}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Health Test Status</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Health Test Status</em>' attribute.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+	 * @see #setHealthTestStatus(HealthTestStatus)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_HealthTestStatus()
+	 * @model unique="false"
+	 * @generated
+	 */
+	HealthTestStatus getHealthTestStatus();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHealthTestStatus <em>Health Test Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Health Test Status</em>' attribute.
+	 * @see org.openecomp.dcae.controller.core.service.HealthTestStatus
+	 * @see #getHealthTestStatus()
+	 * @generated
+	 */
+	void setHealthTestStatus(HealthTestStatus value);
+
+	/**
+	 * Returns the value of the '<em><b>Health Test Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Health Test Message Code</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Health Test Message Code</em>' attribute.
+	 * @see #setHealthTestMessageCode(String)
+	 * @see org.openecomp.dcae.controller.core.server.ServerPackage#getDcaeBasicServer_HealthTestMessageCode()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getHealthTestMessageCode();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHealthTestMessageCode <em>Health Test Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Health Test Message Code</em>' attribute.
+	 * @see #getHealthTestMessageCode()
+	 * @generated
+	 */
+	void setHealthTestMessageCode(String value);
+
 } // DcaeBasicServer
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerPackage.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerPackage.java
index 31ca18d..97f8482 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerPackage.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/ServerPackage.java
@@ -261,13 +261,40 @@ public interface ServerPackage extends EPackage {
 	int DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 14;
 
 	/**
+	 * The feature id for the '<em><b>Last Health Test</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__LAST_HEALTH_TEST = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 15;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__HEALTH_TEST_STATUS = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 16;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 17;
+
+	/**
 	 * The number of structural features of the '<em>Dcae Basic Server</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DCAE_BASIC_SERVER_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 15;
+	int DCAE_BASIC_SERVER_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 18;
 
 	/**
 	 * The number of operations of the '<em>Dcae Basic Server</em>' class.
@@ -494,6 +521,39 @@ public interface ServerPackage extends EPackage {
 	EAttribute getDcaeBasicServer_CertificatePassword();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getLastHealthTest <em>Last Health Test</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Last Health Test</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getLastHealthTest()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServer_LastHealthTest();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHealthTestStatus <em>Health Test Status</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Health Test Status</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHealthTestStatus()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServer_HealthTestStatus();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHealthTestMessageCode <em>Health Test Message Code</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Health Test Message Code</em>'.
+	 * @see org.openecomp.dcae.controller.core.server.DcaeBasicServer#getHealthTestMessageCode()
+	 * @see #getDcaeBasicServer()
+	 * @generated
+	 */
+	EAttribute getDcaeBasicServer_HealthTestMessageCode();
+
+	/**
 	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork <em>Dcae Basic Server Network</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -635,6 +695,27 @@ public interface ServerPackage extends EPackage {
 		 */
 		EAttribute DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD = eINSTANCE.getDcaeBasicServer_CertificatePassword();
 		/**
+		 * The meta object literal for the '<em><b>Last Health Test</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER__LAST_HEALTH_TEST = eINSTANCE.getDcaeBasicServer_LastHealthTest();
+		/**
+		 * The meta object literal for the '<em><b>Health Test Status</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER__HEALTH_TEST_STATUS = eINSTANCE.getDcaeBasicServer_HealthTestStatus();
+		/**
+		 * The meta object literal for the '<em><b>Health Test Message Code</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE = eINSTANCE.getDcaeBasicServer_HealthTestMessageCode();
+		/**
 		 * The meta object literal for the '{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerNetworkImpl <em>Dcae Basic Server Network</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerImpl.java
index 3da755c..515e297 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerImpl.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/DcaeBasicServerImpl.java
@@ -26,6 +26,7 @@ package org.openecomp.dcae.controller.core.server.impl;
 import org.openecomp.dcae.controller.core.server.DcaeBasicServer;
 import org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork;
 import org.openecomp.dcae.controller.core.server.ServerPackage;
+import org.openecomp.dcae.controller.core.service.HealthTestStatus;
 import org.openecomp.ncomp.core.CorePackage;
 import org.openecomp.ncomp.core.HasOperationalState;
 import org.openecomp.ncomp.core.OperationalState;
@@ -73,6 +74,9 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getHypervisor <em>Hypervisor</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getVmType <em>Vm Type</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getCertificatePassword <em>Certificate Password</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getLastHealthTest <em>Last Health Test</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getHealthTestStatus <em>Health Test Status</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.core.server.impl.DcaeBasicServerImpl#getHealthTestMessageCode <em>Health Test Message Code</em>}</li>
  * </ul>
  * </p>
  *
@@ -290,6 +294,66 @@ public class DcaeBasicServerImpl extends NamedEntityImpl implements DcaeBasicSer
 	protected String certificatePassword = CERTIFICATE_PASSWORD_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getLastHealthTest() <em>Last Health Test</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastHealthTest()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final DateMetricAttribute LAST_HEALTH_TEST_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLastHealthTest() <em>Last Health Test</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLastHealthTest()
+	 * @generated
+	 * @ordered
+	 */
+	protected DateMetricAttribute lastHealthTest = LAST_HEALTH_TEST_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHealthTestStatus() <em>Health Test Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthTestStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final HealthTestStatus HEALTH_TEST_STATUS_EDEFAULT = HealthTestStatus.GREEN;
+
+	/**
+	 * The cached value of the '{@link #getHealthTestStatus() <em>Health Test Status</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthTestStatus()
+	 * @generated
+	 * @ordered
+	 */
+	protected HealthTestStatus healthTestStatus = HEALTH_TEST_STATUS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getHealthTestMessageCode() <em>Health Test Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthTestMessageCode()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HEALTH_TEST_MESSAGE_CODE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getHealthTestMessageCode() <em>Health Test Message Code</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthTestMessageCode()
+	 * @generated
+	 * @ordered
+	 */
+	protected String healthTestMessageCode = HEALTH_TEST_MESSAGE_CODE_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -687,6 +751,69 @@ public class DcaeBasicServerImpl extends NamedEntityImpl implements DcaeBasicSer
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public DateMetricAttribute getLastHealthTest() {
+		return lastHealthTest;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLastHealthTest(DateMetricAttribute newLastHealthTest) {
+		DateMetricAttribute oldLastHealthTest = lastHealthTest;
+		lastHealthTest = newLastHealthTest;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__LAST_HEALTH_TEST, oldLastHealthTest, lastHealthTest));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public HealthTestStatus getHealthTestStatus() {
+		return healthTestStatus;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHealthTestStatus(HealthTestStatus newHealthTestStatus) {
+		HealthTestStatus oldHealthTestStatus = healthTestStatus;
+		healthTestStatus = newHealthTestStatus == null ? HEALTH_TEST_STATUS_EDEFAULT : newHealthTestStatus;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_STATUS, oldHealthTestStatus, healthTestStatus));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHealthTestMessageCode() {
+		return healthTestMessageCode;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHealthTestMessageCode(String newHealthTestMessageCode) {
+		String oldHealthTestMessageCode = healthTestMessageCode;
+		healthTestMessageCode = newHealthTestMessageCode;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE, oldHealthTestMessageCode, healthTestMessageCode));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -747,6 +874,12 @@ public class DcaeBasicServerImpl extends NamedEntityImpl implements DcaeBasicSer
 				return basicGetVmType();
 			case ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD:
 				return getCertificatePassword();
+			case ServerPackage.DCAE_BASIC_SERVER__LAST_HEALTH_TEST:
+				return getLastHealthTest();
+			case ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_STATUS:
+				return getHealthTestStatus();
+			case ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE:
+				return getHealthTestMessageCode();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -809,6 +942,15 @@ public class DcaeBasicServerImpl extends NamedEntityImpl implements DcaeBasicSer
 			case ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD:
 				setCertificatePassword((String)newValue);
 				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LAST_HEALTH_TEST:
+				setLastHealthTest((DateMetricAttribute)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_STATUS:
+				setHealthTestStatus((HealthTestStatus)newValue);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE:
+				setHealthTestMessageCode((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -866,6 +1008,15 @@ public class DcaeBasicServerImpl extends NamedEntityImpl implements DcaeBasicSer
 			case ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD:
 				setCertificatePassword(CERTIFICATE_PASSWORD_EDEFAULT);
 				return;
+			case ServerPackage.DCAE_BASIC_SERVER__LAST_HEALTH_TEST:
+				setLastHealthTest(LAST_HEALTH_TEST_EDEFAULT);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_STATUS:
+				setHealthTestStatus(HEALTH_TEST_STATUS_EDEFAULT);
+				return;
+			case ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE:
+				setHealthTestMessageCode(HEALTH_TEST_MESSAGE_CODE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -908,6 +1059,12 @@ public class DcaeBasicServerImpl extends NamedEntityImpl implements DcaeBasicSer
 				return vmType != null;
 			case ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD:
 				return CERTIFICATE_PASSWORD_EDEFAULT == null ? certificatePassword != null : !CERTIFICATE_PASSWORD_EDEFAULT.equals(certificatePassword);
+			case ServerPackage.DCAE_BASIC_SERVER__LAST_HEALTH_TEST:
+				return LAST_HEALTH_TEST_EDEFAULT == null ? lastHealthTest != null : !LAST_HEALTH_TEST_EDEFAULT.equals(lastHealthTest);
+			case ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_STATUS:
+				return healthTestStatus != HEALTH_TEST_STATUS_EDEFAULT;
+			case ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE:
+				return HEALTH_TEST_MESSAGE_CODE_EDEFAULT == null ? healthTestMessageCode != null : !HEALTH_TEST_MESSAGE_CODE_EDEFAULT.equals(healthTestMessageCode);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -982,6 +1139,12 @@ public class DcaeBasicServerImpl extends NamedEntityImpl implements DcaeBasicSer
 		result.append(usingMonitoringAgent);
 		result.append(", certificatePassword: ");
 		result.append(certificatePassword);
+		result.append(", lastHealthTest: ");
+		result.append(lastHealthTest);
+		result.append(", healthTestStatus: ");
+		result.append(healthTestStatus);
+		result.append(", healthTestMessageCode: ");
+		result.append(healthTestMessageCode);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerPackageImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerPackageImpl.java
index 1ed91e4..b524685 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerPackageImpl.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/server/impl/ServerPackageImpl.java
@@ -27,6 +27,7 @@ import org.openecomp.dcae.controller.core.server.DcaeBasicServer;
 import org.openecomp.dcae.controller.core.server.DcaeBasicServerNetwork;
 import org.openecomp.dcae.controller.core.server.ServerFactory;
 import org.openecomp.dcae.controller.core.server.ServerPackage;
+import org.openecomp.dcae.controller.core.service.ServicePackage;
 import org.openecomp.ncomp.core.CorePackage;
 import org.openecomp.ncomp.core.logs.LogsPackage;
 import org.openecomp.ncomp.openstack.compute.ComputePackage;
@@ -106,9 +107,9 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		isInited = true;
 
 		// Initialize simple dependencies
-		CollectdPackage.eINSTANCE.eClass();
+		ServicePackage.eINSTANCE.eClass();
 		PropertiesPackage.eINSTANCE.eClass();
-		LocationPackage.eINSTANCE.eClass();
+		CollectdPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theServerPackage.createPackageContents();
@@ -238,6 +239,33 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getDcaeBasicServer_LastHealthTest() {
+		return (EAttribute)dcaeBasicServerEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServer_HealthTestStatus() {
+		return (EAttribute)dcaeBasicServerEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getDcaeBasicServer_HealthTestMessageCode() {
+		return (EAttribute)dcaeBasicServerEClass.getEStructuralFeatures().get(13);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EClass getDcaeBasicServerNetwork() {
 		return dcaeBasicServerNetworkEClass;
 	}
@@ -300,6 +328,9 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		createEReference(dcaeBasicServerEClass, DCAE_BASIC_SERVER__HYPERVISOR);
 		createEReference(dcaeBasicServerEClass, DCAE_BASIC_SERVER__VM_TYPE);
 		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD);
+		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__LAST_HEALTH_TEST);
+		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__HEALTH_TEST_STATUS);
+		createEAttribute(dcaeBasicServerEClass, DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE);
 
 		dcaeBasicServerNetworkEClass = createEClass(DCAE_BASIC_SERVER_NETWORK);
 		createEAttribute(dcaeBasicServerNetworkEClass, DCAE_BASIC_SERVER_NETWORK__IP);
@@ -338,6 +369,7 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		ComputePackage theComputePackage = (ComputePackage)EPackage.Registry.INSTANCE.getEPackage(ComputePackage.eNS_URI);
 		LocationPackage theLocationPackage = (LocationPackage)EPackage.Registry.INSTANCE.getEPackage(LocationPackage.eNS_URI);
 		org.openecomp.ncomp.openstack.core.CorePackage theCorePackage_1 = (org.openecomp.ncomp.openstack.core.CorePackage)EPackage.Registry.INSTANCE.getEPackage(org.openecomp.ncomp.openstack.core.CorePackage.eNS_URI);
+		ServicePackage theServicePackage = (ServicePackage)EPackage.Registry.INSTANCE.getEPackage(ServicePackage.eNS_URI);
 
 		// Create type parameters
 
@@ -362,6 +394,9 @@ public class ServerPackageImpl extends EPackageImpl implements ServerPackage {
 		initEReference(getDcaeBasicServer_Hypervisor(), theLocationPackage.getHypervisor(), null, "hypervisor", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDcaeBasicServer_VmType(), theCorePackage_1.getVirtualMachineType(), null, "vmType", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getDcaeBasicServer_CertificatePassword(), theEcorePackage.getEString(), "certificatePassword", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeBasicServer_LastHealthTest(), theCorePackage.getDateMetricAttribute(), "lastHealthTest", null, 0, 1, DcaeBasicServer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeBasicServer_HealthTestStatus(), theServicePackage.getHealthTestStatus(), "healthTestStatus", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getDcaeBasicServer_HealthTestMessageCode(), theEcorePackage.getEString(), "healthTestMessageCode", null, 0, 1, DcaeBasicServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(dcaeBasicServerNetworkEClass, DcaeBasicServerNetwork.class, "DcaeBasicServerNetwork", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getDcaeBasicServerNetwork_Ip(), theEcorePackage.getEString(), "ip", null, 0, 1, DcaeBasicServerNetwork.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamAuthentication.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamAuthentication.java
index f798a33..597fbc9 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamAuthentication.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/StreamAuthentication.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.common.util.Enumerator;
 
 /**
  * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Topic Authentication</b></em>',
+ * A representation of the literals of the enumeration '<em><b>Authentication</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
  * @see org.openecomp.dcae.controller.core.stream.StreamPackage#getStreamAuthentication()
@@ -47,7 +47,9 @@ public enum StreamAuthentication implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	AAF(0, "AAF", "aaf"), /**
+	AAF(0, "AAF", "aaf"),
+
+	/**
 	 * The '<em><b>NONE</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -55,7 +57,9 @@ public enum StreamAuthentication implements Enumerator {
 	 * @generated
 	 * @ordered
 	 */
-	NONE(0, "NONE", "none"), /**
+	NONE(0, "NONE", "none"),
+
+	/**
 	 * The '<em><b>PASSWORD</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -247,4 +251,4 @@ public enum StreamAuthentication implements Enumerator {
 		return literal;
 	}
 	
-} //TopicAuthentication
+} //StreamAuthentication
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicImpl.java
index 38eaff3..a5a3fb8 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicImpl.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/DatabusStreamTopicImpl.java
@@ -25,9 +25,9 @@ package org.openecomp.dcae.controller.core.stream.impl;
 
 import org.openecomp.dcae.controller.core.stream.DatabusStreamTopic;
 import org.openecomp.dcae.controller.core.stream.DatabusStreamTopicClient;
+import org.openecomp.dcae.controller.core.stream.StreamAuthentication;
 import org.openecomp.dcae.controller.core.stream.StreamPackage;
 
-import org.openecomp.dcae.controller.core.stream.StreamAuthentication;
 import java.util.Collection;
 import java.util.Date;
 import org.eclipse.emf.common.notify.Notification;
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamPackageImpl.java b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamPackageImpl.java
index 9523175..a3e6ef7 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamPackageImpl.java
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore-gen/org/openecomp/dcae/controller/core/stream/impl/StreamPackageImpl.java
@@ -45,10 +45,10 @@ import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriber;
 import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberExternal;
 import org.openecomp.dcae.controller.core.stream.DcaeStreamSubscriberInternal;
 import org.openecomp.dcae.controller.core.stream.DmaapStream;
+import org.openecomp.dcae.controller.core.stream.StreamAuthentication;
 import org.openecomp.dcae.controller.core.stream.StreamFactory;
 import org.openecomp.dcae.controller.core.stream.StreamPackage;
 
-import org.openecomp.dcae.controller.core.stream.StreamAuthentication;
 import org.openecomp.ncomp.core.CorePackage;
 
 import org.eclipse.emf.ecore.EAttribute;
diff --git a/dcae-controller-core/dcae-controller-core-model/src/main/xcore/server.xcore b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/server.xcore
index 0cfddf5..05fd0c3 100644
--- a/dcae-controller-core/dcae-controller-core-model/src/main/xcore/server.xcore
+++ b/dcae-controller-core/dcae-controller-core-model/src/main/xcore/server.xcore
@@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.NamedEntity
 import org.openecomp.ncomp.openstack.core.VirtualMachineType
 import org.openecomp.ncomp.openstack.compute.Server
 import org.openecomp.ncomp.openstack.location.Hypervisor
+import org.openecomp.dcae.controller.core.service.HealthTestStatus
 
 class DcaeBasicServer extends NamedEntity, HasOperationalState, LogMessageContainer {
 	String privateIp
@@ -45,6 +46,9 @@ class DcaeBasicServer extends NamedEntity, HasOperationalState, LogMessageContai
 	refers Hypervisor hypervisor 
 	refers VirtualMachineType vmType
 	String certificatePassword
+	transient DateMetricAttribute lastHealthTest
+	HealthTestStatus healthTestStatus
+	String healthTestMessageCode
 }
 
 class DcaeBasicServerNetwork extends NamedEntity {
diff --git a/dcae-controller-core/dcae-controller-core-utils/.classpath b/dcae-controller-core/dcae-controller-core-utils/.classpath
index 6d9bfdd..e4af655 100644
--- a/dcae-controller-core/dcae-controller-core-utils/.classpath
+++ b/dcae-controller-core/dcae-controller-core-utils/.classpath
@@ -6,6 +6,17 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="src/main/server"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
 		<attributes>
@@ -19,13 +30,6 @@
 	</classpathentry>
 	<classpathentry kind="src" path="/ncomp-sirius-manager-server"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-core/dcae-controller-core-utils/src/assembly/assemble_zip.xml b/dcae-controller-core/dcae-controller-core-utils/src/assembly/assemble_zip.xml
index 09531dc..4bf763b 100644
--- a/dcae-controller-core/dcae-controller-core-utils/src/assembly/assemble_zip.xml
+++ b/dcae-controller-core/dcae-controller-core-utils/src/assembly/assemble_zip.xml
@@ -38,6 +38,7 @@
 			<directory>src/main/server-gen/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
@@ -45,16 +46,19 @@
 			<directory>src/main/server/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server-gen/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 	</fileSets>
 
diff --git a/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/fs-init.py b/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/fs-init.py
index 271f7c9..16a5d59 100644
--- a/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/fs-init.py
+++ b/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/fs-init.py
@@ -70,11 +70,15 @@ with open(YamlFile, 'r') as stream:
         
     # Enumerate work
     vol = pinfo["volumes"]
+    do_cinder=do_ephem=False
     for name in vol.keys():
         eph = 'ephemeral' if vol[name]["uuid"] == "ephemeral" else 'cinder'
         print "\tVolume %s size %s type %s" % (name, vol[name]["size"], eph)
         if( eph == "ephemeral" ):
             ephvol = name
+            do_ephem=True
+        else:
+            do_cinder=True
 
     # Parse ephemeral from cloud-init log
     if( not os.access(CloudInitLog, os.R_OK) ):
@@ -88,8 +92,8 @@ with open(YamlFile, 'r') as stream:
                 ephem_found = True
     fh.close()
 
-    if( not ephem_found ):
-        sys.exit("Error: ephemeral device not found in cloud-init.log");
+    if( do_ephem and not ephem_found ):
+        sys.exit("Error: ephemeral required and device not found in cloud-init.log");
         
     # Read block device info
     dev_config=dev_root=cinder_dev=""
@@ -123,6 +127,7 @@ with open(YamlFile, 'r') as stream:
     print "\tConfig: %s" % ( dev_config )
     print "\tEphemeral: %s" % ( dev_ephem )
     print "\tCinder: %s" % ( cinder_dev )
+    print "\tDoEphem? %s DoCinder? %s" % ( do_ephem, do_cinder )
 
     # Handle ephemeral already mounted
     if( not os.access("/etc/fstab", os.R_OK) ):
@@ -141,7 +146,7 @@ with open(YamlFile, 'r') as stream:
     fh.close()
     
     # Handle ephemeral
-    if 'ephvol' in locals() and not DryRun:
+    if do_ephem and not DryRun:
         print "Processing ephemeral volume \"%s\"" % ephvol
         if( ephem_mounted == True ):
             if( os.path.ismount(mp_ephem) ):
@@ -172,10 +177,10 @@ with open(YamlFile, 'r') as stream:
             update_fstab(dev_ephem,k)
     else:
         if( not DryRun ):
-            print "No ephemeral disk defined."
+            print "No ephemeral volumes defined."
 
     # Handle cinder volume(s)
-    if( not 'cinder_dev' in locals() ):
+    if( do_cinder and not 'cinder_dev' in locals() ):
         sys.exit("Error: cinder volume not found")
 
     for name in vol.keys():
diff --git a/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/setup-logrotation.sh b/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/setup-logrotation.sh
index aff11b1..b46f420 100644
--- a/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/setup-logrotation.sh
+++ b/dcae-controller-core/dcae-controller-core-utils/src/main/server/bin/setup-logrotation.sh
@@ -1,28 +1,23 @@
 #!/bin/bash 
 
-APP=$1
-
-LOG1=$(echo $APP | sed s/dcae-//).err
-LOG2=$(echo $APP | sed s/dcae-//).out
-
-cat > | /etc/logrotate.d/$APP << EOF
-
-/opt/app/$APP/logs/$LOG1 {
-    missingok
-    compress
-    daily
-    rotate 14
-    dateext
-    copytruncate
-}
-
-/opt/app/$APP/logs/$LOG2 {
-    missingok
-    compress
-    daily
-    rotate 14
-    dateext
-    copytruncate
-}
-
-EOF
\ No newline at end of file
+case $(hostname) in
+  *coll??)
+	  /opt/app/dcae-controller-core-utils/bin/controller-setup-logrotation.sh dcae-controller-service-docker-host-manager
+	  ;;
+  *tplg??)
+	  /opt/app/dcae-controller-core-utils/bin/controller-setup-logrotation.sh dcae-controller-service-common-vm-manager
+	  ;;
+  *pstg??)
+	  /opt/app/dcae-controller-core-utils/bin/controller-setup-logrotation.sh dcae-controller-service-common-vm-manager
+	  ;;
+  *pgda??)
+	  /opt/app/dcae-controller-core-utils/bin/controller-setup-logrotation.sh dcae-controller-service-common-vm-manager
+	  ;;
+  *cdap??)
+	  /opt/app/dcae-controller-core-utils/bin/controller-setup-logrotation.sh dcae-controller-service-cdap-cluster-manager
+      /opt/app/dcae-controller-core-utils/bin/controller-setup-logrotation.sh dcae-controller-service-dmaap-drsub-manager
+	  ;;
+  *cont??)
+	  /opt/app/dcae-controller-core-utils/bin/controller-setup-logrotation.sh dcae-controller-platform-server
+	  ;;
+esac
diff --git a/dcae-controller-core/dcae-controller-operation-utils/.classpath b/dcae-controller-core/dcae-controller-operation-utils/.classpath
index b14f8a5..af62a1c 100644
--- a/dcae-controller-core/dcae-controller-operation-utils/.classpath
+++ b/dcae-controller-core/dcae-controller-operation-utils/.classpath
@@ -12,7 +12,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="config"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -24,7 +23,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.settings/org.eclipse.core.resources.prefs b/dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs
index 99f26c0..99f26c0 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.settings/org.eclipse.core.resources.prefs
+++ b/dcae-controller-core/dcae-controller-operation-utils/.settings/org.eclipse.core.resources.prefs
diff --git a/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF b/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF
index a0c1ab8..ed5086e 100644
--- a/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF
+++ b/dcae-controller-core/dcae-controller-operation-utils/META-INF/MANIFEST.MF
@@ -4,9 +4,4 @@ Bundle-Name: dcae-controller-operation-utils
 Bundle-SymbolicName: dcae-controller-operation-utils
 Bundle-Version: 1.0.0.qualifier
 Export-Package: org.openecomp.dcae.controller.operation.utils
-Require-Bundle: dcae-controller-service-vm-model;bundle-version="0.1.0",
- dcae-controller-service-vm-adaptor;bundle-version="0.1.0",
- dcae-controller-platform-model;bundle-version="0.1.0",
- ncomp-sirius-manager-console;bundle-version="0.1.0",
- ncomp-sirius-manager-server;bundle-version="0.1.0",
- dcae-controller-core-model;bundle-version="0.1.0"
+
diff --git a/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy b/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy
index 38f48b0..c007a68 100644
--- a/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy
+++ b/dcae-controller-core/dcae-controller-operation-utils/src/main/java/org/openecomp/dcae/controller/operation/utils/GenControllerConfiguration.groovy
@@ -336,6 +336,12 @@ class GenControllerConfiguration extends DocUtils {
 		}
 		save("/databus",[streams : platformConfig.streams2bus()]) 
 		save("/cluster",platformConfig.controllerCluster())
+		// version
+		def version = file2object("$release/version.yaml", false)
+		System.err.println "version=$version"
+		if (version != null) {
+			save("/configuration/version",version)
+		}
 	}
 
 	void createLocations() {
diff --git a/dcae-controller-core/dcae-controller-platform-server/.classpath b/dcae-controller-core/dcae-controller-platform-server/.classpath
index 5d4cb9c..a481937 100644
--- a/dcae-controller-core/dcae-controller-platform-server/.classpath
+++ b/dcae-controller-core/dcae-controller-platform-server/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="config"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -23,7 +22,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-core/dcae-controller-platform-server/META-INF/MANIFEST.MF b/dcae-controller-core/dcae-controller-platform-server/META-INF/MANIFEST.MF
index c8db2b0..e4782f4 100644
--- a/dcae-controller-core/dcae-controller-platform-server/META-INF/MANIFEST.MF
+++ b/dcae-controller-core/dcae-controller-platform-server/META-INF/MANIFEST.MF
@@ -5,17 +5,4 @@ Bundle-SymbolicName: dcae-controller-platform-server
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.platform.server.tools,
   org.openecomp.dcae.controller.platform.servers.controller
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-platform-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-openstack-controller;bundle-version="0.1.0",
- ncomp-openstack-model;bundle-version="0.1.0",
- dcae-controller-core-model;bundle-version="0.1.0",
- dcae-controller-service-vm-model,
- operation-utils;bundle-version="0.1.0",
- dcae-controller-service-cdap-model,
- dcae-controller-service-docker-model
+
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/assembly/assemble_zip.xml b/dcae-controller-core/dcae-controller-platform-server/src/assembly/assemble_zip.xml
index 298661d..439d36d 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/assembly/assemble_zip.xml
+++ b/dcae-controller-core/dcae-controller-platform-server/src/assembly/assemble_zip.xml
@@ -38,6 +38,7 @@
 			<directory>src/main/server-gen/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
@@ -45,18 +46,20 @@
 			<directory>src/main/server/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server-gen/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
-
 	</fileSets>
 
 </assembly>
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/server/tools/Generator.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/server/tools/Generator.java
index d9bd272..4cba375 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/server/tools/Generator.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/server/tools/Generator.java
@@ -44,13 +44,14 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerPlatformServer");

 		m.setTitle("ControllerPlatformServer");

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

-		g.setEnableIRequestHandler(true);

+		ControllerGenerator g = new ControllerGenerator(o,m); 
+		g.setVersion("ONAP-R2");

+		g.setEnableIRequestHandler(true);
 		g.setEnableISiriusPlugin(true);

 		g.setEnableISwaggerHandler(true);

 		EObject cluster = ControllerFactory.eINSTANCE.createControllerCluster();

diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java
index 69644fd..ab1cff1 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeControllerClusterProvider.java
@@ -28,36 +28,30 @@ import java.util.Date;
 import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
-import org.openecomp.ncomp.sirius.manager.Jetty8Client;
-import org.openecomp.ncomp.sirius.manager.Jetty8ClientOld;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 import org.openecomp.ncomp.sirius.manager.ManagementServerUtils;
 import org.openecomp.ncomp.sirius.manager.Subject;
 
 import org.apache.log4j.Logger;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
 import org.openecomp.ncomp.sirius.manager.metrics.MetricManager;
 import org.openecomp.ncomp.webservice.utils.DateUtils;
 import org.openecomp.dcae.controller.core.server.DcaeBasicServer;
-import org.openecomp.dcae.controller.core.service.DcaeService;
 import org.openecomp.dcae.controller.platform.controller.ControllerCluster;
 import org.openecomp.dcae.controller.platform.controller.ControllerClusterServer;
 import org.openecomp.dcae.controller.platform.controller.ControllerClusterServerData;
-import org.openecomp.dcae.controller.platform.controller.DcaePlatformController;
 import org.openecomp.dcae.controller.platform.controller.ServerRole;
 import org.openecomp.dcae.controller.platform.servers.controller.logging.DcaeControllerMessageEnum;
 import org.openecomp.dcae.controller.platform.servers.controller.logging.DcaeControllerOperationEnum;
-import org.openecomp.dcae.controller.service.vm.PhysicalMachine;
 import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
 import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance;
-import org.openecomp.logger.EcompLogger;
 
 public class DcaeControllerClusterProvider extends BasicAdaptorProvider implements ISiriusPlugin {
 	private static final Logger logger = Logger.getLogger(DcaeControllerClusterProvider.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	ControllerCluster o;
 
 	public DcaeControllerClusterProvider(ISiriusServer controller, ControllerCluster o) {
@@ -122,7 +116,7 @@ public class DcaeControllerClusterProvider extends BasicAdaptorProvider implemen
 		b = b.replaceFirst("localhost", s.getServer().getNetworks().get(0).getDnsName());
 		client.setBaseAddress(b);
 		logger.info("using baseAdress: " + client.getBaseAddress());
-		System.out.println("CLUSTER: " + client.getBaseAddress());
+//		System.out.println("CLUSTER: " + client.getBaseAddress());
 		return new DcaeControllerClusterConsole(client);
 	}
 
@@ -153,7 +147,7 @@ public class DcaeControllerClusterProvider extends BasicAdaptorProvider implemen
 
 	@Override
 	public void start() {
-		System.out.println("CLUSTER: start");
+//		System.out.println("CLUSTER: start");
 		try {
 			String hostname = InetAddress.getLocalHost().getHostName();
 			if (hostname.indexOf(".") > 0)
@@ -177,43 +171,44 @@ public class DcaeControllerClusterProvider extends BasicAdaptorProvider implemen
 		} catch (UnknownHostException e) {
 			e.printStackTrace();
 		}
-		System.out.println("CLUSTER: start");
+//		System.out.println("CLUSTER: start");
 		Thread t = new Thread("cluster replication") {
 			@Override
 			public void run() {
-				System.out.println("CLUSTER 2: run");
-				ecomplogger.setOperation(DcaeControllerOperationEnum.CLUSTER_DATA_REPLICATION);
+//				System.out.println("CLUSTER 2: run");
 				while (true) {
 					try {
-						System.out.println("CLUSTER 3: run");
+//						System.out.println("CLUSTER 3: run");
 						for (ControllerClusterServer s : o.getServers()) {
 							if (s.getName().equals(o.getMyServerName()))
 								o.setRole(s.getRole());
 						}
 						controller.getServer().isSlave = o.getRole() == ServerRole.SLAVE;
 						if (o.getRole() == ServerRole.MASTER) {
-							System.out.println("CLUSTER 3: run");
+//							System.out.println("CLUSTER 3: run");
+							ecomplogger.setOperation(DcaeControllerOperationEnum.CLUSTER_DATA_REPLICATION);
 							ecomplogger.newRequestId();
+							ecomplogger.setInstanceId(controller, o);
 							ecomplogger.recordAuditEventStart();
 							for (ControllerClusterServer s : o.getServers()) {
-								System.out.println("CLUSTER 4: run: " + s.getName() + " " + s.getRole());
+//								System.out.println("CLUSTER 4: run: " + s.getName() + " " + s.getRole());
 								if (s.getRole() != ServerRole.SLAVE)
 									continue;
 								if (s.getName().equals(o.getMyServerName()))
 									continue;
-								System.out.println("CLUSTER 5: run");
+//								System.out.println("CLUSTER 5: run");
 								for (ControllerClusterServerData d : s.getData()) {
 									try {
-										System.out.println("CLUSTER 6: run: " + d.getName());
+//										System.out.println("CLUSTER 6: run: " + d.getName());
 										Date last = d.getLastPush() == null ? null : d.getLastPush().last;
 										long i = DateUtils.stringToDuration(d.getPushInterval());
-										System.out.println("CLUSTER 7: run");
+//										System.out.println("CLUSTER 7: run");
 										long now = new Date().getTime();
 										if (last != null && last.getTime() + i > now)
 											continue;
-										System.out.println("CLUSTER 8: run");
+//										System.out.println("CLUSTER 8: run");
 										o.pushData(s.getName(), d.getName());
-										System.out.println("CLUSTER 9: run");
+//										System.out.println("CLUSTER 9: run");
 									} catch (Exception e) {
 										ecomplogger.warn(DcaeControllerMessageEnum.CLUSTER_DATA_REPLICATION_FAILED,
 												s.getName());
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java
index 7574312..24ce479 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/java/org/openecomp/dcae/controller/platform/servers/controller/DcaeDcaePlatformControllerProvider.java
@@ -74,7 +74,7 @@ import org.openecomp.dcae.controller.service.docker.DockerService;
 import org.openecomp.dcae.controller.service.docker.DockerServiceInstance;
 import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
 import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance;
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
 import org.openecomp.ncomp.core.DeploymentStatus;
 import org.openecomp.ncomp.core.NamedEntity;
 import org.openecomp.ncomp.sirius.manager.BasicManagementServerProvider;
@@ -84,6 +84,7 @@ import org.openecomp.ncomp.sirius.manager.JavaHttpClient;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 import org.openecomp.ncomp.sirius.manager.ManagementServerUtils;
 import org.openecomp.ncomp.sirius.manager.Subject;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
 import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.utils.CryptoUtils;
 import org.openecomp.ncomp.utils.PropertyUtil;
@@ -92,7 +93,7 @@ import org.openecomp.ncomp.webservice.utils.JsonUtils;
 
 public class DcaeDcaePlatformControllerProvider extends BasicManagementServerProvider {
 	private static final Logger logger = Logger.getLogger(DcaeDcaePlatformControllerProvider.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	DcaePlatformController o;
 
 	public DcaeDcaePlatformControllerProvider(ISiriusServer controller, DcaePlatformController o) {
@@ -100,6 +101,11 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		this.o = o;
 	}
 
+	public static void ecoreSetup() {
+		// TODO Auto-generated method stub
+
+	}
+
 	public void start() {
 		if (o.getCluster() == null) {
 			DcaeControllerFactory f3 = new DcaeControllerFactory(controller);
@@ -108,11 +114,12 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		Thread t = new Thread("health checks") {
 			@Override
 			public void run() {
-				ecomplogger.setOperation(DcaeControllerOperationEnum.HEALTHCHECK);
 				while (true) {
 					try {
 						if (!controller.getServer().isSlave) {
+							ecomplogger.setOperation(DcaeControllerOperationEnum.HEALTHCHECK);
 							ecomplogger.newRequestId();
+							ecomplogger.setInstanceId(controller, o);
 							ecomplogger.recordAuditEventStart();
 							for (DcaeService s : o.getServices()) {
 								try {
@@ -150,15 +157,15 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-				ecomplogger.setOperation(DcaeControllerOperationEnum.POLICY_POLLING);
 				while (true) {
 					try {
-						System.out.println("PPPPPPPPPPP polling start");
 						switch (o.getCluster().getRole()) {
 						case MASTER:
 						case UNKNOWN:
 						case STANDALONE:
+							ecomplogger.setOperation(DcaeControllerOperationEnum.POLICY_POLLING);
 							ecomplogger.newRequestId();
+							ecomplogger.setInstanceId(controller, o);
 							ecomplogger.recordAuditEventStart();
 							System.out.println("PPPPPPPPPPP polling start");
 							for (DcaeService s : o.getServices()) {
@@ -205,22 +212,24 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		Thread t3 = new Thread("databus polling") {
 			@Override
 			public void run() {
-				ecomplogger.setOperation(DcaeControllerOperationEnum.DATABUS_POLLING);
 				while (true) {
 					try {
 						switch (o.getCluster().getRole()) {
 						case MASTER:
 						case UNKNOWN:
 						case STANDALONE:
+							ecomplogger.setOperation(DcaeControllerOperationEnum.DATABUS_POLLING);
 							ecomplogger.newRequestId();
+							ecomplogger.setInstanceId(controller, o);
 							ecomplogger.recordAuditEventStart();
 							try {
 								updateDatabusInformation();
+								ecomplogger.recordAuditEventEnd();
 							} catch (Exception e) {
 								ecomplogger.warn(DcaeControllerMessageEnum.DATABUS_POLLING_FAILED, e.toString());
 								ManagementServerUtils.printStackTrace(e);
+								ecomplogger.recordAuditEventEnd(StatusCodeEnum.ERROR);
 							}
-							ecomplogger.recordAuditEventEnd();
 							break;
 						case SLAVE:
 							break;
@@ -269,8 +278,6 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		HashMap<DcaeServiceInstance, List<DmaapStream>> inputs = new HashMap<DcaeServiceInstance, List<DmaapStream>>();
 		HashMap<DcaeServiceInstance, List<DmaapStream>> outputs = new HashMap<DcaeServiceInstance, List<DmaapStream>>();
 		for (DatabusStream stream : o.getDatabus().getStreams()) {
-			// if (!stream.getName().startsWith("local:"))
-			// continue;
 			if (stream instanceof DatabusStreamFeed) {
 				DatabusStreamFeed feed = (DatabusStreamFeed) stream;
 				for (DatabusStreamFeedPublisher p : feed.getPublishers()) {
@@ -285,8 +292,6 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 			if (stream instanceof DatabusStreamTopic) {
 				DatabusStreamTopic topic = (DatabusStreamTopic) stream;
 				for (DatabusStreamTopicClient p : topic.getClients()) {
-					// System.err.println("UPDATE: " + p.getName() + " " +
-					// p.getTopicURL());
 					if (p.getAction().contains(DatabusStreamTopicAction.PUB))
 						addStream(outputs, "message", "publish", p.getName(), p.getLocalStreamId(), p.getUsername(),
 								p.getUserpwd(), p.getTopicURL(), topic.getAuthenticationMethod().toString());
@@ -301,6 +306,10 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 				if (inputs.get(i) == null && outputs.get(i) == null)
 					continue;
 				String before = streamsHash(i);
+				List<DcaeStream> in = new ArrayList<DcaeStream>();
+				in.addAll(i.getInputStreams());
+				List<DcaeStream> out = new ArrayList<DcaeStream>();
+				out.addAll(i.getOutputStreams());
 				i.getInputStreams().clear();
 				if (inputs.get(i) != null)
 					i.getInputStreams().addAll(inputs.get(i));
@@ -308,8 +317,25 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 				if (outputs.get(i) != null)
 					i.getOutputStreams().addAll(outputs.get(i));
 				String after = streamsHash(i);
+				boolean okay = false;
 				if (i.getStatus() == DeploymentStatus.DEPLOYED && !before.equals(after)) {
-					s.pushManagerConfiguration(i.getName());
+					try {
+						s.pushManagerConfiguration(i.getName());
+						okay = true; 
+					} catch (Exception e) {
+						logger.warn("Unable to push configuration: " + ManagementServer.object2ref(i));
+						e.printStackTrace();
+					}
+				} 
+				else {
+					okay = true;
+				}
+				if (! okay && !before.equals(after)) {
+					// need to restore previous state so next attempt will be made.
+					i.getInputStreams().clear();
+					i.getInputStreams().addAll(in);
+					i.getOutputStreams().clear();
+					i.getOutputStreams().addAll(out);
 				}
 			}
 		}
@@ -349,7 +375,7 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		json2.put("dmaapName", client.props.get("databus.dmaapName"));
 		json2.put("drProvUrl", client.props.get("databus.drProvUrl"));
 		json2.put("version", "1");
-		json2.put("topicNsRoot", "org.openecomp.dcae.dmaap");
+		json2.put("topicNsRoot", client.props.getProperty("databus.topicNsRoot","org.openecomp.dcae.dmaap"));
 		json2.put("bridgeAdminTopic", "DCAE_MM_AGENT");
 		try {
 			client.httpJsonTransaction("/webapi/dmaap", "PUT", headers, json2);
@@ -384,7 +410,8 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 						System.err.println("DATABUS: add dr node: " + server.getName() + " " + time);
 					}
 					if (found && i.getStatus() != DeploymentStatus.DEPLOYED) {
-						client.httpJsonTransaction("/webapi/dr_nodes/" + server.getName(), "DELETE", headers, null);
+						client.httpJsonTransaction("/webapi/dr_nodes/" + server.getNetworks().get(0).getDnsName(),
+								"DELETE", headers, null);
 						System.err.println("DATABUS: delete dr node: " + server.getName() + " " + time);
 					}
 				}
@@ -417,9 +444,33 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 				}
 			}
 		}
+		databusCheckConsistency(databus);
 	}
 
-	private <T extends NamedEntity> T findNamed(EList<? extends T> l, String name) {
+	private void databusCheckConsistency(DcaeDataBus databus) {
+		for (DatabusStream s : databus.getStreams()) {
+			if (s instanceof DatabusStreamFeed) {
+				DatabusStreamFeed feed = (DatabusStreamFeed) s;
+				for (DatabusStreamFeedSubscriber sub : feed.getSubscribers()) {
+					if (!sub.getName().startsWith("forward:"))
+						continue;
+					String forwardStreamName = sub.getName().replace("forward:", "");
+					DatabusStream s2 = findNamed(databus.getStreams(), forwardStreamName);
+					if (!(s2 instanceof DatabusStreamFeed))
+						continue;
+					DatabusStreamFeed feed2 = (DatabusStreamFeed) s2;
+					if (feed2.getPublishURL() == null) continue;
+					if (! feed2.getPublishURL().equals(sub.getDeliveryURL())) {
+						System.err.println("FEED: forward URL wrong: " + feed.getName() + " " + sub.getDeliveryURL()
+								+ " != " + feed2.getPublishURL());
+						o.refreshDataBus(feed.getName());
+					}
+				}
+			}
+		}
+	}
+
+	protected <T extends NamedEntity> T findNamed(EList<? extends T> l, String name) {
 		for (T t : l) {
 			if (t.getName() != null && t.getName().equals(name))
 				return t;
@@ -435,8 +486,9 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 			return;
 		String path = "/services/" + a[0];
 		Subject s = controller.getServer().find(path);
-		if (s == null || s.o == null)
+		if (s == null || s.o == null) {
 			return;
+		}
 		DcaeService s1 = (DcaeService) s.o;
 		for (DcaeServiceInstance i : instances(s1)) {
 			if (!a[1].equals(location(i)))
@@ -648,7 +700,6 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 	}
 
 	// XX remove static
-	@SuppressWarnings("unused")
 	private void databusAddTopic(DatabusStreamTopic topic) {
 		if (topic.getTopicName() != null)
 			return;
@@ -683,7 +734,12 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 			headers.put("Content-Type", "application/json");
 			JSONObject json = ManagementServer.ecore2json(topic, 100, topic.eClass(), true);
 			if (topic.getFqtn() != null) {
-				client.httpJsonTransaction("/webapi/topics/" + topic.getFqtn(), "DELETE", headers, null);
+				try {
+					client.httpJsonTransaction("/webapi/topics/" + topic.getFqtn(), "DELETE", headers, null);
+				}
+				catch (Exception e) {
+					System.err.println("TOPIC0: delete existing topic: " + topicName + " " + e);
+				}
 				System.err.println("TOPIC0: delete existing topic: " + topicName);
 			} else
 				System.err.println("TOPIC0: new topic: " + topicName);
@@ -878,42 +934,41 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		}
 		HashMap<String, String> headers = new HashMap<String, String>();
 		JSONObject json = new JSONObject();
-		headers.put("ClientAuth", "cHl0aG9uOnRlc3Q=");
-		headers.put("Environment", "TEST");
+		headers.put("ClientAuth", client.props.getProperty("policy.clientAuth"));
+		headers.put("Environment", client.props.getProperty("policy.environment"));
 		JSONObject json2 = new JSONObject();
 		// json.put("configAttributes", json2);
 		String uuid = ManagementServer.object2ref(o2).toLowerCase();
-		for (Object k : client.props.keySet()) {
-			String key = (String) k;
-			if (key.startsWith("policy.substitution.")) {
-				uuid = uuid.replace(key.substring(20), client.props.getProperty(key));
-			}
-		}
+		String pName = o2.getPolicyName();
+		String matchPolicyName = pName;
 		json2.put("uuid", uuid);
-		json.put("policyName", ".*");
-		JSONObject res = client.httpJsonTransaction("/PyPDPServer/getConfig", "POST", headers, json);
+		json.put("policyName", matchPolicyName);
+		JSONObject res = client.httpJsonTransaction("/getConfig", "POST", headers, json);
 		System.out.println("PPPPPPPPPPP 0: " + uuid);
 		JSONArray a = res.getJSONArray("$list");
+		switch (a.length()) {
+		case 0: 
+			System.out.println("PPPPPPPPPPP 0 no policies: " + matchPolicyName + " " + uuid);
+			return;
+		case 1: break;
+		default:
+			System.out.println("PPPPPPPPPPP 0 too many policies: " + matchPolicyName + " " + uuid + " " + a.length());
+			return;
+		}
 		for (int j = 0; j < a.length(); j++) {
 			JSONObject c1 = a.getJSONObject(j);
-//			if (c1.has("matchingConditions") && c1.getJSONObject("matchingConditions").has("ECOMPName")) {
-//				if (c1.getJSONObject("matchingConditions").getString("ECOMPName").equals("DCAE"))
-//					continue;
-//			}
-			System.out.println("PPPPPPPPPPP 1: " + c1.toString(2));
 			JSONObject newConfig;
 			try {
 				newConfig = new JSONObject(c1.getString("config"));
 			} catch (Exception e) {
-				System.out.println("PPPPPPPPPPP 1.1: " + c1.toString(2));
+				System.out.println("PPPPPPPPPPP 1: " + c1.toString(2));
 				continue;
 			}
 			System.out.println("PPPPPPPPPPP 2: " + newConfig.toString(2) + " uuid:" + newConfig.get("uuid"));
-			if (!uuid.equals(newConfig.getString("uuid").toLowerCase()))
-				continue;
+//			if (!uuid.equals(newConfig.getString("uuid").toLowerCase()))
+//				continue;
 			JSONObject content = new JSONObject(newConfig.getString("content"));
 			System.out.println("PPPPPPPPPPP 3: " + content.toString(2));
-			content.put("policyName", newConfig.getString("policyName"));
 			content.put("policyDescription", newConfig.getString("description"));
 			content.put("policyConfigName", newConfig.getString("configName"));
 			content.put("policyTemplateVersion", newConfig.getString("templateVersion"));
@@ -926,11 +981,12 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 			// System.out.println("PPPPPPPPPPP 4_1: " +
 			// ManagementServer.ecore2json(oo, 1000, null, true).toString(2));
 			JSONObject before = cleanJson(o2);
-			ManagementServer.merge(o2, oo, null, true, null);
+			ManagementServer.merge(o2, oo, content, true, null);
+			o2.setPolicyName(pName);
 			JSONObject after = cleanJson(o2);
 			ManagementServer.ecore2json(o2, 1000, null, true);
 			if (!before.toString(2).equals(after.toString(2))) {
-				System.out.println("PPPPPPPPPPP configuration change 5: " + ManagementServer.object2ref(i));
+				System.out.println("PPPPPPPPPPP configuration change 5: " + ManagementServer.object2ref(i) + " using: " +  c1.getString("policyName"));
 				System.out.println("PPPPPPPPPPP before: " + before.toString(2));
 				System.out.println("PPPPPPPPPPP after: " + after.toString(2));
 				s.pushManagerConfiguration(i.getName());
@@ -1059,9 +1115,11 @@ public class DcaeDcaePlatformControllerProvider extends BasicManagementServerPro
 		}
 	}
 
-	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context) {
-		System.err.println("XXXXXX handleJson: " + action + " " + resourcePath + " " + context);
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, String clientVersion) {
+		// System.err.println("XXXXXX handleJson: " + action + " " +
+		// resourcePath + " " + context);
 		switch ((String) context.get("path")) {
+		case "/test/":
 		case "/test":
 			if (o.getCluster().getRole() == ServerRole.MASTER) {
 				return new JSONObject("{ status: 'OKAY'}");
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/resources/DcaeController.yaml b/dcae-controller-core/dcae-controller-platform-server/src/main/resources/DcaeController.yaml
index 120d5ad..432a2a1 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/resources/DcaeController.yaml
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/resources/DcaeController.yaml
@@ -8,16 +8,16 @@ operations:
   CLUSTER_DATA_REPLICATION:
     description: Data replication from master to slave controllers.
 messages:
-  HEALTHCHECK_SERVICE_FAILED:
-    errorCode: DCAE-CONTROLLER-HEALTHCHECK-SERVICE-FAILED-5001W
+  HEALTHCHECK-SERVICE-FAILED:
+    errorCode: 5001W
     messageFormat: '{0}'
     parameters:
       service-name: 
         description: Name of Service for which the health check fails.
     resolution: Contact Tier 4. This is a software bug.
     description: Heath Check on the service level fails.
-  POLICY_POLLING_FAILED:
-    errorCode: DCAE-CONTROLLER-POLICY-POLLING-FAILED-5001W
+  POLICY-POLLING-FAILED:
+    errorCode: 5001W
     messageFormat: '{0} {1}'
     parameters:
       object-path: 
@@ -26,17 +26,22 @@ messages:
         description: Exception that happened.
     resolution: Contact Tier 4. This is a software bug.
     description: Police Polling on the service level fails.
-  DATABUS_POLLING_FAILED:
-    errorCode: DCAE-CONTROLLER-DATABUS-POLLING-FAILED-5001W
+  DATABUS-POLLING-FAILED:
+    errorCode: 5001W
     messageFormat: '{0}'
     parameters:
       exception: 
         description: Exception that happened.
     resolution: Contact Tier 4. This is a software bug.
     description: Databus Polling on the service level fails.   
-    
-  CLUSTER_DATA_REPLICATION_FAILED:
-    errorCode: DCAE-CONTROLLER-CLUSTER_DATA_REPLICATION-FAILED-5001W
+  DATABUS-UNABLE-TO-ADD-STREAM:
+    errorCode: 5001W
+    messageFormat: stream={0} issue={1}
+    resolution: Verify configuration. 
+    description: Unable to find service instance for a stream pub/sub.   
+        
+  CLUSTER-DATA-REPLICATION-FAILED:
+    errorCode: 5001W
     messageFormat: '{0}'
     parameters:
       exception: 
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/sync-services-from-directory.groovy b/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/sync-services-from-directory.groovy
index 845b510..a43de43 100644
--- a/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/sync-services-from-directory.groovy
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/sync-services-from-directory.groovy
@@ -49,12 +49,17 @@ org.openecomp.dcae.controller.service.vm.VmPackage.eINSTANCE
 m.addFactory(org.openecomp.dcae.controller.service.vm.VmFactory.eINSTANCE)
 m.addRuntimeFactories(null)
 
-def o = m.load(options.directory)
-o = Utils.json2object(Utils.object2json(o))
+try {
+	def o = m.load(options.directory)
+	o = Utils.json2object(Utils.object2json(o))
+	if (options.debug) { println Utils.object2json(o).toString(2) }
+}
+catch (e) {
+	println "load error: $e"
+}
 
 def rootFile = new File("$options.directory/services")
 
-if (options.debug) { println Utils.object2json(o).toString(2) }
 
 def services = server.list("/services").services
 
@@ -75,13 +80,18 @@ rootFile.listFiles().each { File f ->
 //	println "json ${instance.toString(2)}"
 	instance.put('$nosave',1);
 //	instance.put('$useNull',1);
-	if (instances.contains(iname)) {
-      server.update("/services/$sname/instances/$iname",instance)
-      println "updating instance $iname" 
-    } else {
-      server.create("/services/$sname/instances/$iname",instance)
-      println "creating instance $iname" 
-    }
+	try {
+		if (instances.contains(iname)) {
+	      server.update("/services/$sname/instances/$iname",instance)
+	      println "updating instance $sname@$iname" 
+	    } else {
+	      server.create("/services/$sname/instances/$iname",instance)
+	      println "creating instance $sname@$iname" 
+	    }
+	}
+	catch (e) {
+		println "error instance $sname@$iname: $e"
+	}
   }
 }
 
diff --git a/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/verify-controller-state.groovy b/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/verify-controller-state.groovy
new file mode 100644
index 0000000..a240cbd
--- /dev/null
+++ b/dcae-controller-core/dcae-controller-platform-server/src/main/server/scripts/verify-controller-state.groovy
@@ -0,0 +1,203 @@
+
+/*-
+ * ============LICENSE_START==========================================
+ * OPENECOMP - DCAE
+ * ===================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ */
+	
+import org.openecomp.dcae.controller.platform.servers.controller.DcaeDcaePlatformControllerConsole
+import org.openecomp.ncomp.sirius.manager.console.Utils
+import org.json.JSONObject
+import org.openecomp.ncomp.utils.CryptoUtils
+import org.yaml.snakeyaml.Yaml
+import groovy.io.FileType
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.openecomp.ncomp.sirius.manager.JavaHttpClient;
+
+import java.security.*;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.security.cert.CertificateException;
+import javax.crypto.SecretKey;
+import javax.security.auth.callback.*;
+import javax.net.ssl.*
+
+
+
+def p(x) {
+	Utils.object2json(x).toString(2)
+}
+
+
+// http://docs.groovy-lang.org/latest/html/gapi/groovy/util/CliBuilder.html
+def cli = new CliBuilder(usage:'dcae-controller.sh verify-controller-state OPTIONS')
+cli._(longOpt:'debug', args:0, 'Debug')
+cli.v(longOpt:'verbose', args:0, 'Verbose output')
+cli.t(longOpt:'type', args:1, 'Type of verification rsa, certs, config, all')
+
+def options = cli.parse(args)
+
+if (options == null || ! options.type ) {
+	cli.usage()
+	System.exit(1)
+}
+
+
+class A {
+        static def verbose
+	static def server = new DcaeDcaePlatformControllerConsole("console.properties","localhost")
+	static def k = CryptoUtils.getKey("config/server.private")
+	static def checkRsa ( o = server.list("/",1000)  , path = "") {
+		//println "o=$o path=$path"
+		switch (o) {
+			case Map: 
+				o.each { n , v -> 
+ 					checkRsa(v,"$path/$n") 
+					if (v instanceof String && !v.startsWith("rsa:")) {
+						switch ("$path/${n.toLowerCase()}") {
+						case ~/\/openstack\/.*\/metadata\/X\/key/:
+						case ~/\/users\/.*\/publickey/: break
+						case ~/.*password.*/:
+						case ~/.*pwd.*/:
+						case ~/.*cred.*/:
+						case ~/.*secret.*/:
+						case ~/.*key/:
+						   println "unencrypted password path=$path/$n ${verbose ? v : ''}"
+						}
+				        } 
+				} 
+				break
+			case List: o.each { v -> checkRsa(v,"$path/X") }; break
+			case String:
+				// println "path=$path o=$o"
+				if (o.startsWith("rsa:")) {
+					try {  CryptoUtils.decryptPrivate(k,o.substring(4)) } catch (e) {
+						println "bad encryption path=$path"
+					}
+				}
+				break
+		}
+	}
+	static def file2object(path) {
+		Yaml yaml = new Yaml();
+		String s = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
+		return yaml.load(s);
+	}
+	static def recurseFiles(File dir) {
+		def l = []
+		dir.eachFileRecurse (FileType.FILES) { file -> l += file }
+		return l.sort { it }
+	}
+	static def servers() {
+		def servers = []
+		server.listAll("/services/vm-.*/instances/.*/servers/.*/networks/.*").sort{it}.each { p ->
+			def x = server.list(p)
+			if ( x.dnsName == null) return
+				servers += x.dnsName
+		}
+		return servers
+	}
+
+
+        static def checkPKCS12(file, pw) {
+        try {
+            KeyManagerFactory kmf = javax.net.ssl.KeyManagerFactory.getInstance("SunX509");
+            KeyStore keystore = KeyStore.getInstance("PKCS12");
+            char[] password= pw.toCharArray();
+            keystore.load(new FileInputStream(file),password);
+            kmf.init(keystore, password);
+            Enumeration<String> aliases = keystore.aliases();
+            while(aliases.hasMoreElements()){
+                String alias = aliases.nextElement();
+                if(keystore.getCertificate(alias).getType().equals("X.509")){
+			Date expDate = ((X509Certificate) keystore.getCertificate(alias)).getNotAfter();
+			Date fromDate= ((X509Certificate) keystore.getCertificate(alias)).getNotBefore();
+                        if (verbose) {
+                		println "================== $file ========================"
+                		println "Alias: $alias"
+				println("From Date: "+fromDate);
+				println("To Date: "+expDate );
+				keystore.getCertificate(alias).getSubjectAlternativeNames().each { println "SAN: ${it[1]}" }
+			}
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+}
+
+
+	static def checkCerts() {
+		def passwords = file2object("config/passwords.yaml")
+		// println passwords
+		server.listAll("/services/vm-.*/instances/.*/servers/.*").each { p ->
+			def x = server.list("$p")
+			def xx = server.list("$p/networks/public")
+			def name = new File(p).name
+			if (passwords[name] == null) {
+				println "server $name has not password defined in config/passwords.yaml"
+				return
+			}
+			try {  CryptoUtils.decryptPrivate(k,passwords[name].substring(4)) } catch (e) {
+				println "badly encrypted password for server $name"
+                                return
+			}
+			def pw = CryptoUtils.decryptPrivate(k,passwords[name].substring(4))
+                        def f = new File("config/${name}.pkcs12")
+                        if (! f.exists() ) {
+                        	println "no certificate file $f"
+                                return
+                        }
+                        checkPKCS12("$f",pw)
+		}
+	}
+
+	static String decryptString(String content) {
+		Pattern p = Pattern.compile("(rsa:[A-Za-z0-9+/]+ *[A-Za-z0-9+/]+ *[A-Za-z0-9+/]+=*)");
+		Matcher m = p.matcher(content);
+		StringBuffer s = new StringBuffer();
+		while (m.find()) {
+			String k = m.group(1);
+			m.appendReplacement(s, JavaHttpClient.decryptPassword(k));
+		}
+		m.appendTail(s);
+		return s.toString();
+	}
+	static def checkConfig() {
+		// verify encryption of files.
+		recurseFiles(new File("config/instances")).each { File f ->
+			try { decryptString(f.text) } catch (e) {
+				println "bad encryption in configuration file $f"
+			}
+		}
+	}
+}
+
+A.verbose = options.verbose
+
+if (options.type == "all" || options.type == "rsa")
+	A.checkRsa()
+
+if (options.type == "all" || options.type == "certs")
+	A.checkCerts()
+
+if (options.type == "all" || options.type == "config")
+	A.checkConfig()
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
index a3d8f3d..8b69050 100644
--- 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
@@ -1,25 +1,21 @@
 operations:
-  pushData: {}
-  receiveData: {}
-  REMOTE_pushData:
-    decription: Remote call pushData
-  REMOTE_receiveData:
-    decription: Remote call receiveData
+  ControllerCluster@pushData: {}
+  ControllerCluster@receiveData: {}
 messages:
   dummy: {}
-  pushData:
-    errorCode: pushData-FAILED-5001W
+  REQUEST-FAILED-pushData:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  receiveData:
-    errorCode: receiveData-FAILED-5001W
+  REQUEST-FAILED-receiveData:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_pushData:
-    errorCode: REMOTE-pushData-FAILED-5001W
+  REMOTE-CALL-FAILED-pushData:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_receiveData:
-    errorCode: REMOTE-receiveData-FAILED-5001W
+  REMOTE-CALL-FAILED-receiveData:
+    errorCode: 4001W
     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
index 6ac8c34..8a7e8eb 100644
--- 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
@@ -1,135 +1,111 @@
 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
+  ControllerVirtualMachineService@deploy: {}
+  ControllerVirtualMachineService@undeploy: {}
+  ControllerVirtualMachineService@test: {}
+  ControllerVirtualMachineService@suspend: {}
+  ControllerVirtualMachineService@resume: {}
+  ControllerVirtualMachineService@pushManagerConfiguration: {}
+  ControllerVirtualMachineService@pollManagerConfiguration: {}
+  ControllerVirtualMachineService@managerConfiguration: {}
+  ControllerVirtualMachineService@managerOperation: {}
+  ControllerVirtualMachineService@updateConfigurationFromPolicy: {}
+  ControllerVirtualMachineService@runHealthTests: {}
+  ControllerVirtualMachineService@updateDeploymentStatus: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateDeploymentStatus:
-    errorCode: updateDeploymentStatus-FAILED-5001W
+  REQUEST-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateDeploymentStatus:
-    errorCode: REMOTE-updateDeploymentStatus-FAILED-5001W
+  REMOTE-CALL-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     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
index 08497ed..29abd9e 100644
--- 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
@@ -1,135 +1,111 @@
 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
+  DcaePlatformController@logs: {}
+  DcaePlatformController@metrics: {}
+  DcaePlatformController@properties: {}
+  DcaePlatformController@uploadInfo: {}
+  DcaePlatformController@getValues: {}
+  DcaePlatformController@getValuesAll: {}
+  DcaePlatformController@getMessages: {}
+  DcaePlatformController@getRequestLogger: {}
+  DcaePlatformController@evaluate: {}
+  DcaePlatformController@update: {}
+  DcaePlatformController@deployDescriptor: {}
+  DcaePlatformController@refreshDataBus: {}
 messages:
   dummy: {}
-  logs:
-    errorCode: logs-FAILED-5001W
+  REQUEST-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  metrics:
-    errorCode: metrics-FAILED-5001W
+  REQUEST-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  properties:
-    errorCode: properties-FAILED-5001W
+  REQUEST-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  uploadInfo:
-    errorCode: uploadInfo-FAILED-5001W
+  REQUEST-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValues:
-    errorCode: getValues-FAILED-5001W
+  REQUEST-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValuesAll:
-    errorCode: getValuesAll-FAILED-5001W
+  REQUEST-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getMessages:
-    errorCode: getMessages-FAILED-5001W
+  REQUEST-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getRequestLogger:
-    errorCode: getRequestLogger-FAILED-5001W
+  REQUEST-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  evaluate:
-    errorCode: evaluate-FAILED-5001W
+  REQUEST-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  update:
-    errorCode: update-FAILED-5001W
+  REQUEST-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  deployDescriptor:
-    errorCode: deployDescriptor-FAILED-5001W
+  REQUEST-FAILED-deployDescriptor:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  refreshDataBus:
-    errorCode: refreshDataBus-FAILED-5001W
+  REQUEST-FAILED-refreshDataBus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_logs:
-    errorCode: REMOTE-logs-FAILED-5001W
+  REMOTE-CALL-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_metrics:
-    errorCode: REMOTE-metrics-FAILED-5001W
+  REMOTE-CALL-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_properties:
-    errorCode: REMOTE-properties-FAILED-5001W
+  REMOTE-CALL-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_uploadInfo:
-    errorCode: REMOTE-uploadInfo-FAILED-5001W
+  REMOTE-CALL-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValues:
-    errorCode: REMOTE-getValues-FAILED-5001W
+  REMOTE-CALL-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValuesAll:
-    errorCode: REMOTE-getValuesAll-FAILED-5001W
+  REMOTE-CALL-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getMessages:
-    errorCode: REMOTE-getMessages-FAILED-5001W
+  REMOTE-CALL-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getRequestLogger:
-    errorCode: REMOTE-getRequestLogger-FAILED-5001W
+  REMOTE-CALL-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_evaluate:
-    errorCode: REMOTE-evaluate-FAILED-5001W
+  REMOTE-CALL-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_update:
-    errorCode: REMOTE-update-FAILED-5001W
+  REMOTE-CALL-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_deployDescriptor:
-    errorCode: REMOTE-deployDescriptor-FAILED-5001W
+  REMOTE-CALL-FAILED-deployDescriptor:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_refreshDataBus:
-    errorCode: REMOTE-refreshDataBus-FAILED-5001W
+  REMOTE-CALL-FAILED-refreshDataBus:
+    errorCode: 4001W
     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
index bf3d69d..1489339 100644
--- 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
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     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
index 05b41bf..893d909 100644
--- 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
@@ -27,13 +27,13 @@ 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.ISiriusProvider;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
@@ -41,7 +41,9 @@ import org.openecomp.ncomp.component.ApiRequestStatus;
 
 import org.apache.log4j.Logger;
 
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -59,9 +61,9 @@ import org.openecomp.dcae.controller.platform.controller.impl.ControllerClusterI
 
 
 
-public class DcaeControllerCluster extends ControllerClusterImpl implements ISiriusPlugin {
+public class DcaeControllerCluster extends ControllerClusterImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeControllerCluster.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeControllerClusterProvider controller;
 	ISiriusServer server;
 
@@ -76,9 +78,8 @@ public class DcaeControllerCluster extends ControllerClusterImpl implements ISir
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerClusterOperationEnum.ControllerCluster_pushData,server,this);
+		ecomplogger.recordMetricEventStart(ControllerClusterOperationEnum.ControllerCluster_pushData,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushData(serverName,dataName);
 		}
@@ -87,8 +88,10 @@ public class DcaeControllerCluster extends ControllerClusterImpl implements ISir
 			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.warn(ControllerClusterMessageEnum.REQUEST_FAILED_pushData, e.toString());
+			EcompException e1 =  EcompException.create(ControllerClusterMessageEnum.REQUEST_FAILED_pushData,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerClusterMessageEnum.REQUEST_FAILED_pushData, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -103,9 +106,8 @@ public class DcaeControllerCluster extends ControllerClusterImpl implements ISir
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerClusterOperationEnum.ControllerCluster_receiveData,server,this);
+		ecomplogger.recordMetricEventStart(ControllerClusterOperationEnum.ControllerCluster_receiveData,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.receiveData(serverName,dataName,time,content);
 		}
@@ -114,8 +116,10 @@ public class DcaeControllerCluster extends ControllerClusterImpl implements ISir
 			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.warn(ControllerClusterMessageEnum.REQUEST_FAILED_receiveData, e.toString());
+			EcompException e1 =  EcompException.create(ControllerClusterMessageEnum.REQUEST_FAILED_receiveData,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerClusterMessageEnum.REQUEST_FAILED_receiveData, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -139,7 +143,7 @@ public class DcaeControllerCluster extends ControllerClusterImpl implements ISir
 	public static void ecoreSetup() {
 		DcaeControllerClusterProvider.ecoreSetup();
 	}
-	public DcaeControllerClusterProvider getSomfProvider() {
+	public DcaeControllerClusterProvider getSiriusProvider() {
 		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
index a274556..4b710a0 100644
--- 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
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeControllerClusterClient extends ControllerClusterImpl {
 		DcaeDcaePlatformController.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/cluster", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeControllerClusterClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	
 	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);
+		EClass c = ControllerPackage.eINSTANCE.getControllerCluster(); 
+		ecomplogger.recordMetricEventStart(ControllerClusterOperationEnum.ControllerCluster_pushData,client.getRemote());
 		
 		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.warn(ControllerClusterMessageEnum.REMOTE_CALL_FAILED_pushData, e.toString());
+			EcompException e1 = EcompException.create(ControllerClusterMessageEnum.REMOTE_CALL_FAILED_pushData,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerClusterMessageEnum.REMOTE_CALL_FAILED_pushData,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -89,16 +95,17 @@ public class DcaeControllerClusterClient extends ControllerClusterImpl {
 
 	
 	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);
+		EClass c = ControllerPackage.eINSTANCE.getControllerCluster(); 
+		ecomplogger.recordMetricEventStart(ControllerClusterOperationEnum.ControllerCluster_receiveData,client.getRemote());
 		
 		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.warn(ControllerClusterMessageEnum.REMOTE_CALL_FAILED_receiveData, e.toString());
+			EcompException e1 = EcompException.create(ControllerClusterMessageEnum.REMOTE_CALL_FAILED_receiveData,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerClusterMessageEnum.REMOTE_CALL_FAILED_receiveData,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
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
index f83bac3..a44f9bd 100644
--- 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
@@ -27,13 +27,13 @@ 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.ISiriusProvider;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
@@ -41,7 +41,9 @@ import org.openecomp.ncomp.component.ApiRequestStatus;
 
 import org.apache.log4j.Logger;
 
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -59,9 +61,9 @@ import org.openecomp.dcae.controller.platform.controller.impl.ControllerVirtualM
 
 
 
-public class DcaeControllerVirtualMachineService extends ControllerVirtualMachineServiceImpl implements ISiriusPlugin {
+public class DcaeControllerVirtualMachineService extends ControllerVirtualMachineServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeControllerVirtualMachineService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeControllerVirtualMachineServiceProvider controller;
 	ISiriusServer server;
 
@@ -76,9 +78,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -87,8 +88,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -103,9 +106,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -114,8 +116,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -130,9 +134,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_test,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -141,8 +144,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -157,9 +162,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -168,8 +172,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -184,9 +190,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_resume,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -195,8 +200,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -211,9 +218,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -222,8 +228,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -238,9 +246,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -249,8 +256,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -265,9 +274,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -276,8 +284,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -292,9 +302,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -303,8 +312,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -319,9 +330,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -330,8 +340,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -346,9 +358,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -357,8 +368,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -373,9 +386,8 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_updateDeploymentStatus,server,this);
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_updateDeploymentStatus,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateDeploymentStatus();
 		}
@@ -384,8 +396,10 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 			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.warn(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 =  EcompException.create(ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerVirtualMachineServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -409,7 +423,7 @@ public class DcaeControllerVirtualMachineService extends ControllerVirtualMachin
 	public static void ecoreSetup() {
 		DcaeControllerVirtualMachineServiceProvider.ecoreSetup();
 	}
-	public DcaeControllerVirtualMachineServiceProvider getSomfProvider() {
+	public DcaeControllerVirtualMachineServiceProvider getSiriusProvider() {
 		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
index 09d2371..ea64327 100644
--- 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
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 		DcaeDcaePlatformController.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/cont", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeControllerVirtualMachineServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	
 	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);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_deploy,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -89,16 +95,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	public void undeploy(String path, java.lang.String instanceName) {
-		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_undeploy);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_undeploy,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -106,16 +113,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	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);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_test,client.getRemote());
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	public void suspend(String path, java.lang.String instanceName) {
-		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_suspend);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_suspend,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -140,16 +149,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	public void resume(String path, java.lang.String instanceName) {
-		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_resume);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_resume,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -157,16 +167,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	public void pushManagerConfiguration(String path, java.lang.String instanceName) {
-		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_pushManagerConfiguration,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -174,16 +185,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	public void pollManagerConfiguration(String path, java.lang.String instanceName) {
-		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_pollManagerConfiguration,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -191,16 +203,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	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);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_managerConfiguration,client.getRemote());
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -208,16 +221,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	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);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_managerOperation,client.getRemote());
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -225,16 +239,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	public void updateConfigurationFromPolicy(String path, java.lang.String instanceName) {
-		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_updateConfigurationFromPolicy,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -242,16 +257,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	public void runHealthTests(String path) {
-		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_runHealthTests,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -259,16 +275,17 @@ public class DcaeControllerVirtualMachineServiceClient extends ControllerVirtual
 
 	
 	public void updateDeploymentStatus(String path) {
-		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerVirtualMachineServiceOperationEnum.REMOTE_updateDeploymentStatus);
+		EClass c = ControllerPackage.eINSTANCE.getControllerVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(ControllerVirtualMachineServiceOperationEnum.ControllerVirtualMachineService_updateDeploymentStatus,client.getRemote());
 		
 		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.warn(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 = EcompException.create(ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerVirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
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
index 402f708..bbaa185 100644
--- 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
@@ -27,13 +27,13 @@ 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.ISiriusProvider;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
@@ -41,7 +41,9 @@ import org.openecomp.ncomp.component.ApiRequestStatus;
 
 import org.apache.log4j.Logger;
 
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -77,9 +79,9 @@ import org.openecomp.dcae.controller.platform.controller.impl.DcaePlatformContro
 
 
 
-public class DcaeDcaePlatformController extends DcaePlatformControllerImpl implements IRequestHandler, ISwaggerHandler, ISiriusPlugin {
+public class DcaeDcaePlatformController extends DcaePlatformControllerImpl implements ISiriusProvider, IRequestHandler, ISwaggerHandler, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeDcaePlatformController.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeDcaePlatformControllerProvider controller;
 	ISiriusServer server;
 
@@ -94,9 +96,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_deployDescriptor,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_deployDescriptor,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deployDescriptor(name);
 		}
@@ -105,8 +106,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_deployDescriptor, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_deployDescriptor,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_deployDescriptor, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -121,9 +124,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_refreshDataBus,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_refreshDataBus,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.refreshDataBus(nameMatch);
 		}
@@ -132,8 +134,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_refreshDataBus, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_refreshDataBus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_refreshDataBus, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -148,9 +152,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_logs,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_logs,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.logs(cx,logs);
 		}
@@ -159,8 +162,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_logs, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_logs, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -175,9 +180,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_metrics,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_metrics,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.metrics(cx,metrics);
 		}
@@ -186,8 +190,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_metrics, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_metrics, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -202,9 +208,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_properties,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_properties,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.properties(cx,l);
 		}
@@ -213,8 +218,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_properties, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_properties, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -229,9 +236,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_uploadInfo,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_uploadInfo,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.uploadInfo(cx,info);
 		}
@@ -240,8 +246,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -256,9 +264,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_getValues,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_getValues,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValues(cx,path,start,end,option,relativeInterval);
 		}
@@ -267,8 +274,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_getValues, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_getValues, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -283,9 +292,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_getValuesAll,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_getValuesAll,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval);
 		}
@@ -294,8 +302,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -310,9 +320,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_getMessages,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_getMessages,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getMessages(cx,path,start,end);
 		}
@@ -321,8 +330,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_getMessages, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -337,9 +348,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_getRequestLogger,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_getRequestLogger,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getRequestLogger(userName,action,resourcePath,context);
 		}
@@ -348,8 +358,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -364,9 +376,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_evaluate,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_evaluate,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.evaluate(path,function);
 		}
@@ -375,8 +386,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_evaluate, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -391,9 +404,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(DcaePlatformControllerOperationEnum.DcaePlatformController_update,server,this);
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_update,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.update(path,function);
 		}
@@ -402,8 +414,10 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 			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.warn(DcaePlatformControllerMessageEnum.REQUEST_FAILED_update, e.toString());
+			EcompException e1 =  EcompException.create(DcaePlatformControllerMessageEnum.REQUEST_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DcaePlatformControllerMessageEnum.REQUEST_FAILED_update, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -415,8 +429,8 @@ public class DcaeDcaePlatformController extends DcaePlatformControllerImpl imple
 
 
 	@Override
-	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context) {
-		return controller.handleJson(userName,action,resourcePath,json,context);
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, String clientVersion) {
+		return controller.handleJson(userName,action,resourcePath,json,context,clientVersion);
 	}
 
 	@Override
@@ -442,7 +456,7 @@ public void updateSwagger(String path, SwaggerUtils swagger) {
 	public static void ecoreSetup() {
 		DcaeDcaePlatformControllerProvider.ecoreSetup();
 	}
-	public DcaeDcaePlatformControllerProvider getSomfProvider() {
+	public DcaeDcaePlatformControllerProvider getSiriusProvider() {
 		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
index e9409b3..b74dc43 100644
--- 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
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 		DcaeDcaePlatformController.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeDcaePlatformControllerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void deployDescriptor(java.lang.String name) {
-		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_deployDescriptor);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_deployDescriptor,client.getRemote());
 		
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_deployDescriptor, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_deployDescriptor,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_deployDescriptor,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@Override
 	public void refreshDataBus(java.lang.String nameMatch) {
-		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DcaePlatformControllerOperationEnum.REMOTE_refreshDataBus);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_refreshDataBus,client.getRemote());
 		
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_refreshDataBus, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_refreshDataBus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_refreshDataBus,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_logs,client.getRemote());
 		
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_metrics,client.getRemote());
 		
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -139,16 +148,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_properties,client.getRemote());
 		
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_uploadInfo,client.getRemote());
 		
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_getValues,client.getRemote());
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -190,16 +202,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_getValuesAll,client.getRemote());
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -207,16 +220,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_getMessages,client.getRemote());
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_getRequestLogger,client.getRemote());
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -241,16 +256,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_evaluate,client.getRemote());
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -258,16 +274,17 @@ public class DcaeDcaePlatformControllerClient extends DcaePlatformControllerImpl
 
 	@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);
+		EClass c = ControllerPackage.eINSTANCE.getDcaePlatformController(); 
+		ecomplogger.recordMetricEventStart(DcaePlatformControllerOperationEnum.DcaePlatformController_update,client.getRemote());
 		
 		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.warn(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_update, e.toString());
+			EcompException e1 = EcompException.create(DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DcaePlatformControllerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
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
index 09a439c..1fadea5 100644
--- 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
@@ -77,7 +77,7 @@ public class DcaeDcaePlatformControllerProviderTemplate extends BasicManagementS
 	}
 
 
-public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context) {
+public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, String clientVersion) {
 		// 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
index 2dc725f..a8f99eb 100644
--- 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
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.platform.servers.controller;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.platform.controller.DcaePlatformController;
@@ -52,7 +51,7 @@ import org.openecomp.dcae.controller.platform.servers.controller.gui.DcaeModelFa
 
 
 
-public class DcaeDcaePlatformControllerServer implements ISiriusServer {
+public class DcaeDcaePlatformControllerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeDcaePlatformControllerServer.class);
     String serverPath;
     ManagementServer server;
@@ -79,6 +78,7 @@ public class DcaeDcaePlatformControllerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "DcaePlatformController", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
     
 		server.addFactory(new org.openecomp.ncomp.servers.openstack.OsOpenstackFactory(this));
@@ -94,6 +94,7 @@ public class DcaeDcaePlatformControllerServer implements ISiriusServer {
         controller = (DcaeDcaePlatformController) server.find("/").o;
         webServer = new Jetty8Server("controller.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
    
 		webServer.add("/test",controller);
    
@@ -126,4 +127,17 @@ public class DcaeDcaePlatformControllerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
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
index 7fc89db..4749e65 100644
--- 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
@@ -27,13 +27,13 @@ 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.ISiriusProvider;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
 import org.openecomp.ncomp.sirius.manager.SwaggerUtils;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
@@ -41,7 +41,9 @@ import org.openecomp.ncomp.component.ApiRequestStatus;
 
 import org.apache.log4j.Logger;
 
-import org.openecomp.logger.EcompLogger;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
@@ -89,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -106,9 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -117,8 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -133,9 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -144,8 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -160,9 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -171,8 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -187,9 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -198,8 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -214,9 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -225,8 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -241,9 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -252,8 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -272,7 +280,7 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		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
index 720cae3..84f883c 100644
--- 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
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeDcaePlatformController.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		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/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
index 8705ab8..3822d29 100644
--- 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
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {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
index 9a5d804..1128277 100644
--- 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
@@ -1,25 +1,4 @@
 
-/*-
- * ============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;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.platform.servers.controller.gui.logging.GuiClientApi");
+		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
index aa3a949..4a4b5c6 100644
--- 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
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 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;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
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
index 5866f65..2712b33 100644
--- 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
@@ -1,30 +1,30 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-pushData=\
-  pushData-FAILED-5001W|\
+REQUEST_FAILED_pushData=\
+  REQUEST-FAILED-pushData-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-receiveData=\
-  receiveData-FAILED-5001W|\
+REQUEST_FAILED_receiveData=\
+  REQUEST-FAILED-receiveData-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_pushData=\
-  REMOTE-pushData-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushData=\
+  REMOTE-CALL-FAILED-pushData-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_receiveData=\
-  REMOTE-receiveData-FAILED-5001W|\
+REMOTE_CALL_FAILED_receiveData=\
+  REMOTE-CALL-FAILED-receiveData-4001W|\
   {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
index 10ec310..40dc69a 100644
--- 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
@@ -1,25 +1,4 @@
 
-/*-
- * ============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;
@@ -28,12 +7,12 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum ControllerClusterMessageEnum implements EcompMessageEnum {
 
   dummy,
-  pushData,
-  receiveData,
-  REMOTE_pushData,
-  REMOTE_receiveData;
+  REQUEST_FAILED_pushData,
+  REQUEST_FAILED_receiveData,
+  REMOTE_CALL_FAILED_pushData,
+  REMOTE_CALL_FAILED_receiveData;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerCluster");
+		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
index cece429..d2df645 100644
--- 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
@@ -1,33 +1,23 @@
 
-/*-
- * ============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;
+  ControllerCluster_pushData("ControllerCluster@pushData"),
+  ControllerCluster_receiveData("ControllerCluster@receiveData") ; 
+
+
+	private String n;
+	
+	private ControllerClusterOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
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
index d32cf07..1218d2a 100644
--- 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
@@ -1,150 +1,150 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateDeploymentStatus=\
-  updateDeploymentStatus-FAILED-5001W|\
+REQUEST_FAILED_updateDeploymentStatus=\
+  REQUEST-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateDeploymentStatus=\
-  REMOTE-updateDeploymentStatus-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateDeploymentStatus=\
+  REMOTE-CALL-FAILED-updateDeploymentStatus-4001W|\
   {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
index 65f5139..4a7aaad 100644
--- 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
@@ -1,25 +1,4 @@
 
-/*-
- * ============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;
@@ -28,32 +7,32 @@ 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;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REQUEST_FAILED_updateDeploymentStatus,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_updateDeploymentStatus;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.platform.servers.controller.logging.ControllerVirtualMachineService");
+		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
index 771b696..90ad7d0 100644
--- 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
@@ -1,53 +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 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;
+  ControllerVirtualMachineService_deploy("ControllerVirtualMachineService@deploy"),
+  ControllerVirtualMachineService_undeploy("ControllerVirtualMachineService@undeploy"),
+  ControllerVirtualMachineService_test("ControllerVirtualMachineService@test"),
+  ControllerVirtualMachineService_suspend("ControllerVirtualMachineService@suspend"),
+  ControllerVirtualMachineService_resume("ControllerVirtualMachineService@resume"),
+  ControllerVirtualMachineService_pushManagerConfiguration("ControllerVirtualMachineService@pushManagerConfiguration"),
+  ControllerVirtualMachineService_pollManagerConfiguration("ControllerVirtualMachineService@pollManagerConfiguration"),
+  ControllerVirtualMachineService_managerConfiguration("ControllerVirtualMachineService@managerConfiguration"),
+  ControllerVirtualMachineService_managerOperation("ControllerVirtualMachineService@managerOperation"),
+  ControllerVirtualMachineService_updateConfigurationFromPolicy("ControllerVirtualMachineService@updateConfigurationFromPolicy"),
+  ControllerVirtualMachineService_runHealthTests("ControllerVirtualMachineService@runHealthTests"),
+  ControllerVirtualMachineService_updateDeploymentStatus("ControllerVirtualMachineService@updateDeploymentStatus") ; 
+
+
+	private String n;
+	
+	private ControllerVirtualMachineServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
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
index b8275ac..883027d 100644
--- 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
@@ -1,24 +1,30 @@
 
 HEALTHCHECK_SERVICE_FAILED=\
-  DCAE-CONTROLLER-HEALTHCHECK-SERVICE-FAILED-5001W|\
+  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|\
+  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|\
+  DATABUS-POLLING-FAILED-5001W|\
   {0}|\
   Contact Tier 4. This is a software bug.|\
   Databus Polling on the service level fails.
 
+DATABUS_UNABLE_TO_ADD_STREAM=\
+  DATABUS-UNABLE-TO-ADD-STREAM-5001W|\
+  stream={0} issue={1}|\
+  Verify configuration.|\
+  Unable to find service instance for a stream pub/sub.
+
 CLUSTER_DATA_REPLICATION_FAILED=\
-  DCAE-CONTROLLER-CLUSTER_DATA_REPLICATION-FAILED-5001W|\
+  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
index f026d66..4233931 100644
--- 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
@@ -1,25 +1,4 @@
 
-/*-
- * ============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;
@@ -30,9 +9,10 @@ public enum DcaeControllerMessageEnum implements EcompMessageEnum {
   HEALTHCHECK_SERVICE_FAILED,
   POLICY_POLLING_FAILED,
   DATABUS_POLLING_FAILED,
+  DATABUS_UNABLE_TO_ADD_STREAM,
   CLUSTER_DATA_REPLICATION_FAILED;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.platform.servers.controller.logging.DcaeController");
+		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
index 44c7454..9285d2c 100644
--- 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
@@ -1,33 +1,25 @@
 
-/*-
- * ============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;
+  HEALTHCHECK("HEALTHCHECK"),
+  POLICY_POLLING("POLICY_POLLING"),
+  DATABUS_POLLING("DATABUS_POLLING"),
+  CLUSTER_DATA_REPLICATION("CLUSTER_DATA_REPLICATION") ; 
+
+
+	private String n;
+	
+	private DcaeControllerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
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
index a426ec8..10f75f8 100644
--- 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
@@ -1,150 +1,150 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-logs=\
-  logs-FAILED-5001W|\
+REQUEST_FAILED_logs=\
+  REQUEST-FAILED-logs-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-metrics=\
-  metrics-FAILED-5001W|\
+REQUEST_FAILED_metrics=\
+  REQUEST-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-properties=\
-  properties-FAILED-5001W|\
+REQUEST_FAILED_properties=\
+  REQUEST-FAILED-properties-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-uploadInfo=\
-  uploadInfo-FAILED-5001W|\
+REQUEST_FAILED_uploadInfo=\
+  REQUEST-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValues=\
-  getValues-FAILED-5001W|\
+REQUEST_FAILED_getValues=\
+  REQUEST-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValuesAll=\
-  getValuesAll-FAILED-5001W|\
+REQUEST_FAILED_getValuesAll=\
+  REQUEST-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getMessages=\
-  getMessages-FAILED-5001W|\
+REQUEST_FAILED_getMessages=\
+  REQUEST-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getRequestLogger=\
-  getRequestLogger-FAILED-5001W|\
+REQUEST_FAILED_getRequestLogger=\
+  REQUEST-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-evaluate=\
-  evaluate-FAILED-5001W|\
+REQUEST_FAILED_evaluate=\
+  REQUEST-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-update=\
-  update-FAILED-5001W|\
+REQUEST_FAILED_update=\
+  REQUEST-FAILED-update-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-deployDescriptor=\
-  deployDescriptor-FAILED-5001W|\
+REQUEST_FAILED_deployDescriptor=\
+  REQUEST-FAILED-deployDescriptor-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-refreshDataBus=\
-  refreshDataBus-FAILED-5001W|\
+REQUEST_FAILED_refreshDataBus=\
+  REQUEST-FAILED-refreshDataBus-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_logs=\
-  REMOTE-logs-FAILED-5001W|\
+REMOTE_CALL_FAILED_logs=\
+  REMOTE-CALL-FAILED-logs-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_metrics=\
-  REMOTE-metrics-FAILED-5001W|\
+REMOTE_CALL_FAILED_metrics=\
+  REMOTE-CALL-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_properties=\
-  REMOTE-properties-FAILED-5001W|\
+REMOTE_CALL_FAILED_properties=\
+  REMOTE-CALL-FAILED-properties-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_uploadInfo=\
-  REMOTE-uploadInfo-FAILED-5001W|\
+REMOTE_CALL_FAILED_uploadInfo=\
+  REMOTE-CALL-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValues=\
-  REMOTE-getValues-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValues=\
+  REMOTE-CALL-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValuesAll=\
-  REMOTE-getValuesAll-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValuesAll=\
+  REMOTE-CALL-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getMessages=\
-  REMOTE-getMessages-FAILED-5001W|\
+REMOTE_CALL_FAILED_getMessages=\
+  REMOTE-CALL-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getRequestLogger=\
-  REMOTE-getRequestLogger-FAILED-5001W|\
+REMOTE_CALL_FAILED_getRequestLogger=\
+  REMOTE-CALL-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_evaluate=\
-  REMOTE-evaluate-FAILED-5001W|\
+REMOTE_CALL_FAILED_evaluate=\
+  REMOTE-CALL-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_update=\
-  REMOTE-update-FAILED-5001W|\
+REMOTE_CALL_FAILED_update=\
+  REMOTE-CALL-FAILED-update-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_deployDescriptor=\
-  REMOTE-deployDescriptor-FAILED-5001W|\
+REMOTE_CALL_FAILED_deployDescriptor=\
+  REMOTE-CALL-FAILED-deployDescriptor-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_refreshDataBus=\
-  REMOTE-refreshDataBus-FAILED-5001W|\
+REMOTE_CALL_FAILED_refreshDataBus=\
+  REMOTE-CALL-FAILED-refreshDataBus-4001W|\
   {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
index 973543f..508aae0 100644
--- 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
@@ -1,25 +1,4 @@
 
-/*-
- * ============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;
@@ -28,32 +7,32 @@ 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;
+  REQUEST_FAILED_logs,
+  REQUEST_FAILED_metrics,
+  REQUEST_FAILED_properties,
+  REQUEST_FAILED_uploadInfo,
+  REQUEST_FAILED_getValues,
+  REQUEST_FAILED_getValuesAll,
+  REQUEST_FAILED_getMessages,
+  REQUEST_FAILED_getRequestLogger,
+  REQUEST_FAILED_evaluate,
+  REQUEST_FAILED_update,
+  REQUEST_FAILED_deployDescriptor,
+  REQUEST_FAILED_refreshDataBus,
+  REMOTE_CALL_FAILED_logs,
+  REMOTE_CALL_FAILED_metrics,
+  REMOTE_CALL_FAILED_properties,
+  REMOTE_CALL_FAILED_uploadInfo,
+  REMOTE_CALL_FAILED_getValues,
+  REMOTE_CALL_FAILED_getValuesAll,
+  REMOTE_CALL_FAILED_getMessages,
+  REMOTE_CALL_FAILED_getRequestLogger,
+  REMOTE_CALL_FAILED_evaluate,
+  REMOTE_CALL_FAILED_update,
+  REMOTE_CALL_FAILED_deployDescriptor,
+  REMOTE_CALL_FAILED_refreshDataBus;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.platform.servers.controller.logging.DcaePlatformController");
+		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
index f5e0562..6fe657d 100644
--- 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
@@ -1,53 +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 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;
+  DcaePlatformController_logs("DcaePlatformController@logs"),
+  DcaePlatformController_metrics("DcaePlatformController@metrics"),
+  DcaePlatformController_properties("DcaePlatformController@properties"),
+  DcaePlatformController_uploadInfo("DcaePlatformController@uploadInfo"),
+  DcaePlatformController_getValues("DcaePlatformController@getValues"),
+  DcaePlatformController_getValuesAll("DcaePlatformController@getValuesAll"),
+  DcaePlatformController_getMessages("DcaePlatformController@getMessages"),
+  DcaePlatformController_getRequestLogger("DcaePlatformController@getRequestLogger"),
+  DcaePlatformController_evaluate("DcaePlatformController@evaluate"),
+  DcaePlatformController_update("DcaePlatformController@update"),
+  DcaePlatformController_deployDescriptor("DcaePlatformController@deployDescriptor"),
+  DcaePlatformController_refreshDataBus("DcaePlatformController@refreshDataBus") ; 
+
+
+	private String n;
+	
+	private DcaePlatformControllerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/.classpath b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/.classpath
index d2d34b3..89273c0 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/.classpath
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/.classpath
@@ -21,7 +21,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/META-INF/MANIFEST.MF b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/META-INF/MANIFEST.MF
index 92614d2..dbe2557 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/META-INF/MANIFEST.MF
@@ -5,14 +5,4 @@ Bundle-SymbolicName: dcae-controller-service-cdap-adaptor
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.cdap.adaptor.tools,
   org.openecomp.dcae.controller.service.servers.cdap
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-cdap-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- dcae-controller-service-cdap-cluster-model,
- dcae-controller-service-vm-adaptor;bundle-version="0.1.0",
- dcae-controller-service-cdap-cluster-manager,
- dcae-controller-core-model
+
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java
index 0174c12..c043f16 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java
@@ -53,12 +53,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCdapManager");

 		m.setTitle("ControllerServiceCdapManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(false);

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

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

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("CdapService");

 		m.setTitle("CdapService");

 		ControllerGenerator g = new ControllerGenerator(o,m); 

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

 		g.setEnableISiriusPlugin(true);

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

diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java
index 8e802e1..e89de5c 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  */
-	
+
 package org.openecomp.dcae.controller.service.servers.cdap;
 
 import java.util.ArrayList;
@@ -41,14 +41,30 @@ import org.openecomp.dcae.controller.core.stream.DcaeStream;
 import org.openecomp.dcae.controller.core.stream.DmaapStream;
 import org.openecomp.dcae.controller.service.cdap.CdapApplication;
 import org.openecomp.dcae.controller.service.cdap.CdapArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep;
+import org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep;
 import org.openecomp.dcae.controller.service.cdap.CdapFactory;
 import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep;
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep;
+import org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep;
 import org.openecomp.dcae.controller.service.cdap.CdapService;
 import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance;
+import org.openecomp.dcae.controller.service.cdap.CdapStartAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep;
 import org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.DcaeCdapClusterManagerConsole;
 import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeCdapClusterService;
 import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeCdapClusterServiceProvider;
 import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
+import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
 import org.openecomp.ncomp.cdap.CdapEntityWithPreferences;
 import org.openecomp.ncomp.cdap.CdapKeyPair;
 import org.openecomp.ncomp.cdap.CdapNamespace;
@@ -56,6 +72,7 @@ import org.openecomp.ncomp.core.DeploymentStatus;
 import org.openecomp.ncomp.core.NamedEntity;
 import org.openecomp.ncomp.sirius.manager.AbstractClient;
 import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 import org.openecomp.ncomp.sirius.manager.JavaHttpClient;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
@@ -88,42 +105,111 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 		DcaeCdapClusterManagerConsole console = consoleCluster(i);
 		// console.loadArtifact(i.getCdapNamespace().getName(), i.getName(),
 		// i.getJarFile());
-		try {
-			console.createNamespace(i.getCdapName());
-		} catch (Exception e1) {
-			logger.warn("reusing existing namespace");
-		}
-		try {
-			for (CdapArtifact a : i.getArtifacts()) {
-				if (a.getVersion() != null)
-					console.loadArtifact(i.getCdapName(), a.getName(), a.getJarFile(), a.getVersion());
-				console.deployApp(i.getCdapName(), a.getJarFile());
+		synchronized (i) {
+			try {
+				console.createNamespace(i.getCdapName());
+			} catch (Exception e1) {
+				logger.warn("reusing existing namespace");
 			}
-			for (CdapApplication a : i.getApps()) {
-//				System.err.println("CDAP: start app 1");
-				console.loadArtifact(i.getCdapName(), a.getArtifactName(), a.getJarFile(), a.getVersion());
-//				System.err.println("CDAP: start app 2");
-				if (a.getAppConfigFileContent() == null) 
-					console.createApp(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), "user");
-				else
-					console.createAppWithConfig(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), "user",
-						a.getAppConfigFileContent());
-//				System.err.println("CDAP: start app 3");
-			}
-		} catch (Exception e) {
-			logger.warn("unable to start CDAP app: " + ManagementServer.object2ref(i));
-			e.printStackTrace();
-			throw new RuntimeException("Unable to start CDAP app: " + ManagementServer.object2ref(i) + " " + e);
+			try {
+				for (CdapArtifact a : i.getArtifacts()) {
+					if (a.getVersion() != null)
+						console.loadArtifact(i.getCdapName(), a.getName(), a.getJarFile(), a.getVersion());
+					console.deployApp(i.getCdapName(), a.getJarFile());
+				}
+				for (CdapApplication a : i.getApps()) {
+					// System.err.println("CDAP: start app 1");
+					console.loadArtifact(i.getCdapName(), a.getArtifactName(), a.getJarFile(), a.getVersion());
+					// System.err.println("CDAP: start app 2");
+					if (a.getAppConfigFileContent() == null)
+						console.createApp(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), "user");
+					else
+						console.createAppWithConfig(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(),
+								"user", a.getAppConfigFileContent());
+					// System.err.println("CDAP: start app 3");
+				}
+				doSteps(console, i, i.getDeploySteps());
+			} catch (Exception e) {
+				logger.warn("unable to start CDAP app: " + ManagementServer.object2ref(i));
+				e.printStackTrace();
+				throw new RuntimeException("Unable to start CDAP app: " + ManagementServer.object2ref(i) + " " + e);
+			}
+
 		}
 		o.pushManagerConfiguration(instanceName);
 	}
 
+	private void doSteps(DcaeCdapClusterManagerConsole console, CdapServiceInstance i, EList<CdapStep> steps) {
+		for (CdapStep s : steps) {
+			if (s instanceof CdapLoadArtifactStep) {
+				CdapLoadArtifactStep s1 = (CdapLoadArtifactStep) s;
+				console.loadArtifact(i.getCdapName(), s1.getArtifactName(), s1.getJarfile(), s1.getVersion());
+			}
+			if (s instanceof CdapLoadArtifactWithConfigStep) {
+				CdapLoadArtifactWithConfigStep s1 = (CdapLoadArtifactWithConfigStep) s;
+				console.loadArtifactWithConfig(i.getCdapName(), s1.getArtifactName(), s1.getJarfile(), s1.getVersion(),
+						s1.getConfig());
+			}
+			if (s instanceof CdapDeployAppStep) {
+				CdapDeployAppStep s1 = (CdapDeployAppStep) s;
+				console.deployApp(i.getCdapName(), s1.getJarfile());
+			}
+			if (s instanceof CdapCreateAppStep) {
+				CdapCreateAppStep s1 = (CdapCreateAppStep) s;
+				console.createApp(i.getCdapName(), s1.getAppId(), s1.getArtifactName(), s1.getVersion(), s1.getScope());
+			}
+			if (s instanceof CdapCreateAppWithConfigStep) {
+				CdapCreateAppWithConfigStep s1 = (CdapCreateAppWithConfigStep) s;
+				console.createAppWithConfig(i.getCdapName(), s1.getAppId(), s1.getArtifactName(), s1.getVersion(),
+						s1.getScope(), s1.getAppConfig());
+			}
+			if (s instanceof CdapStartAppStep) {
+				CdapStartAppStep s1 = (CdapStartAppStep) s;
+				console.startApp(i.getCdapName(), s1.getAppId());
+			}
+			if (s instanceof CdapStartFlowStep) {
+				CdapStartFlowStep s1 = (CdapStartFlowStep) s;
+				console.startFlow(i.getCdapName(), s1.getAppId(), s1.getFlowId(), s1.getExtraArgs());
+			}
+			if (s instanceof CdapStartWorkerStep) {
+				CdapStartWorkerStep s1 = (CdapStartWorkerStep) s;
+				console.startWorker(i.getCdapName(), s1.getAppId(), s1.getWorkerId(), s1.getExtraArgs());
+			}
+			if (s instanceof CdapStartServiceStep) {
+				CdapStartServiceStep s1 = (CdapStartServiceStep) s;
+				console.startService(i.getCdapName(), s1.getAppId(), s1.getServiceId(), s1.getExtraArgs());
+			}
+			if (s instanceof CdapStopAppStep) {
+				CdapStopAppStep s1 = (CdapStopAppStep) s;
+				console.stopApp(i.getCdapName(), s1.getAppId());
+			}
+			if (s instanceof CdapStopFlowStep) {
+				CdapStopFlowStep s1 = (CdapStopFlowStep) s;
+				console.stopFlow(i.getCdapName(), s1.getAppId(), s1.getFlowId());
+			}
+			if (s instanceof CdapStopWorkerStep) {
+				CdapStopWorkerStep s1 = (CdapStopWorkerStep) s;
+				console.stopWorker(i.getCdapName(), s1.getAppId(), s1.getWorkerId());
+			}
+			if (s instanceof CdapStopServiceStep) {
+				CdapStopServiceStep s1 = (CdapStopServiceStep) s;
+				console.stopService(i.getCdapName(), s1.getAppId(), s1.getServiceId());
+			}
+			if (s instanceof CdapResumeScheduleStep) {
+				CdapResumeScheduleStep s1 = (CdapResumeScheduleStep) s;
+				console.resumeSchedule(i.getCdapName(), s1.getAppId(), s1.getScheduleId());
+
+			}
+		}
+	}
+
 	public void undeploy(String instanceName) {
 		CdapServiceInstance i = findInstance(instanceName);
 		DcaeCdapClusterManagerConsole console = consoleCluster(i);
 		if (i.getCdapName() == null) {
 			i.setCdapName(cdapName(i));
 		}
+		doSteps(console, i, i.getUndeploySteps());
 		for (String f : i.getFlowNames()) {
 			String[] a = f.split("\\.");
 			if (a.length != 2)
@@ -143,7 +229,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 		}
 		for (CdapArtifact a : i.getArtifacts()) {
 			try {
-//				console.stopApp(i.getCdapName(), a.getName());
+				// console.stopApp(i.getCdapName(), a.getName());
 				console.deleteApp(i.getCdapName(), a.getName());
 				if (a.getVersion() != null) {
 					console.deleteArtifact(i.getCdapName(), a.getName(), a.getVersion());
@@ -161,121 +247,127 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 				e.printStackTrace();
 			}
 		}
-//		console.deleteNamespace(i.getCdapName());
+		// console.deleteNamespace(i.getCdapName());
 	}
 
 	public void pushManagerConfiguration(String instanceName) {
 		CdapServiceInstance i = findInstance(instanceName);
 		o.updateInstanceConfiguration(instanceName);
 		DcaeCdapClusterManagerConsole console = consoleCluster(i);
-		for (CdapArtifact a : i.getArtifacts()) {
-			try {
-				console.stopApp(i.getCdapName(), a.getName());
-			} catch (Exception e) {
-				e.printStackTrace();
+		synchronized (i) {
+			for (CdapArtifact a : i.getArtifacts()) {
+				try {
+					console.stopApp(i.getCdapName(), a.getName());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
-		}
-		for (CdapApplication a : i.getApps()) {
-			try {
-				console.stopApp(i.getCdapName(), a.getName());
-			} catch (Exception e) {
-				e.printStackTrace();
+			for (CdapApplication a : i.getApps()) {
+				try {
+					console.stopApp(i.getCdapName(), a.getName());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
-		}
-		for (String f : i.getFlowNames()) {
-			String[] a = f.split("\\.");
-			if (a.length != 2)
-				throw new RuntimeException("Bad flow name: " + f);
-			try {
-				console.stopFlow(i.getCdapName(), a[0], a[1]);
-			} catch (Exception e) {
-				e.printStackTrace();
+			for (String f : i.getFlowNames()) {
+				String[] a = f.split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad flow name: " + f);
+				try {
+					console.stopFlow(i.getCdapName(), a[0], a[1]);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
-		}
-		for (String w : i.getWorkerNames()) {
-			String[] a = w.split("\\.");
-			if (a.length != 2)
-				throw new RuntimeException("Bad worker name: " + w);
-			try {
-				console.stopWorker(i.getCdapName(), a[0], a[1]);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+			for (String w : i.getWorkerNames()) {
+				String[] a = w.split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad worker name: " + w);
+				try {
+					console.stopWorker(i.getCdapName(), a[0], a[1]);
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 			}
-		}
-		for (String s : i.getServiceNames()) {
-			String[] a = s.split("\\.");
-			if (a.length != 2)
-				throw new RuntimeException("Bad service name: " + s);
-			try {
-				console.stopService(i.getCdapName(), a[0], a[1]);
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+			for (String s : i.getServiceNames()) {
+				String[] a = s.split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad service name: " + s);
+				try {
+					console.stopService(i.getCdapName(), a[0], a[1]);
+				} catch (Exception e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 			}
-		}
-
-		console.setPreferencesNameSpace(i.getCdapName(), list2string(i.getCdapConfiguration().getPreferences()));
-		for (CdapEntityWithPreferences w : i.getCdapConfiguration().getWorkers()) {
-			if (w.getPreferences().size() == 0)
-				continue;
-			String[] a = w.getName().split("\\.");if (a.length != 2)
-				throw new RuntimeException("Bad worker name: " + w.getName());
-			console.setPreferencesWorker(i.getCdapName(), list2string(w.getPreferences()),a[0],a[1]);
-		}
-		for (CdapEntityWithPreferences s : i.getCdapConfiguration().getServices()) {
-			if (s.getPreferences().size() == 0)
-				continue;
-			String[] a = s.getName().split("\\.");if (a.length != 2)
-				throw new RuntimeException("Bad service name: " + s.getName());
-			console.setPreferencesService(i.getCdapName(), list2string(s.getPreferences()),a[0],a[1]);
-		}
-		for (CdapEntityWithPreferences f : i.getCdapConfiguration().getFlows()) {
-			if (f.getPreferences().size() == 0)
-				continue;
-			String[] a = f.getName().split("\\.");if (a.length != 2)
-				throw new RuntimeException("Bad flow name: " + f.getName());
-			console.setPreferencesFlow(i.getCdapName(), list2string(f.getPreferences()), a[0],a[1]);
-		}
-		for (CdapEntityWithPreferences a : i.getCdapConfiguration().getApps()) {
-			if (a.getPreferences().size() == 0)
-				continue;
-			console.setPreferencesApp(i.getCdapName(), list2string(a.getPreferences()), a.getName());
-		}
-		// TODO what should we do. ??
-		for (String f : i.getFlowNames()) {
-			String[] a = f.split("\\.");
-			if (a.length != 2)
-				throw new RuntimeException("Bad flow name: " + f);
-			console.startFlow(i.getCdapName(), a[0], a[1], null);
-		}
-		for (String w : i.getWorkerNames()) {
-			String[] a = w.split("\\.");
-			if (a.length != 2)
-				throw new RuntimeException("Bad worker name: " + w);
-			console.startWorker(i.getCdapName(), a[0], a[1], null);
-		}
-		for (String s : i.getServiceNames()) {
-			String[] a = s.split("\\.");
-			if (a.length != 2)
-				throw new RuntimeException("Bad service name: " + s);
-			console.startService(i.getCdapName(), a[0], a[1], null);
-		}
-		for (CdapArtifact a : i.getArtifacts()) {
-			try {
-				console.startApp(i.getCdapName(), a.getName());
-			} catch (Exception e) {
-				e.printStackTrace();
+			doSteps(console, i, i.getPreConfigurationSteps());
+
+			console.setPreferencesNameSpace(i.getCdapName(), list2string(i.getCdapConfiguration().getPreferences()));
+			for (CdapEntityWithPreferences w : i.getCdapConfiguration().getWorkers()) {
+				if (w.getPreferences().size() == 0)
+					continue;
+				String[] a = w.getName().split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad worker name: " + w.getName());
+				console.setPreferencesWorker(i.getCdapName(), list2string(w.getPreferences()), a[0], a[1]);
 			}
-		}
-		for (CdapApplication a : i.getApps()) {
-			try {
-				console.startApp(i.getCdapName(), a.getName());
-			} catch (Exception e) {
-				e.printStackTrace();
+			for (CdapEntityWithPreferences s : i.getCdapConfiguration().getServices()) {
+				if (s.getPreferences().size() == 0)
+					continue;
+				String[] a = s.getName().split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad service name: " + s.getName());
+				console.setPreferencesService(i.getCdapName(), list2string(s.getPreferences()), a[0], a[1]);
+			}
+			for (CdapEntityWithPreferences f : i.getCdapConfiguration().getFlows()) {
+				if (f.getPreferences().size() == 0)
+					continue;
+				String[] a = f.getName().split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad flow name: " + f.getName());
+				console.setPreferencesFlow(i.getCdapName(), list2string(f.getPreferences()), a[0], a[1]);
+			}
+			for (CdapEntityWithPreferences a : i.getCdapConfiguration().getApps()) {
+				if (a.getPreferences().size() == 0)
+					continue;
+				console.setPreferencesApp(i.getCdapName(), list2string(a.getPreferences()), a.getName());
+			}
+			doSteps(console, i, i.getPostConfigurationSteps());
+			// TODO what should we do. ??
+			for (String f : i.getFlowNames()) {
+				String[] a = f.split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad flow name: " + f);
+				console.startFlow(i.getCdapName(), a[0], a[1], null);
+			}
+			for (String w : i.getWorkerNames()) {
+				String[] a = w.split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad worker name: " + w);
+				console.startWorker(i.getCdapName(), a[0], a[1], null);
+			}
+			for (String s : i.getServiceNames()) {
+				String[] a = s.split("\\.");
+				if (a.length != 2)
+					throw new RuntimeException("Bad service name: " + s);
+				console.startService(i.getCdapName(), a[0], a[1], null);
+			}
+			for (CdapArtifact a : i.getArtifacts()) {
+				try {
+					console.startApp(i.getCdapName(), a.getName());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+			for (CdapApplication a : i.getApps()) {
+				try {
+					console.startApp(i.getCdapName(), a.getName());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
 		}
-
 	}
 
 	public void pollManagerConfiguration(String instanceName) {
@@ -301,13 +393,13 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 	public HealthTestResponse test(String instanceName) {
 		CdapServiceInstance i = findInstance(instanceName);
 		HealthTestResponse res = ServiceFactory.eINSTANCE.createHealthTestResponse();
-		
+
 		// simple check. Verify that namespace exists in cluster.
-		
+
 		CdapClusterServiceInstance s = i.getClusterService();
 		if (s.getStatus() != DeploymentStatus.DEPLOYED) {
 			res.setStatus(HealthTestStatus.YELLOW);
-			res.setMessageCode("Cluster not deployed");	
+			res.setMessageCode("Cluster not deployed");
 			return res;
 		}
 		if (s.getCluster() == null) {
@@ -319,11 +411,11 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 			res.setStatus(HealthTestStatus.RED);
 			res.setMessageCode("No Namepace for instance");
 			return res;
-		}		
+		}
 		for (CdapNamespace n : s.getCluster().getNamespaces()) {
 			if (i.getNamespace().equals(n.getName())) {
 				res.setStatus(HealthTestStatus.GREEN);
-				return res;				
+				return res;
 			}
 		}
 		res.setStatus(HealthTestStatus.YELLOW);
@@ -379,7 +471,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 	}
 
 	private String cdapName(CdapServiceInstance i) {
-//		String n = "dcae:" + o.getName() + ":" + i.getName();
+		// String n = "dcae:" + o.getName() + ":" + i.getName();
 		// return n.replace("-", "X").replace(":", "Y");
 		return i.getNamespace();
 		// return "dcae"+ new Date().getTime();
@@ -390,8 +482,20 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 		// need to assign the leader
 		EList<DcaeBasicServer> l = instance.getServers();
 		instance.setLeaderServer(l.get(l.size() - 1));
-		DcaeCdapClusterService service = (DcaeCdapClusterService) instance.getService();
-		DcaeCdapClusterServiceProvider provider = service.getSomfProvider();
+		if (instance.getCdapServiceServers().size() == 0) {
+			// no configuration use last server per default
+			instance.getCdapServiceServers().add(instance.getLeaderServer().getName());
+		}
+		for (DcaeBasicServer s : l) {
+			if (!instance.getCdapServiceServers().contains(s.getName()))
+				continue;
+			if (s.getHealthTestStatus() != HealthTestStatus.GREEN)
+				continue;
+			instance.setLeaderServer(s);
+		}
+		VirtualMachineService service = instance.getService();
+		DcaeCdapClusterServiceProvider provider = (DcaeCdapClusterServiceProvider) ((ISiriusProvider) service)
+				.getSiriusProvider();
 		AbstractClient c = provider.getClient(instance);
 		return new DcaeCdapClusterManagerConsole(c);
 	}
@@ -408,18 +512,19 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 			// dmaap.XX.dmaapPassword
 			if (p.getName().startsWith("dmaap") && p.getName().endsWith("dmaapPassword")) {
 				String pw = p.getValue();
-				if (! pw.startsWith("rsa:")) {
-//					System.err.println("ZZZZZ: unencrypted pw: " + ManagementServer.object2ref(p));
+				if (!pw.startsWith("rsa:")) {
+					// System.err.println("ZZZZZ: unencrypted pw: " +
+					// ManagementServer.object2ref(p));
 				}
 				try {
 					pw = JavaHttpClient.decryptPassword(pw);
 				} catch (Exception e) {
-//					System.err.println("ZZZZZ: badly encrypted password: " + ManagementServer.object2ref(p));
+					// System.err.println("ZZZZZ: badly encrypted password: " +
+					// ManagementServer.object2ref(p));
 					pw = "badly encrypted password";
 				}
 				buf.append(p.getName()).append("=").append(pw);
-			}
-			else {
+			} else {
 				String v = p.getValue();
 				if (v.startsWith("rsa:")) {
 					try {
@@ -443,7 +548,8 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 		throw new RuntimeException("Unable to find instance: " + instanceName);
 	}
 
-	private void updateConfigSimple(EObject root, EObject i, String destination, CdapInternalApplicationConfiguration a) {
+	private void updateConfigSimple(EObject root, EObject i, String destination,
+			CdapInternalApplicationConfiguration a) {
 		if (i == null)
 			return;
 		for (EAttribute attr : i.eClass().getEAllAttributes()) {
@@ -459,7 +565,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 			if (anno == null)
 				continue;
 			String destination = anno.getDetails().get("destination");
-//			System.err.println("AAAAA" + attr.getName() + " " + destination);
+			// System.err.println("AAAAA" + attr.getName() + " " + destination);
 			add(root, i, attr, destination, appConfig);
 		}
 		for (EReference ref : i.eClass().getEAllContainments()) {
@@ -473,10 +579,12 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 				updateConfig(root, (EObject) i.eGet(ref), appConfig);
 			}
 		}
-//		System.err.println(ManagementServer.ecore2json(appConfig, 1000, null, true).toString(2));
+		// System.err.println(ManagementServer.ecore2json(appConfig, 1000, null,
+		// true).toString(2));
 	}
 
-	private void add(EObject root, EObject i, EAttribute attr, String destination, CdapInternalApplicationConfiguration appConfig) {
+	private void add(EObject root, EObject i, EAttribute attr, String destination,
+			CdapInternalApplicationConfiguration appConfig) {
 		// Make this more complex later
 		if (i instanceof NamedEntity) {
 			NamedEntity n = (NamedEntity) i;
@@ -487,7 +595,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 		String path1 = ManagementServer.object2ref(root);
 		String path2 = ManagementServer.object2ref(i);
 		String path = path2.replace("/", ".").substring(path1.length() + 1);
-		destination = destination.replace("${path}", path );
+		destination = destination.replace("${path}", path);
 		String[] a = destination.split(":");
 		if (a.length != 3) {
 			throw new RuntimeException("Bad CDAP destination annotation: " + destination);
@@ -511,7 +619,8 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 
 	private org.openecomp.ncomp.cdap.CdapFactory f = org.openecomp.ncomp.cdap.CdapFactory.eINSTANCE;
 
-	private void add(EObject root, EList<CdapEntityWithPreferences> l, String name, String cdapKey, EObject i, EAttribute attr) {
+	private void add(EObject root, EList<CdapEntityWithPreferences> l, String name, String cdapKey, EObject i,
+			EAttribute attr) {
 		CdapEntityWithPreferences p = null;
 		for (CdapEntityWithPreferences p1 : l) {
 			if (p1.getName().equals(name)) {
@@ -524,7 +633,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 			l.add(p);
 			p.setName(name);
 		}
-		add(root,p.getPreferences(), cdapKey, i, attr);
+		add(root, p.getPreferences(), cdapKey, i, attr);
 	}
 
 	private void add(EObject root, EList<CdapKeyPair> prefs, String cdapKey, EObject i, EAttribute attr) {
@@ -537,15 +646,14 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 				l2.add((String) ManagementServer.attr2jsonValue(0, o, attr.getEType()));
 			}
 			value = StringUtil.join(l2, ":");
-		}
-		else 
+		} else
 			value = (String) ManagementServer.attr2jsonValue(0, i.eGet(attr), attr.getEType());
 		CdapKeyPair pair = f.createCdapKeyPair();
 		pair.setName(cdapKey);
 		pair.setValue(value);
 		prefs.add(pair);
 	}
-	
+
 	public void start() {
 
 		Thread t = new Thread("cdap service: " + o.getName()) {
@@ -559,7 +667,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 						Thread.sleep(60000); // sleep 60 seconds
 					} catch (Exception e) {
 						ManagementServerUtils.printStackTrace(e);
-						logger.fatal("vm service: " + o.getName() + " : " + e);
+						logger.fatal("cdap service: " + o.getName() + " : " + e);
 						try {
 							Thread.sleep(30000);
 						} catch (InterruptedException e1) {
@@ -573,15 +681,15 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 	}
 
 	public void updateDeploymentStatus() {
-//		System.out.println("CDAP updateDeploymentStatus 1: ");
+		System.out.println("CDAP updateDeploymentStatus 1: ");
 		for (CdapServiceInstance instance : o.getInstances()) {
 			// TODO Docker deployment status
 			instance.setStatus(DeploymentStatus.UNDEPLOYED);
-//			System.out.println("CDAP updateDeploymentStatus 2: " + instance.getName() + " " + instance.getNamespace());
+			System.out.println("CDAP updateDeploymentStatus 2: " + instance.getName() + " " + instance.getNamespace());
 			if (instance.getClusterService() == null)
 				continue;
 			for (CdapNamespace c : instance.getClusterService().getCluster().getNamespaces()) {
-//				System.out.println("CDAP updateDeploymentStatus 4: " + c.getName());
+				System.out.println("CDAP updateDeploymentStatus 4: " + c.getName());
 				if (instance.getNamespace() != null && instance.getNamespace().equals(c.getName())) {
 					instance.setStatus(DeploymentStatus.DEPLOYED);
 				}
@@ -589,5 +697,4 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider {
 		}
 	}
 
-
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapManager.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapManager.yaml
index 6ab6771..6c497b2 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapManager.yaml
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapManager.yaml
@@ -1,69 +1,57 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
+  CdapManager@test: {}
+  CdapManager@suspend: {}
+  CdapManager@resume: {}
+  CdapManager@publicKey: {}
+  CdapManager@configurationChanged: {}
+  CdapManager@updateStreams: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapService.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapService.yaml
index 1bb496e..9f76512 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapService.yaml
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapService.yaml
@@ -1,135 +1,111 @@
 operations:
-  deploy: {}
-  undeploy: {}
-  test: {}
-  suspend: {}
-  resume: {}
-  pushManagerConfiguration: {}
-  pollManagerConfiguration: {}
-  managerConfiguration: {}
-  managerOperation: {}
-  updateConfigurationFromPolicy: {}
-  runHealthTests: {}
-  updateInstanceConfiguration: {}
-  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_updateInstanceConfiguration:
-    decription: Remote call updateInstanceConfiguration
+  CdapService@deploy: {}
+  CdapService@undeploy: {}
+  CdapService@test: {}
+  CdapService@suspend: {}
+  CdapService@resume: {}
+  CdapService@pushManagerConfiguration: {}
+  CdapService@pollManagerConfiguration: {}
+  CdapService@managerConfiguration: {}
+  CdapService@managerOperation: {}
+  CdapService@updateConfigurationFromPolicy: {}
+  CdapService@runHealthTests: {}
+  CdapService@updateInstanceConfiguration: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateInstanceConfiguration:
-    errorCode: updateInstanceConfiguration-FAILED-5001W
+  REQUEST-FAILED-updateInstanceConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateInstanceConfiguration:
-    errorCode: REMOTE-updateInstanceConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-updateInstanceConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapService.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapService.java
index 9d71a7e..b15216f 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapService.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapService.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.servers.cdap;
 
 
 
+
 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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -54,9 +61,9 @@ import org.openecomp.dcae.controller.service.cdap.impl.CdapServiceImpl;
 
 
 
-public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
+public class DcaeCdapService extends CdapServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeCdapService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeCdapServiceProvider controller;
 	ISiriusServer server;
 
@@ -71,9 +78,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateInstanceConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.updateInstanceConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_updateInstanceConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_updateInstanceConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateInstanceConfiguration(instanceName);
 		}
@@ -82,8 +88,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateInstanceConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.updateInstanceConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_updateInstanceConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_updateInstanceConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_updateInstanceConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -98,9 +106,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.deploy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -109,8 +116,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.deploy, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -125,9 +134,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.undeploy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -136,8 +144,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.undeploy, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -152,9 +162,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.test);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_test,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -163,8 +172,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.test, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -179,9 +190,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.suspend);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -190,8 +200,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.suspend, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -206,9 +218,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.resume);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_resume,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -217,8 +228,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.resume, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -233,9 +246,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.pushManagerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -244,8 +256,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.pushManagerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -260,9 +274,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.pollManagerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -271,8 +284,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.pollManagerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -287,9 +302,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.managerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -298,8 +312,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.managerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -314,9 +330,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.managerOperation);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -325,8 +340,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.managerOperation, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -341,9 +358,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.updateConfigurationFromPolicy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -352,8 +368,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.updateConfigurationFromPolicy, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -368,9 +386,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.runHealthTests);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -379,8 +396,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapServiceMessageEnum.runHealthTests, e.toString());
-			throw e;
+			ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -394,6 +413,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -402,7 +423,7 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin {
 	public static void ecoreSetup() {
 		DcaeCdapServiceProvider.ecoreSetup();
 	}
-	public DcaeCdapServiceProvider getSomfProvider() {
+	public DcaeCdapServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceClient.java
index 01afc0f..d3dae82 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceClient.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 		DcaeCdapService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeCdapServiceClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeCdapServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void updateInstanceConfiguration(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_updateInstanceConfiguration);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_updateInstanceConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateInstanceConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_updateInstanceConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateInstanceConfiguration: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateInstanceConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateInstanceConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateInstanceConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_deploy);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@deploy: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_undeploy);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeploy: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_test);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_suspend);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_resume);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pushManagerConfiguration: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pollManagerConfiguration: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -207,16 +220,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerConfiguration: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerOperation: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -241,16 +256,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateConfigurationFromPolicy: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -258,16 +274,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl {
 
 	@Override
 	public void runHealthTests() {
-		EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = CdapPackage.eINSTANCE.getCdapService(); 
+		ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@runHealthTests: " + e);
+			ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceServer.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceServer.java
index 78b58cd..6bfad39 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceServer.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.servers.cdap;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.cdap.CdapService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.cdap.CdapService;
 
 
 
-public class DcaeCdapServiceServer implements ISiriusServer {
+public class DcaeCdapServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeCdapServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeCdapServiceServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "CdapService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
         server.addRuntimeFactories(this);
@@ -73,6 +73,7 @@ public class DcaeCdapServiceServer implements ISiriusServer {
         controller = (DcaeCdapService) server.find("/").o;
         webServer = new Jetty8Server("cdap.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -95,4 +96,17 @@ public class DcaeCdapServiceServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService.properties
index 364ae3b..1579cf5 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService.properties
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService.properties
@@ -1,150 +1,150 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateInstanceConfiguration=\
-  updateInstanceConfiguration-FAILED-5001W|\
+REQUEST_FAILED_updateInstanceConfiguration=\
+  REQUEST-FAILED-updateInstanceConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateInstanceConfiguration=\
-  REMOTE-updateInstanceConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateInstanceConfiguration=\
+  REMOTE-CALL-FAILED-updateInstanceConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceMessageEnum.java
index 15e7393..50fada2 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceMessageEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.cdap.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,32 +7,32 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum CdapServiceMessageEnum implements EcompMessageEnum {
 
   dummy,
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  updateInstanceConfiguration,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests,
-  REMOTE_updateInstanceConfiguration;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REQUEST_FAILED_updateInstanceConfiguration,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_updateInstanceConfiguration;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.cdap.logging.CdapService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService");
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceOperationEnum.java
index d67c6be..3da3fd7 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceOperationEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceOperationEnum.java
@@ -1,53 +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.service.servers.cdap.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum CdapServiceOperationEnum implements EcompOperationEnum {
 
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  updateInstanceConfiguration,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests,
-  REMOTE_updateInstanceConfiguration;
+  CdapService_deploy("CdapService@deploy"),
+  CdapService_undeploy("CdapService@undeploy"),
+  CdapService_test("CdapService@test"),
+  CdapService_suspend("CdapService@suspend"),
+  CdapService_resume("CdapService@resume"),
+  CdapService_pushManagerConfiguration("CdapService@pushManagerConfiguration"),
+  CdapService_pollManagerConfiguration("CdapService@pollManagerConfiguration"),
+  CdapService_managerConfiguration("CdapService@managerConfiguration"),
+  CdapService_managerOperation("CdapService@managerOperation"),
+  CdapService_updateConfigurationFromPolicy("CdapService@updateConfigurationFromPolicy"),
+  CdapService_runHealthTests("CdapService@runHealthTests"),
+  CdapService_updateInstanceConfiguration("CdapService@updateInstanceConfiguration") ; 
+
+
+	private String n;
+	
+	private CdapServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManager.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManager.java
index dcddd85..0e8ef8c 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManager.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManager.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.servers.cdapmanager;
 
 
 
+
 import java.io.InputStream;
 
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -54,9 +61,9 @@ import org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl;
 
 
 
-public class DcaeCdapManager extends CdapManagerImpl {
+public class DcaeCdapManager extends CdapManagerImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeCdapManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeCdapManagerProvider controller;
 	ISiriusServer server;
 
@@ -71,9 +78,8 @@ public class DcaeCdapManager extends CdapManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.test);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_test,server,this);
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -82,8 +88,10 @@ public class DcaeCdapManager extends CdapManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapManagerMessageEnum.test, e.toString());
-			throw e;
+			ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -98,9 +106,8 @@ public class DcaeCdapManager extends CdapManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.suspend);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -109,8 +116,10 @@ public class DcaeCdapManager extends CdapManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapManagerMessageEnum.suspend, e.toString());
-			throw e;
+			ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -125,9 +134,8 @@ public class DcaeCdapManager extends CdapManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.resume);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -136,8 +144,10 @@ public class DcaeCdapManager extends CdapManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapManagerMessageEnum.resume, e.toString());
-			throw e;
+			ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -152,9 +162,8 @@ public class DcaeCdapManager extends CdapManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.publicKey);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -163,8 +172,10 @@ public class DcaeCdapManager extends CdapManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapManagerMessageEnum.publicKey, e.toString());
-			throw e;
+			ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -179,9 +190,8 @@ public class DcaeCdapManager extends CdapManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.configurationChanged);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -190,8 +200,10 @@ public class DcaeCdapManager extends CdapManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapManagerMessageEnum.configurationChanged, e.toString());
-			throw e;
+			ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -206,9 +218,8 @@ public class DcaeCdapManager extends CdapManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.updateStreams);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -217,8 +228,10 @@ public class DcaeCdapManager extends CdapManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CdapManagerMessageEnum.updateStreams, e.toString());
-			throw e;
+			ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -232,10 +245,12 @@ public class DcaeCdapManager extends CdapManagerImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeCdapManagerProvider.ecoreSetup();
 	}
-	public DcaeCdapManagerProvider getSomfProvider() {
+	public DcaeCdapManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerClient.java
index 7c43951..24b147a 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerClient.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeCdapManagerClient extends CdapManagerImpl {
 		DcaeCdapManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeCdapManagerClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeCdapManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_test);
+		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); 
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -88,16 +94,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl {
 
 	@Override
 	public void suspend() {
-		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_suspend);
+		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); 
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl {
 
 	@Override
 	public void resume() {
-		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_resume);
+		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); 
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl {
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_publicKey);
+		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); 
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@publicKey: " + e);
+			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl {
 
 	@Override
 	public void configurationChanged() {
-		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); 
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@configurationChanged: " + e);
+			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl {
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); 
+		ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateStreams: " + e);
+			ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerServer.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerServer.java
index cbe7dc6..710ea86 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerServer.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.servers.cdapmanager;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.cdapmanager.CdapManager;
@@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.servers.cdapmanager.gui.DcaeModelFa
 
 
 
-public class DcaeCdapManagerServer implements ISiriusServer {
+public class DcaeCdapManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeCdapManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -69,6 +68,7 @@ public class DcaeCdapManagerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "CdapManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
     
 		server.addFactory(new org.openecomp.ncomp.servers.cdap.CdapCdapFactory(this));
@@ -84,6 +84,7 @@ public class DcaeCdapManagerServer implements ISiriusServer {
         controller = (DcaeCdapManager) server.find("/").o;
         webServer = new Jetty8Server("cdapmanager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -112,4 +113,17 @@ public class DcaeCdapManagerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApi.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApi.java
index fc913e9..6ce4d7c 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApi.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApi.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.servers.cdapmanager.gui;
 
 
 
+
 import java.io.InputStream;
 
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -84,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -101,9 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -112,8 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -128,9 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -139,8 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -155,9 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -166,8 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -182,9 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -193,8 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -209,9 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -220,8 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -236,9 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -247,8 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -262,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiClient.java
index 3ced93a..fa02d0a 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiClient.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeCdapManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi.properties
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiMessageEnum.java
index bf9107c..33c5e79 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiMessageEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.cdapmanager.gui.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.cdapmanager.gui.logging.GuiClientApi");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi");
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiOperationEnum.java
index ecfbf9e..256ed6b 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiOperationEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.cdapmanager.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;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager.properties
index ef19f9b..4580ed4 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager.properties
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerMessageEnum.java
index bfc7789..6747f76 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerMessageEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.cdapmanager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum CdapManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.cdapmanager.logging.CdapManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager");
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerOperationEnum.java
index 4a0f398..e6667ec 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerOperationEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.cdapmanager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum CdapManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams;
+  CdapManager_test("CdapManager@test"),
+  CdapManager_suspend("CdapManager@suspend"),
+  CdapManager_resume("CdapManager@resume"),
+  CdapManager_publicKey("CdapManager@publicKey"),
+  CdapManager_configurationChanged("CdapManager@configurationChanged"),
+  CdapManager_updateStreams("CdapManager@updateStreams") ; 
+
+
+	private String n;
+	
+	private CdapManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/.classpath b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/.classpath
index d2d34b3..89273c0 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/.classpath
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/.classpath
@@ -21,7 +21,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/META-INF/MANIFEST.MF b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/META-INF/MANIFEST.MF
index 251ccda..42ad765 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/META-INF/MANIFEST.MF
@@ -6,12 +6,4 @@ Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.cdap.cluster.manager.tools,
  org.openecomp.dcae.controller.service.cdap.cluster.servers.manager,
  org.openecomp.dcae.controller.service.cdap.cluster.servers.service
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-cdap-cluster-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-cdap-adaptor;bundle-version="0.1.0",
- dcae-controller-core-model
+
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/assembly/assemble_zip.xml b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/assembly/assemble_zip.xml
index d8b59e8..94b2b86 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/assembly/assemble_zip.xml
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/assembly/assemble_zip.xml
@@ -38,6 +38,7 @@
 			<directory>src/main/server-gen/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
@@ -45,16 +46,19 @@
 			<directory>src/main/server/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server-gen/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 	</fileSets>
 
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/manager/tools/Generator.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/manager/tools/Generator.java
index ec75e64..cffb304 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/manager/tools/Generator.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/manager/tools/Generator.java
@@ -53,12 +53,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCdapClusterManager");

 		m.setTitle("ControllerServiceCdapClusterManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(false);

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

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

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCdapClusterService");

 		m.setTitle("ControllerServiceCdapClusterService");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(true);

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

diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java
index aad5563..772cf46 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/java/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProvider.java
@@ -25,6 +25,7 @@ import org.openecomp.ncomp.cdap.CdapCluster;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
+import org.openecomp.ncomp.utils.ShellCmd;
 import org.openecomp.dcae.controller.core.service.HealthTestResponse;
 import org.openecomp.dcae.controller.core.service.HealthTestStatus;
 import org.openecomp.dcae.controller.core.service.ServiceFactory;
@@ -39,23 +40,46 @@ public class DcaeCdapClusterManagerProvider extends DcaeVirtualMachineManagerPro
 		super(controller, o);
 		this.o = o;
 	}
+
+	private CdapCluster getCluster() {
+		if (o.getCluster() == null) {
+			logger.warn("Unable to find cluster");
+			throw new RuntimeException("Unable to find cluster");
+		}
+		return o.getCluster();
+	}
+	
 	@Override
 	public HealthTestResponse test() {
+		String s = run(o.getHealthCheckScript(), o.getTestTimeout());
+		String a[] = s.split(":");
+		int index = s.indexOf(":");
+		String msg = index < 0 ? null : s.substring(index);
 		HealthTestResponse res = ServiceFactory.eINSTANCE.createHealthTestResponse();
-		res.setStatus(HealthTestStatus.GREEN);
-		if (o.getCluster() == null || o.getCluster().getConfigurations().size() == 0) {
-			res.setMessageCode("CDAP not working");
+		if ("GREEN".equalsIgnoreCase(a[0])) {
+			res.setStatus(HealthTestStatus.GREEN);
+			res.setMessageCode(msg);
+		} else if ("YELLOW".equalsIgnoreCase(a[0])) {
+			res.setStatus(HealthTestStatus.YELLOW);
+			res.setMessageCode(msg);
+		} else if ("RED".equalsIgnoreCase(a[0])) {
 			res.setStatus(HealthTestStatus.RED);
+			res.setMessageCode(msg);
+		} else {
+			res.setStatus(HealthTestStatus.RED);
+			res.setMessageCode("Bad return string: " + s);
 		}
 		return res;
 	}
-
-	private CdapCluster getCluster() {
-		if (o.getCluster() == null) {
-			logger.warn("Unable to find cluster");
-			throw new RuntimeException("Unable to find cluster");
+	
+	private String run(String cmd, long wait) {
+		try {
+			ShellCmd worker = new ShellCmd(cmd);
+			return worker.result(wait);
+		} catch (Exception e) {
+			logger.warn("Unable to run cmd: " + cmd + " " + e);
+			return "RED:Unable to run cmd: " + cmd + " " + e;
 		}
-		return o.getCluster();
 	}
 
 	public String loadArtifact(String namespace, String artifactName, String jarfile, String version) {
@@ -216,4 +240,17 @@ public class DcaeCdapClusterManagerProvider extends DcaeVirtualMachineManagerPro
 		return getCluster().setPreferencesService(namespace, prefsString, appId, serviceId);
 	}
 
+	public String resumeSchedule(String namespace, String appId, String scheduleId) {
+		return getCluster().resumeSchedule(namespace, appId, scheduleId);
+	}
+
+	public String suspendSchedule(String namespace, String appId, String scheduleId) {
+		return getCluster().suspendSchedule(namespace, appId, scheduleId);
+	}
+
+	public String loadArtifactWithConfig(String namespace, String artifactName, String jarfile, String version,
+			String config) {
+		return getCluster().loadArtifactWithConfig(namespace, artifactName, jarfile, version, config);
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server-gen/bin/controller-service-cdap-cluster-manager-controller b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server-gen/bin/controller-service-cdap-cluster-manager-controller
index 2b9a3f3..da0de38 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server-gen/bin/controller-service-cdap-cluster-manager-controller
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server-gen/bin/controller-service-cdap-cluster-manager-controller
@@ -93,7 +93,7 @@ case $CMD in
     if [ -e $_DIR/logs/$PNAME.out ]; then mv $_DIR/logs/$PNAME.out $_DIR/logs/$PNAME.out.1; fi
     if [ -e $_DIR/logs/$PNAME.err ]; then mv $_DIR/logs/$PNAME.err $_DIR/logs/$PNAME.err.1; fi
 
-    nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS > $_DIR/logs/$PNAME.out 2> $_DIR/logs/$PNAME.err  &
+    nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS >> $_DIR/logs/$PNAME.out 2>> $_DIR/logs/$PNAME.err  &
 
     _PID=$!
     echo $_PID > $_PIDFILE
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/healthCheck.sh b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/healthCheck.sh
new file mode 100644
index 0000000..137360f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/server/bin/healthCheck.sh
@@ -0,0 +1,10 @@
+#/bin/bash
+
+case $(/opt/cdap/cli/bin/cdap-cli.sh -u localhost list namespaces | head -1) in
+  Successfully*) 
+    echo GREEN 
+    ;;
+  *) 
+    echo "RED:CDAP service down" 
+    ;;
+esac
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/CdapClusterManager.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/CdapClusterManager.yaml
index 2bfc668..552a80c 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/CdapClusterManager.yaml
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/CdapClusterManager.yaml
@@ -1,597 +1,516 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  logs: {}
-  metrics: {}
-  properties: {}
-  uploadInfo: {}
-  getValues: {}
-  getValuesAll: {}
-  getMessages: {}
-  getRequestLogger: {}
-  evaluate: {}
-  update: {}
-  createNamespace: {}
-  deleteNamespace: {}
-  deployApp: {}
-  loadArtifact: {}
-  deleteArtifact: {}
-  startFlow: {}
-  startWorker: {}
-  startService: {}
-  startApp: {}
-  stopApp: {}
-  deleteApp: {}
-  loadPreferencesApp: {}
-  loadPreferencesFlow: {}
-  loadPreferencesNameSpace: {}
-  setPreferencesApp: {}
-  setPreferencesFlow: {}
-  setPreferencesWorker: {}
-  setPreferencesService: {}
-  setPreferencesNameSpace: {}
-  setFlowRunTimeArgs: {}
-  setFlowletInstances: {}
-  stopFlow: {}
-  stopWorker: {}
-  stopService: {}
-  truncateDataSet: {}
-  deleteDataset: {}
-  createStream: {}
-  deleteStream: {}
-  getStreamEvents: {}
-  getStreamStats: {}
-  sendEventToStream: {}
-  trucateStream: {}
-  setStreamProperties: {}
-  restartApp: {}
-  createApp: {}
-  createAppWithConfig: {}
-  setDatasetProperties: {}
-  setStreamTTL: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
-  REMOTE_logs:
-    decription: Remote call logs
-  REMOTE_metrics:
-    decription: Remote call metrics
-  REMOTE_properties:
-    decription: Remote call properties
-  REMOTE_uploadInfo:
-    decription: Remote call uploadInfo
-  REMOTE_getValues:
-    decription: Remote call getValues
-  REMOTE_getValuesAll:
-    decription: Remote call getValuesAll
-  REMOTE_getMessages:
-    decription: Remote call getMessages
-  REMOTE_getRequestLogger:
-    decription: Remote call getRequestLogger
-  REMOTE_evaluate:
-    decription: Remote call evaluate
-  REMOTE_update:
-    decription: Remote call update
-  REMOTE_createNamespace:
-    decription: Remote call createNamespace
-  REMOTE_deleteNamespace:
-    decription: Remote call deleteNamespace
-  REMOTE_deployApp:
-    decription: Remote call deployApp
-  REMOTE_loadArtifact:
-    decription: Remote call loadArtifact
-  REMOTE_deleteArtifact:
-    decription: Remote call deleteArtifact
-  REMOTE_startFlow:
-    decription: Remote call startFlow
-  REMOTE_startWorker:
-    decription: Remote call startWorker
-  REMOTE_startService:
-    decription: Remote call startService
-  REMOTE_startApp:
-    decription: Remote call startApp
-  REMOTE_stopApp:
-    decription: Remote call stopApp
-  REMOTE_deleteApp:
-    decription: Remote call deleteApp
-  REMOTE_loadPreferencesApp:
-    decription: Remote call loadPreferencesApp
-  REMOTE_loadPreferencesFlow:
-    decription: Remote call loadPreferencesFlow
-  REMOTE_loadPreferencesNameSpace:
-    decription: Remote call loadPreferencesNameSpace
-  REMOTE_setPreferencesApp:
-    decription: Remote call setPreferencesApp
-  REMOTE_setPreferencesFlow:
-    decription: Remote call setPreferencesFlow
-  REMOTE_setPreferencesWorker:
-    decription: Remote call setPreferencesWorker
-  REMOTE_setPreferencesService:
-    decription: Remote call setPreferencesService
-  REMOTE_setPreferencesNameSpace:
-    decription: Remote call setPreferencesNameSpace
-  REMOTE_setFlowRunTimeArgs:
-    decription: Remote call setFlowRunTimeArgs
-  REMOTE_setFlowletInstances:
-    decription: Remote call setFlowletInstances
-  REMOTE_stopFlow:
-    decription: Remote call stopFlow
-  REMOTE_stopWorker:
-    decription: Remote call stopWorker
-  REMOTE_stopService:
-    decription: Remote call stopService
-  REMOTE_truncateDataSet:
-    decription: Remote call truncateDataSet
-  REMOTE_deleteDataset:
-    decription: Remote call deleteDataset
-  REMOTE_createStream:
-    decription: Remote call createStream
-  REMOTE_deleteStream:
-    decription: Remote call deleteStream
-  REMOTE_getStreamEvents:
-    decription: Remote call getStreamEvents
-  REMOTE_getStreamStats:
-    decription: Remote call getStreamStats
-  REMOTE_sendEventToStream:
-    decription: Remote call sendEventToStream
-  REMOTE_trucateStream:
-    decription: Remote call trucateStream
-  REMOTE_setStreamProperties:
-    decription: Remote call setStreamProperties
-  REMOTE_restartApp:
-    decription: Remote call restartApp
-  REMOTE_createApp:
-    decription: Remote call createApp
-  REMOTE_createAppWithConfig:
-    decription: Remote call createAppWithConfig
-  REMOTE_setDatasetProperties:
-    decription: Remote call setDatasetProperties
-  REMOTE_setStreamTTL:
-    decription: Remote call setStreamTTL
+  CdapClusterManager@test: {}
+  CdapClusterManager@suspend: {}
+  CdapClusterManager@resume: {}
+  CdapClusterManager@publicKey: {}
+  CdapClusterManager@configurationChanged: {}
+  CdapClusterManager@updateStreams: {}
+  CdapClusterManager@logs: {}
+  CdapClusterManager@metrics: {}
+  CdapClusterManager@properties: {}
+  CdapClusterManager@uploadInfo: {}
+  CdapClusterManager@getValues: {}
+  CdapClusterManager@getValuesAll: {}
+  CdapClusterManager@getMessages: {}
+  CdapClusterManager@getRequestLogger: {}
+  CdapClusterManager@evaluate: {}
+  CdapClusterManager@update: {}
+  CdapClusterManager@createNamespace: {}
+  CdapClusterManager@deleteNamespace: {}
+  CdapClusterManager@deployApp: {}
+  CdapClusterManager@loadArtifact: {}
+  CdapClusterManager@loadArtifactWithConfig: {}
+  CdapClusterManager@deleteArtifact: {}
+  CdapClusterManager@startFlow: {}
+  CdapClusterManager@startWorker: {}
+  CdapClusterManager@startService: {}
+  CdapClusterManager@startApp: {}
+  CdapClusterManager@stopApp: {}
+  CdapClusterManager@deleteApp: {}
+  CdapClusterManager@loadPreferencesApp: {}
+  CdapClusterManager@loadPreferencesFlow: {}
+  CdapClusterManager@loadPreferencesNameSpace: {}
+  CdapClusterManager@setPreferencesApp: {}
+  CdapClusterManager@setPreferencesFlow: {}
+  CdapClusterManager@setPreferencesWorker: {}
+  CdapClusterManager@setPreferencesService: {}
+  CdapClusterManager@setPreferencesNameSpace: {}
+  CdapClusterManager@setFlowRunTimeArgs: {}
+  CdapClusterManager@setFlowletInstances: {}
+  CdapClusterManager@stopFlow: {}
+  CdapClusterManager@stopWorker: {}
+  CdapClusterManager@stopService: {}
+  CdapClusterManager@truncateDataSet: {}
+  CdapClusterManager@deleteDataset: {}
+  CdapClusterManager@createStream: {}
+  CdapClusterManager@deleteStream: {}
+  CdapClusterManager@getStreamEvents: {}
+  CdapClusterManager@getStreamStats: {}
+  CdapClusterManager@sendEventToStream: {}
+  CdapClusterManager@trucateStream: {}
+  CdapClusterManager@setStreamProperties: {}
+  CdapClusterManager@restartApp: {}
+  CdapClusterManager@createApp: {}
+  CdapClusterManager@createAppWithConfig: {}
+  CdapClusterManager@setDatasetProperties: {}
+  CdapClusterManager@setStreamTTL: {}
+  CdapClusterManager@suspendSchedule: {}
+  CdapClusterManager@resumeSchedule: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  logs:
-    errorCode: logs-FAILED-5001W
+  REQUEST-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  metrics:
-    errorCode: metrics-FAILED-5001W
+  REQUEST-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  properties:
-    errorCode: properties-FAILED-5001W
+  REQUEST-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  uploadInfo:
-    errorCode: uploadInfo-FAILED-5001W
+  REQUEST-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValues:
-    errorCode: getValues-FAILED-5001W
+  REQUEST-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValuesAll:
-    errorCode: getValuesAll-FAILED-5001W
+  REQUEST-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getMessages:
-    errorCode: getMessages-FAILED-5001W
+  REQUEST-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getRequestLogger:
-    errorCode: getRequestLogger-FAILED-5001W
+  REQUEST-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  evaluate:
-    errorCode: evaluate-FAILED-5001W
+  REQUEST-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  update:
-    errorCode: update-FAILED-5001W
+  REQUEST-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  createNamespace:
-    errorCode: createNamespace-FAILED-5001W
+  REQUEST-FAILED-createNamespace:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  deleteNamespace:
-    errorCode: deleteNamespace-FAILED-5001W
+  REQUEST-FAILED-deleteNamespace:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  deployApp:
-    errorCode: deployApp-FAILED-5001W
+  REQUEST-FAILED-deployApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  loadArtifact:
-    errorCode: loadArtifact-FAILED-5001W
+  REQUEST-FAILED-loadArtifact:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  deleteArtifact:
-    errorCode: deleteArtifact-FAILED-5001W
+  REQUEST-FAILED-loadArtifactWithConfig:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  startFlow:
-    errorCode: startFlow-FAILED-5001W
+  REQUEST-FAILED-deleteArtifact:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  startWorker:
-    errorCode: startWorker-FAILED-5001W
+  REQUEST-FAILED-startFlow:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  startService:
-    errorCode: startService-FAILED-5001W
+  REQUEST-FAILED-startWorker:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  startApp:
-    errorCode: startApp-FAILED-5001W
+  REQUEST-FAILED-startService:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  stopApp:
-    errorCode: stopApp-FAILED-5001W
+  REQUEST-FAILED-startApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  deleteApp:
-    errorCode: deleteApp-FAILED-5001W
+  REQUEST-FAILED-stopApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  loadPreferencesApp:
-    errorCode: loadPreferencesApp-FAILED-5001W
+  REQUEST-FAILED-deleteApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  loadPreferencesFlow:
-    errorCode: loadPreferencesFlow-FAILED-5001W
+  REQUEST-FAILED-loadPreferencesApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  loadPreferencesNameSpace:
-    errorCode: loadPreferencesNameSpace-FAILED-5001W
+  REQUEST-FAILED-loadPreferencesFlow:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setPreferencesApp:
-    errorCode: setPreferencesApp-FAILED-5001W
+  REQUEST-FAILED-loadPreferencesNameSpace:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setPreferencesFlow:
-    errorCode: setPreferencesFlow-FAILED-5001W
+  REQUEST-FAILED-setPreferencesApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setPreferencesWorker:
-    errorCode: setPreferencesWorker-FAILED-5001W
+  REQUEST-FAILED-setPreferencesFlow:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setPreferencesService:
-    errorCode: setPreferencesService-FAILED-5001W
+  REQUEST-FAILED-setPreferencesWorker:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setPreferencesNameSpace:
-    errorCode: setPreferencesNameSpace-FAILED-5001W
+  REQUEST-FAILED-setPreferencesService:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setFlowRunTimeArgs:
-    errorCode: setFlowRunTimeArgs-FAILED-5001W
+  REQUEST-FAILED-setPreferencesNameSpace:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setFlowletInstances:
-    errorCode: setFlowletInstances-FAILED-5001W
+  REQUEST-FAILED-setFlowRunTimeArgs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  stopFlow:
-    errorCode: stopFlow-FAILED-5001W
+  REQUEST-FAILED-setFlowletInstances:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  stopWorker:
-    errorCode: stopWorker-FAILED-5001W
+  REQUEST-FAILED-stopFlow:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  stopService:
-    errorCode: stopService-FAILED-5001W
+  REQUEST-FAILED-stopWorker:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  truncateDataSet:
-    errorCode: truncateDataSet-FAILED-5001W
+  REQUEST-FAILED-stopService:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  deleteDataset:
-    errorCode: deleteDataset-FAILED-5001W
+  REQUEST-FAILED-truncateDataSet:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  createStream:
-    errorCode: createStream-FAILED-5001W
+  REQUEST-FAILED-deleteDataset:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  deleteStream:
-    errorCode: deleteStream-FAILED-5001W
+  REQUEST-FAILED-createStream:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getStreamEvents:
-    errorCode: getStreamEvents-FAILED-5001W
+  REQUEST-FAILED-deleteStream:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getStreamStats:
-    errorCode: getStreamStats-FAILED-5001W
+  REQUEST-FAILED-getStreamEvents:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  sendEventToStream:
-    errorCode: sendEventToStream-FAILED-5001W
+  REQUEST-FAILED-getStreamStats:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  trucateStream:
-    errorCode: trucateStream-FAILED-5001W
+  REQUEST-FAILED-sendEventToStream:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setStreamProperties:
-    errorCode: setStreamProperties-FAILED-5001W
+  REQUEST-FAILED-trucateStream:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  restartApp:
-    errorCode: restartApp-FAILED-5001W
+  REQUEST-FAILED-setStreamProperties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  createApp:
-    errorCode: createApp-FAILED-5001W
+  REQUEST-FAILED-restartApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  createAppWithConfig:
-    errorCode: createAppWithConfig-FAILED-5001W
+  REQUEST-FAILED-createApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setDatasetProperties:
-    errorCode: setDatasetProperties-FAILED-5001W
+  REQUEST-FAILED-createAppWithConfig:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setStreamTTL:
-    errorCode: setStreamTTL-FAILED-5001W
+  REQUEST-FAILED-setDatasetProperties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REQUEST-FAILED-setStreamTTL:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-suspendSchedule:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REQUEST-FAILED-resumeSchedule:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Operation Failed with Exception
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
+    messageFormat: '{0}'
+    description: Remote Operation Failed with Exception
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_logs:
-    errorCode: REMOTE-logs-FAILED-5001W
+  REMOTE-CALL-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_metrics:
-    errorCode: REMOTE-metrics-FAILED-5001W
+  REMOTE-CALL-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_properties:
-    errorCode: REMOTE-properties-FAILED-5001W
+  REMOTE-CALL-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_uploadInfo:
-    errorCode: REMOTE-uploadInfo-FAILED-5001W
+  REMOTE-CALL-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValues:
-    errorCode: REMOTE-getValues-FAILED-5001W
+  REMOTE-CALL-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValuesAll:
-    errorCode: REMOTE-getValuesAll-FAILED-5001W
+  REMOTE-CALL-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getMessages:
-    errorCode: REMOTE-getMessages-FAILED-5001W
+  REMOTE-CALL-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getRequestLogger:
-    errorCode: REMOTE-getRequestLogger-FAILED-5001W
+  REMOTE-CALL-FAILED-createNamespace:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_evaluate:
-    errorCode: REMOTE-evaluate-FAILED-5001W
+  REMOTE-CALL-FAILED-deleteNamespace:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_update:
-    errorCode: REMOTE-update-FAILED-5001W
+  REMOTE-CALL-FAILED-deployApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_createNamespace:
-    errorCode: REMOTE-createNamespace-FAILED-5001W
+  REMOTE-CALL-FAILED-loadArtifact:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_deleteNamespace:
-    errorCode: REMOTE-deleteNamespace-FAILED-5001W
+  REMOTE-CALL-FAILED-loadArtifactWithConfig:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_deployApp:
-    errorCode: REMOTE-deployApp-FAILED-5001W
+  REMOTE-CALL-FAILED-deleteArtifact:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_loadArtifact:
-    errorCode: REMOTE-loadArtifact-FAILED-5001W
+  REMOTE-CALL-FAILED-startFlow:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_deleteArtifact:
-    errorCode: REMOTE-deleteArtifact-FAILED-5001W
+  REMOTE-CALL-FAILED-startWorker:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_startFlow:
-    errorCode: REMOTE-startFlow-FAILED-5001W
+  REMOTE-CALL-FAILED-startService:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_startWorker:
-    errorCode: REMOTE-startWorker-FAILED-5001W
+  REMOTE-CALL-FAILED-startApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_startService:
-    errorCode: REMOTE-startService-FAILED-5001W
+  REMOTE-CALL-FAILED-stopApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_startApp:
-    errorCode: REMOTE-startApp-FAILED-5001W
+  REMOTE-CALL-FAILED-deleteApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_stopApp:
-    errorCode: REMOTE-stopApp-FAILED-5001W
+  REMOTE-CALL-FAILED-loadPreferencesApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_deleteApp:
-    errorCode: REMOTE-deleteApp-FAILED-5001W
+  REMOTE-CALL-FAILED-loadPreferencesFlow:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_loadPreferencesApp:
-    errorCode: REMOTE-loadPreferencesApp-FAILED-5001W
+  REMOTE-CALL-FAILED-loadPreferencesNameSpace:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_loadPreferencesFlow:
-    errorCode: REMOTE-loadPreferencesFlow-FAILED-5001W
+  REMOTE-CALL-FAILED-setPreferencesApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_loadPreferencesNameSpace:
-    errorCode: REMOTE-loadPreferencesNameSpace-FAILED-5001W
+  REMOTE-CALL-FAILED-setPreferencesFlow:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setPreferencesApp:
-    errorCode: REMOTE-setPreferencesApp-FAILED-5001W
+  REMOTE-CALL-FAILED-setPreferencesWorker:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setPreferencesFlow:
-    errorCode: REMOTE-setPreferencesFlow-FAILED-5001W
+  REMOTE-CALL-FAILED-setPreferencesService:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setPreferencesWorker:
-    errorCode: REMOTE-setPreferencesWorker-FAILED-5001W
+  REMOTE-CALL-FAILED-setPreferencesNameSpace:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setPreferencesService:
-    errorCode: REMOTE-setPreferencesService-FAILED-5001W
+  REMOTE-CALL-FAILED-setFlowRunTimeArgs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setPreferencesNameSpace:
-    errorCode: REMOTE-setPreferencesNameSpace-FAILED-5001W
+  REMOTE-CALL-FAILED-setFlowletInstances:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setFlowRunTimeArgs:
-    errorCode: REMOTE-setFlowRunTimeArgs-FAILED-5001W
+  REMOTE-CALL-FAILED-stopFlow:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setFlowletInstances:
-    errorCode: REMOTE-setFlowletInstances-FAILED-5001W
+  REMOTE-CALL-FAILED-stopWorker:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_stopFlow:
-    errorCode: REMOTE-stopFlow-FAILED-5001W
+  REMOTE-CALL-FAILED-stopService:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_stopWorker:
-    errorCode: REMOTE-stopWorker-FAILED-5001W
+  REMOTE-CALL-FAILED-truncateDataSet:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_stopService:
-    errorCode: REMOTE-stopService-FAILED-5001W
+  REMOTE-CALL-FAILED-deleteDataset:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_truncateDataSet:
-    errorCode: REMOTE-truncateDataSet-FAILED-5001W
+  REMOTE-CALL-FAILED-createStream:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_deleteDataset:
-    errorCode: REMOTE-deleteDataset-FAILED-5001W
+  REMOTE-CALL-FAILED-deleteStream:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_createStream:
-    errorCode: REMOTE-createStream-FAILED-5001W
+  REMOTE-CALL-FAILED-getStreamEvents:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_deleteStream:
-    errorCode: REMOTE-deleteStream-FAILED-5001W
+  REMOTE-CALL-FAILED-getStreamStats:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getStreamEvents:
-    errorCode: REMOTE-getStreamEvents-FAILED-5001W
+  REMOTE-CALL-FAILED-sendEventToStream:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getStreamStats:
-    errorCode: REMOTE-getStreamStats-FAILED-5001W
+  REMOTE-CALL-FAILED-trucateStream:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_sendEventToStream:
-    errorCode: REMOTE-sendEventToStream-FAILED-5001W
+  REMOTE-CALL-FAILED-setStreamProperties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_trucateStream:
-    errorCode: REMOTE-trucateStream-FAILED-5001W
+  REMOTE-CALL-FAILED-restartApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setStreamProperties:
-    errorCode: REMOTE-setStreamProperties-FAILED-5001W
+  REMOTE-CALL-FAILED-createApp:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_restartApp:
-    errorCode: REMOTE-restartApp-FAILED-5001W
+  REMOTE-CALL-FAILED-createAppWithConfig:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_createApp:
-    errorCode: REMOTE-createApp-FAILED-5001W
+  REMOTE-CALL-FAILED-setDatasetProperties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_createAppWithConfig:
-    errorCode: REMOTE-createAppWithConfig-FAILED-5001W
+  REMOTE-CALL-FAILED-setStreamTTL:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setDatasetProperties:
-    errorCode: REMOTE-setDatasetProperties-FAILED-5001W
+  REMOTE-CALL-FAILED-suspendSchedule:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setStreamTTL:
-    errorCode: REMOTE-setStreamTTL-FAILED-5001W
+  REMOTE-CALL-FAILED-resumeSchedule:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/CdapClusterService.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/CdapClusterService.yaml
index 6ac8c34..5481cbf 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/CdapClusterService.yaml
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/CdapClusterService.yaml
@@ -1,135 +1,111 @@
 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
+  CdapClusterService@deploy: {}
+  CdapClusterService@undeploy: {}
+  CdapClusterService@test: {}
+  CdapClusterService@suspend: {}
+  CdapClusterService@resume: {}
+  CdapClusterService@pushManagerConfiguration: {}
+  CdapClusterService@pollManagerConfiguration: {}
+  CdapClusterService@managerConfiguration: {}
+  CdapClusterService@managerOperation: {}
+  CdapClusterService@updateConfigurationFromPolicy: {}
+  CdapClusterService@runHealthTests: {}
+  CdapClusterService@updateDeploymentStatus: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateDeploymentStatus:
-    errorCode: updateDeploymentStatus-FAILED-5001W
+  REQUEST-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateDeploymentStatus:
-    errorCode: REMOTE-updateDeploymentStatus-FAILED-5001W
+  REMOTE-CALL-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/GuiClientApi.yaml
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManager.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManager.java
index 4415331..9258c81 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManager.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManager.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.cdap.cluster.servers.manager;
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.cdap.cluster.servers.manager.logging.CdapClusterManagerOperationEnum;
+import org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.logging.CdapClusterManagerMessageEnum;
 
 
 
@@ -69,9 +79,9 @@ import org.openecomp.dcae.controller.service.cdap.cluster.manager.impl.CdapClust
 
 
 
-public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
+public class DcaeCdapClusterManager extends CdapClusterManagerImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeCdapClusterManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeCdapClusterManagerProvider controller;
 	ISiriusServer server;
 
@@ -86,8 +96,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_test,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -96,7 +106,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -111,8 +124,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -121,7 +134,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -136,8 +152,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -146,7 +162,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -161,8 +180,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.publicKey);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -171,7 +190,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -186,8 +208,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.configurationChanged);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -196,7 +218,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -211,8 +236,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.updateStreams);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -221,7 +246,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -236,8 +264,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.logs);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_logs,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_logs,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.logs(cx,logs);
 		}
@@ -246,7 +274,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_logs, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_logs, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -261,8 +292,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.metrics);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_metrics,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_metrics,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.metrics(cx,metrics);
 		}
@@ -271,7 +302,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_metrics, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_metrics, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -286,8 +320,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.properties);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_properties,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_properties,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.properties(cx,l);
 		}
@@ -296,7 +330,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_properties, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_properties, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -311,8 +348,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.uploadInfo);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_uploadInfo,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_uploadInfo,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.uploadInfo(cx,info);
 		}
@@ -321,7 +358,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -336,8 +376,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		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(CdapClusterManagerOperationEnum.getValues);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_getValues,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getValues,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValues(cx,path,start,end,option,relativeInterval);
 		}
@@ -346,7 +386,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.ERROR, duration_,cx,path,start,end,option,relativeInterval);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_getValues, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_getValues, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -361,8 +404,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		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(CdapClusterManagerOperationEnum.getValuesAll);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_getValuesAll,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getValuesAll,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval);
 		}
@@ -371,7 +414,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.ERROR, duration_,cx,path,metrics,start,end,option,relativeInterval);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -386,8 +432,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.getMessages);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_getMessages,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getMessages,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getMessages(cx,path,start,end);
 		}
@@ -396,7 +442,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_getMessages, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -411,8 +460,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.getRequestLogger);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_getRequestLogger,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getRequestLogger,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getRequestLogger(userName,action,resourcePath,context);
 		}
@@ -421,7 +470,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -436,8 +488,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.evaluate);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_evaluate,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_evaluate,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.evaluate(path,function);
 		}
@@ -446,7 +498,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_evaluate, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -461,8 +516,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.update);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_update,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_update,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.update(path,function);
 		}
@@ -471,7 +526,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_update, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_update, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -486,8 +544,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "createNamespace", ApiRequestStatus.START, duration_,namespace);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.createNamespace);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_createNamespace,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_createNamespace,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.createNamespace(namespace);
 		}
@@ -496,7 +554,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "createNamespace", ApiRequestStatus.ERROR, duration_,namespace);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_createNamespace, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_createNamespace,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_createNamespace, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -511,8 +572,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "deleteNamespace", ApiRequestStatus.START, duration_,namespace);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.deleteNamespace);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_deleteNamespace,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteNamespace,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.deleteNamespace(namespace);
 		}
@@ -521,7 +582,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "deleteNamespace", ApiRequestStatus.ERROR, duration_,namespace);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteNamespace, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteNamespace,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteNamespace, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -536,8 +600,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "deployApp", ApiRequestStatus.START, duration_,namespace,jarfile);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.deployApp);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_deployApp,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deployApp,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.deployApp(namespace,jarfile);
 		}
@@ -546,7 +610,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "deployApp", ApiRequestStatus.ERROR, duration_,namespace,jarfile);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_deployApp, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_deployApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_deployApp, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -561,8 +628,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "loadArtifact", ApiRequestStatus.START, duration_,namespace,artifactName,jarfile,version);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.loadArtifact);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_loadArtifact,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadArtifact,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.loadArtifact(namespace,artifactName,jarfile,version);
 		}
@@ -571,7 +638,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "loadArtifact", ApiRequestStatus.ERROR, duration_,namespace,artifactName,jarfile,version);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadArtifact, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadArtifact,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_loadArtifact, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -580,14 +650,42 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		return res;
 	}
 
+	public java.lang.String loadArtifactWithConfig(java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version, java.lang.String config) {
+		java.lang.String res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "loadArtifactWithConfig", ApiRequestStatus.START, duration_,namespace,artifactName,jarfile,version,config);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_loadArtifactWithConfig,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadArtifactWithConfig,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.loadArtifactWithConfig(namespace,artifactName,jarfile,version,config);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "loadArtifactWithConfig", ApiRequestStatus.ERROR, duration_,namespace,artifactName,jarfile,version,config);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadArtifactWithConfig, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadArtifactWithConfig,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_loadArtifactWithConfig, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "loadArtifactWithConfig", ApiRequestStatus.OKAY, duration_,namespace,artifactName,jarfile,version,config);
+		return res;
+	}
+
 	public java.lang.String deleteArtifact(java.lang.String namespace, java.lang.String artifactName, java.lang.String artifactVersion) {
 		java.lang.String res = null;
 		long duration_ = 0;
 		if (server != null)
 			server.getServer().recordApi(null, this, "deleteArtifact", ApiRequestStatus.START, duration_,namespace,artifactName,artifactVersion);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.deleteArtifact);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_deleteArtifact,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteArtifact,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.deleteArtifact(namespace,artifactName,artifactVersion);
 		}
@@ -596,7 +694,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "deleteArtifact", ApiRequestStatus.ERROR, duration_,namespace,artifactName,artifactVersion);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteArtifact, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteArtifact,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteArtifact, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -611,8 +712,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "startFlow", ApiRequestStatus.START, duration_,namespace,appName,flowId,extraArgs);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.startFlow);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_startFlow,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_startFlow,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.startFlow(namespace,appName,flowId,extraArgs);
 		}
@@ -621,7 +722,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "startFlow", ApiRequestStatus.ERROR, duration_,namespace,appName,flowId,extraArgs);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_startFlow, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_startFlow,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_startFlow, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -636,8 +740,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "startWorker", ApiRequestStatus.START, duration_,namespace,appName,workerId,extraArgs);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.startWorker);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_startWorker,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_startWorker,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.startWorker(namespace,appName,workerId,extraArgs);
 		}
@@ -646,7 +750,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "startWorker", ApiRequestStatus.ERROR, duration_,namespace,appName,workerId,extraArgs);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_startWorker, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_startWorker,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_startWorker, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -661,8 +768,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "startService", ApiRequestStatus.START, duration_,namespace,appName,serviceId,extraArgs);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.startService);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_startService,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_startService,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.startService(namespace,appName,serviceId,extraArgs);
 		}
@@ -671,7 +778,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "startService", ApiRequestStatus.ERROR, duration_,namespace,appName,serviceId,extraArgs);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_startService, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_startService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_startService, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -686,8 +796,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "startApp", ApiRequestStatus.START, duration_,namespace,appName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.startApp);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_startApp,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_startApp,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.startApp(namespace,appName);
 		}
@@ -696,7 +806,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "startApp", ApiRequestStatus.ERROR, duration_,namespace,appName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_startApp, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_startApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_startApp, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -711,8 +824,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.START, duration_,namespace,appName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.stopApp);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_stopApp,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopApp,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.stopApp(namespace,appName);
 		}
@@ -721,7 +834,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.ERROR, duration_,namespace,appName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopApp, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_stopApp, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -736,8 +852,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "deleteApp", ApiRequestStatus.START, duration_,namespace,appName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.deleteApp);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_deleteApp,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteApp,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.deleteApp(namespace,appName);
 		}
@@ -746,7 +862,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "deleteApp", ApiRequestStatus.ERROR, duration_,namespace,appName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteApp, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteApp, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -761,8 +880,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "loadPreferencesApp", ApiRequestStatus.START, duration_,namespace,prefsFile,appId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.loadPreferencesApp);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesApp,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesApp,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.loadPreferencesApp(namespace,prefsFile,appId);
 		}
@@ -771,7 +890,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "loadPreferencesApp", ApiRequestStatus.ERROR, duration_,namespace,prefsFile,appId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesApp, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesApp, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -786,8 +908,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "loadPreferencesFlow", ApiRequestStatus.START, duration_,namespace,prefsFile,appId,flowId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.loadPreferencesFlow);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesFlow,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesFlow,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.loadPreferencesFlow(namespace,prefsFile,appId,flowId);
 		}
@@ -796,7 +918,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "loadPreferencesFlow", ApiRequestStatus.ERROR, duration_,namespace,prefsFile,appId,flowId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesFlow, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesFlow,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesFlow, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -811,8 +936,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "loadPreferencesNameSpace", ApiRequestStatus.START, duration_,namespace,prefsFile);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.loadPreferencesNameSpace);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesNameSpace,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesNameSpace,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.loadPreferencesNameSpace(namespace,prefsFile);
 		}
@@ -821,7 +946,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "loadPreferencesNameSpace", ApiRequestStatus.ERROR, duration_,namespace,prefsFile);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesNameSpace, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesNameSpace,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_loadPreferencesNameSpace, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -836,8 +964,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setPreferencesApp", ApiRequestStatus.START, duration_,namespace,prefsString,appId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setPreferencesApp);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesApp,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesApp,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setPreferencesApp(namespace,prefsString,appId);
 		}
@@ -846,7 +974,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setPreferencesApp", ApiRequestStatus.ERROR, duration_,namespace,prefsString,appId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesApp, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesApp, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -861,8 +992,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setPreferencesFlow", ApiRequestStatus.START, duration_,namespace,prefsString,appId,flowId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setPreferencesFlow);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesFlow,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesFlow,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setPreferencesFlow(namespace,prefsString,appId,flowId);
 		}
@@ -871,7 +1002,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setPreferencesFlow", ApiRequestStatus.ERROR, duration_,namespace,prefsString,appId,flowId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesFlow, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesFlow,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesFlow, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -886,8 +1020,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setPreferencesWorker", ApiRequestStatus.START, duration_,namespace,prefsString,appId,workerId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setPreferencesWorker);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesWorker,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesWorker,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setPreferencesWorker(namespace,prefsString,appId,workerId);
 		}
@@ -896,7 +1030,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setPreferencesWorker", ApiRequestStatus.ERROR, duration_,namespace,prefsString,appId,workerId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesWorker, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesWorker,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesWorker, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -911,8 +1048,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setPreferencesService", ApiRequestStatus.START, duration_,namespace,prefsString,appId,serviceId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setPreferencesService);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesService,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesService,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setPreferencesService(namespace,prefsString,appId,serviceId);
 		}
@@ -921,7 +1058,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setPreferencesService", ApiRequestStatus.ERROR, duration_,namespace,prefsString,appId,serviceId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesService, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesService, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -936,8 +1076,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setPreferencesNameSpace", ApiRequestStatus.START, duration_,namespace,prefsString);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setPreferencesNameSpace);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesNameSpace,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesNameSpace,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setPreferencesNameSpace(namespace,prefsString);
 		}
@@ -946,7 +1086,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setPreferencesNameSpace", ApiRequestStatus.ERROR, duration_,namespace,prefsString);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesNameSpace, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesNameSpace,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setPreferencesNameSpace, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -961,8 +1104,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setFlowRunTimeArgs", ApiRequestStatus.START, duration_,namespace,appId,flowId,args);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setFlowRunTimeArgs);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setFlowRunTimeArgs,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setFlowRunTimeArgs,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setFlowRunTimeArgs(namespace,appId,flowId,args);
 		}
@@ -971,7 +1114,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setFlowRunTimeArgs", ApiRequestStatus.ERROR, duration_,namespace,appId,flowId,args);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setFlowRunTimeArgs, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setFlowRunTimeArgs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setFlowRunTimeArgs, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -986,8 +1132,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setFlowletInstances", ApiRequestStatus.START, duration_,namespace,appId,flowId,flowletId,nInstances);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setFlowletInstances);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setFlowletInstances,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setFlowletInstances,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setFlowletInstances(namespace,appId,flowId,flowletId,nInstances);
 		}
@@ -996,7 +1142,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setFlowletInstances", ApiRequestStatus.ERROR, duration_,namespace,appId,flowId,flowletId,nInstances);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setFlowletInstances, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setFlowletInstances,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setFlowletInstances, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1011,8 +1160,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "stopFlow", ApiRequestStatus.START, duration_,namespace,appId,flowId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.stopFlow);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_stopFlow,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopFlow,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.stopFlow(namespace,appId,flowId);
 		}
@@ -1021,7 +1170,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "stopFlow", ApiRequestStatus.ERROR, duration_,namespace,appId,flowId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopFlow, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopFlow,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_stopFlow, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1036,8 +1188,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "stopWorker", ApiRequestStatus.START, duration_,namespace,appId,workerId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.stopWorker);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_stopWorker,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopWorker,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.stopWorker(namespace,appId,workerId);
 		}
@@ -1046,7 +1198,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "stopWorker", ApiRequestStatus.ERROR, duration_,namespace,appId,workerId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopWorker, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopWorker,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_stopWorker, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1061,8 +1216,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "stopService", ApiRequestStatus.START, duration_,namespace,appId,serviceId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.stopService);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_stopService,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopService,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.stopService(namespace,appId,serviceId);
 		}
@@ -1071,7 +1226,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "stopService", ApiRequestStatus.ERROR, duration_,namespace,appId,serviceId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopService, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_stopService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_stopService, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1086,8 +1244,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "truncateDataSet", ApiRequestStatus.START, duration_,namespace,datasetName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.truncateDataSet);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_truncateDataSet,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_truncateDataSet,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.truncateDataSet(namespace,datasetName);
 		}
@@ -1096,7 +1254,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "truncateDataSet", ApiRequestStatus.ERROR, duration_,namespace,datasetName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_truncateDataSet, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_truncateDataSet,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_truncateDataSet, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1111,8 +1272,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "deleteDataset", ApiRequestStatus.START, duration_,namespace,datasetName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.deleteDataset);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_deleteDataset,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteDataset,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.deleteDataset(namespace,datasetName);
 		}
@@ -1121,7 +1282,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "deleteDataset", ApiRequestStatus.ERROR, duration_,namespace,datasetName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteDataset, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteDataset,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteDataset, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1136,8 +1300,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "createStream", ApiRequestStatus.START, duration_,namespace,newStreamId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.createStream);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_createStream,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_createStream,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.createStream(namespace,newStreamId);
 		}
@@ -1146,7 +1310,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "createStream", ApiRequestStatus.ERROR, duration_,namespace,newStreamId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_createStream, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_createStream,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_createStream, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1161,8 +1328,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "deleteStream", ApiRequestStatus.START, duration_,namespace,streamId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.deleteStream);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_deleteStream,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteStream,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.deleteStream(namespace,streamId);
 		}
@@ -1171,7 +1338,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "deleteStream", ApiRequestStatus.ERROR, duration_,namespace,streamId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteStream, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteStream,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_deleteStream, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1186,8 +1356,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getStreamEvents", ApiRequestStatus.START, duration_,namespace,streamId,startTime,endTime,limit);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.getStreamEvents);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_getStreamEvents,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getStreamEvents,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getStreamEvents(namespace,streamId,startTime,endTime,limit);
 		}
@@ -1196,7 +1366,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getStreamEvents", ApiRequestStatus.ERROR, duration_,namespace,streamId,startTime,endTime,limit);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_getStreamEvents, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_getStreamEvents,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_getStreamEvents, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1211,8 +1384,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getStreamStats", ApiRequestStatus.START, duration_,namespace,streamId,startTime,endTime,limit);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.getStreamStats);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_getStreamStats,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getStreamStats,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getStreamStats(namespace,streamId,startTime,endTime,limit);
 		}
@@ -1221,7 +1394,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getStreamStats", ApiRequestStatus.ERROR, duration_,namespace,streamId,startTime,endTime,limit);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_getStreamStats, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_getStreamStats,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_getStreamStats, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1236,8 +1412,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "sendEventToStream", ApiRequestStatus.START, duration_,namespace,streamId,event);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.sendEventToStream);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_sendEventToStream,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_sendEventToStream,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.sendEventToStream(namespace,streamId,event);
 		}
@@ -1246,7 +1422,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "sendEventToStream", ApiRequestStatus.ERROR, duration_,namespace,streamId,event);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_sendEventToStream, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_sendEventToStream,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_sendEventToStream, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1261,8 +1440,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "trucateStream", ApiRequestStatus.START, duration_,namespace,streamId);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.trucateStream);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_trucateStream,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_trucateStream,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.trucateStream(namespace,streamId);
 		}
@@ -1271,7 +1450,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "trucateStream", ApiRequestStatus.ERROR, duration_,namespace,streamId);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_trucateStream, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_trucateStream,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_trucateStream, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1286,8 +1468,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setStreamProperties", ApiRequestStatus.START, duration_,namespace,streamId,propsFile);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setStreamProperties);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setStreamProperties,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setStreamProperties,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setStreamProperties(namespace,streamId,propsFile);
 		}
@@ -1296,7 +1478,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setStreamProperties", ApiRequestStatus.ERROR, duration_,namespace,streamId,propsFile);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setStreamProperties, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setStreamProperties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setStreamProperties, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1311,8 +1496,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "restartApp", ApiRequestStatus.START, duration_,namespace,appId,progTypes);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.restartApp);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_restartApp,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_restartApp,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.restartApp(namespace,appId,progTypes);
 		}
@@ -1321,7 +1506,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "restartApp", ApiRequestStatus.ERROR, duration_,namespace,appId,progTypes);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_restartApp, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_restartApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_restartApp, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1336,8 +1524,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "createApp", ApiRequestStatus.START, duration_,namespace,appId,artifactName,artifactVersion,scope);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.createApp);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_createApp,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_createApp,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.createApp(namespace,appId,artifactName,artifactVersion,scope);
 		}
@@ -1346,7 +1534,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "createApp", ApiRequestStatus.ERROR, duration_,namespace,appId,artifactName,artifactVersion,scope);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_createApp, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_createApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_createApp, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1361,8 +1552,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "createAppWithConfig", ApiRequestStatus.START, duration_,namespace,appId,artifactName,artifactVersion,scope,appConfig);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.createAppWithConfig);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_createAppWithConfig,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_createAppWithConfig,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.createAppWithConfig(namespace,appId,artifactName,artifactVersion,scope,appConfig);
 		}
@@ -1371,7 +1562,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "createAppWithConfig", ApiRequestStatus.ERROR, duration_,namespace,appId,artifactName,artifactVersion,scope,appConfig);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_createAppWithConfig, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_createAppWithConfig,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_createAppWithConfig, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1386,8 +1580,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setDatasetProperties", ApiRequestStatus.START, duration_,namespace,datasetName,datasetProperties);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setDatasetProperties);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setDatasetProperties,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setDatasetProperties,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setDatasetProperties(namespace,datasetName,datasetProperties);
 		}
@@ -1396,7 +1590,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setDatasetProperties", ApiRequestStatus.ERROR, duration_,namespace,datasetName,datasetProperties);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setDatasetProperties, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setDatasetProperties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setDatasetProperties, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1411,8 +1608,8 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setStreamTTL", ApiRequestStatus.START, duration_,namespace,streamName,ttlSeconds);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.setStreamTTL);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_setStreamTTL,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setStreamTTL,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.setStreamTTL(namespace,streamName,ttlSeconds);
 		}
@@ -1421,7 +1618,10 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setStreamTTL", ApiRequestStatus.ERROR, duration_,namespace,streamName,ttlSeconds);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_setStreamTTL, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_setStreamTTL,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_setStreamTTL, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -1430,6 +1630,64 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 		return res;
 	}
 
+	public java.lang.String suspendSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+		java.lang.String res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "suspendSchedule", ApiRequestStatus.START, duration_,namespace,appId,scheduleId);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_suspendSchedule,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_suspendSchedule,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.suspendSchedule(namespace,appId,scheduleId);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "suspendSchedule", ApiRequestStatus.ERROR, duration_,namespace,appId,scheduleId);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_suspendSchedule, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_suspendSchedule,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_suspendSchedule, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "suspendSchedule", ApiRequestStatus.OKAY, duration_,namespace,appId,scheduleId);
+		return res;
+	}
+
+	public java.lang.String resumeSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+		java.lang.String res = null;
+		long duration_ = 0;
+		if (server != null)
+			server.getServer().recordApi(null, this, "resumeSchedule", ApiRequestStatus.START, duration_,namespace,appId,scheduleId);
+		Date now_ = new Date();
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterManagerOperationEnum.CdapClusterManager_resumeSchedule,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_resumeSchedule,"self:" + ManagementServer.object2ref(this));
+		try {
+			res =  controller.resumeSchedule(namespace,appId,scheduleId);
+		}
+		catch (Exception e) {
+			duration_ = new Date().getTime()-now_.getTime();
+			if (server != null)
+				server.getServer().recordApi(null, this, "resumeSchedule", ApiRequestStatus.ERROR, duration_,namespace,appId,scheduleId);
+			System.err.println("ERROR: " + e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REQUEST_FAILED_resumeSchedule, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterManagerMessageEnum.REQUEST_FAILED_resumeSchedule,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterManagerMessageEnum.REQUEST_FAILED_resumeSchedule, e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		duration_ = new Date().getTime()-now_.getTime();
+		if (server != null)
+			server.getServer().recordApi(null, this, "resumeSchedule", ApiRequestStatus.OKAY, duration_,namespace,appId,scheduleId);
+		return res;
+	}
+
+
+
 
 
 
@@ -1438,7 +1696,7 @@ public class DcaeCdapClusterManager extends CdapClusterManagerImpl {
 	public static void ecoreSetup() {
 		DcaeCdapClusterManagerProvider.ecoreSetup();
 	}
-	public DcaeCdapClusterManagerProvider getSomfProvider() {
+	public DcaeCdapClusterManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerClient.java
index dc1cfcf..fb346f4 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerClient.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 		DcaeCdapClusterManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeCdapClusterManagerClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeCdapClusterManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_test);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -88,16 +94,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void suspend() {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_suspend);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void resume() {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_resume);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_publicKey);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed:  publicKey", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void configurationChanged() {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed:  configurationChanged", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed:  updateStreams", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_logs);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_logs,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_logs, e.toString());
-			throw new RuntimeException("remote call failed:  logs", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_metrics);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_metrics,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_metrics, e.toString());
-			throw new RuntimeException("remote call failed:  metrics", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -207,16 +220,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_properties);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_properties,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_properties, e.toString());
-			throw new RuntimeException("remote call failed:  properties", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -224,16 +238,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_uploadInfo);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_uploadInfo,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_uploadInfo, e.toString());
-			throw new RuntimeException("remote call failed:  uploadInfo", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_getValues);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getValues,client.getRemote());
 		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(CdapClusterManagerMessageEnum.REMOTE_getValues, e.toString());
-			throw new RuntimeException("remote call failed:  getValues", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -258,16 +274,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_getValuesAll);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getValuesAll,client.getRemote());
 		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(CdapClusterManagerMessageEnum.REMOTE_getValuesAll, e.toString());
-			throw new RuntimeException("remote call failed:  getValuesAll", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -275,16 +292,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_getMessages);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getMessages,client.getRemote());
 		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(CdapClusterManagerMessageEnum.REMOTE_getMessages, e.toString());
-			throw new RuntimeException("remote call failed:  getMessages", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -292,16 +310,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_getRequestLogger);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getRequestLogger,client.getRemote());
 		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(CdapClusterManagerMessageEnum.REMOTE_getRequestLogger, e.toString());
-			throw new RuntimeException("remote call failed:  getRequestLogger", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -309,16 +328,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_evaluate);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_evaluate,client.getRemote());
 		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(CdapClusterManagerMessageEnum.REMOTE_evaluate, e.toString());
-			throw new RuntimeException("remote call failed:  evaluate", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -326,16 +346,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_update);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_update,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "update", null, path,function);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_update, e.toString());
-			throw new RuntimeException("remote call failed:  update", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_update, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -343,16 +364,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String createNamespace(java.lang.String namespace) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_createNamespace);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_createNamespace,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "createNamespace", null, namespace);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_createNamespace, e.toString());
-			throw new RuntimeException("remote call failed:  createNamespace", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createNamespace, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createNamespace,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createNamespace,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -360,16 +382,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String deleteNamespace(java.lang.String namespace) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_deleteNamespace);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteNamespace,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "deleteNamespace", null, namespace);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_deleteNamespace, e.toString());
-			throw new RuntimeException("remote call failed:  deleteNamespace", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteNamespace, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteNamespace,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteNamespace,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -377,16 +400,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String deployApp(java.lang.String namespace, java.lang.String jarfile) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_deployApp);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deployApp,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "deployApp", null, namespace,jarfile);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_deployApp, e.toString());
-			throw new RuntimeException("remote call failed:  deployApp", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deployApp, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deployApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deployApp,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -394,16 +418,35 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String loadArtifact(java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_loadArtifact);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadArtifact,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "loadArtifact", null, namespace,artifactName,jarfile,version);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_loadArtifact, e.toString());
-			throw new RuntimeException("remote call failed:  loadArtifact", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadArtifact, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadArtifact,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadArtifact,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public java.lang.String loadArtifactWithConfig(java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version, java.lang.String config) {
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadArtifactWithConfig,client.getRemote());
+		java.lang.String res;
+		try {
+		  res = (java.lang.String) client.operationPath("/resources", c, "loadArtifactWithConfig", null, namespace,artifactName,jarfile,version,config);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadArtifactWithConfig, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadArtifactWithConfig,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadArtifactWithConfig,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -411,16 +454,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String deleteArtifact(java.lang.String namespace, java.lang.String artifactName, java.lang.String artifactVersion) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_deleteArtifact);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteArtifact,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "deleteArtifact", null, namespace,artifactName,artifactVersion);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_deleteArtifact, e.toString());
-			throw new RuntimeException("remote call failed:  deleteArtifact", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteArtifact, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteArtifact,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteArtifact,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -428,16 +472,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String startFlow(java.lang.String namespace, java.lang.String appName, java.lang.String flowId, java.lang.String extraArgs) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_startFlow);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_startFlow,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "startFlow", null, namespace,appName,flowId,extraArgs);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_startFlow, e.toString());
-			throw new RuntimeException("remote call failed:  startFlow", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startFlow, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startFlow,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startFlow,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -445,16 +490,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String startWorker(java.lang.String namespace, java.lang.String appName, java.lang.String workerId, java.lang.String extraArgs) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_startWorker);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_startWorker,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "startWorker", null, namespace,appName,workerId,extraArgs);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_startWorker, e.toString());
-			throw new RuntimeException("remote call failed:  startWorker", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startWorker, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startWorker,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startWorker,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -462,16 +508,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String startService(java.lang.String namespace, java.lang.String appName, java.lang.String serviceId, java.lang.String extraArgs) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_startService);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_startService,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "startService", null, namespace,appName,serviceId,extraArgs);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_startService, e.toString());
-			throw new RuntimeException("remote call failed:  startService", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startService, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startService,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -479,16 +526,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String startApp(java.lang.String namespace, java.lang.String appName) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_startApp);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_startApp,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "startApp", null, namespace,appName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_startApp, e.toString());
-			throw new RuntimeException("remote call failed:  startApp", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startApp, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_startApp,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -496,16 +544,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String stopApp(java.lang.String namespace, java.lang.String appName) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_stopApp);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopApp,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "stopApp", null, namespace,appName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_stopApp, e.toString());
-			throw new RuntimeException("remote call failed:  stopApp", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopApp, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopApp,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -513,16 +562,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String deleteApp(java.lang.String namespace, java.lang.String appName) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_deleteApp);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteApp,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "deleteApp", null, namespace,appName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_deleteApp, e.toString());
-			throw new RuntimeException("remote call failed:  deleteApp", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteApp, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteApp,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -530,16 +580,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String loadPreferencesApp(java.lang.String namespace, java.lang.String prefsFile, java.lang.String appId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_loadPreferencesApp);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesApp,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "loadPreferencesApp", null, namespace,prefsFile,appId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_loadPreferencesApp, e.toString());
-			throw new RuntimeException("remote call failed:  loadPreferencesApp", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesApp, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesApp,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -547,16 +598,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String loadPreferencesFlow(java.lang.String namespace, java.lang.String prefsFile, java.lang.String appId, java.lang.String flowId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_loadPreferencesFlow);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesFlow,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "loadPreferencesFlow", null, namespace,prefsFile,appId,flowId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_loadPreferencesFlow, e.toString());
-			throw new RuntimeException("remote call failed:  loadPreferencesFlow", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesFlow, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesFlow,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesFlow,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -564,16 +616,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String loadPreferencesNameSpace(java.lang.String namespace, java.lang.String prefsFile) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_loadPreferencesNameSpace);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_loadPreferencesNameSpace,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "loadPreferencesNameSpace", null, namespace,prefsFile);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_loadPreferencesNameSpace, e.toString());
-			throw new RuntimeException("remote call failed:  loadPreferencesNameSpace", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesNameSpace, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesNameSpace,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_loadPreferencesNameSpace,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -581,16 +634,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setPreferencesApp(java.lang.String namespace, java.lang.String prefsString, java.lang.String appId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setPreferencesApp);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesApp,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setPreferencesApp", null, namespace,prefsString,appId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setPreferencesApp, e.toString());
-			throw new RuntimeException("remote call failed:  setPreferencesApp", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesApp, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesApp,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -598,16 +652,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setPreferencesFlow(java.lang.String namespace, java.lang.String prefsString, java.lang.String appId, java.lang.String flowId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setPreferencesFlow);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesFlow,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setPreferencesFlow", null, namespace,prefsString,appId,flowId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setPreferencesFlow, e.toString());
-			throw new RuntimeException("remote call failed:  setPreferencesFlow", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesFlow, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesFlow,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesFlow,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -615,16 +670,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setPreferencesWorker(java.lang.String namespace, java.lang.String prefsString, java.lang.String appId, java.lang.String workerId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setPreferencesWorker);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesWorker,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setPreferencesWorker", null, namespace,prefsString,appId,workerId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setPreferencesWorker, e.toString());
-			throw new RuntimeException("remote call failed:  setPreferencesWorker", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesWorker, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesWorker,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesWorker,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -632,16 +688,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setPreferencesService(java.lang.String namespace, java.lang.String prefsString, java.lang.String appId, java.lang.String serviceId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setPreferencesService);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesService,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setPreferencesService", null, namespace,prefsString,appId,serviceId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setPreferencesService, e.toString());
-			throw new RuntimeException("remote call failed:  setPreferencesService", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesService, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesService,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -649,16 +706,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setPreferencesNameSpace(java.lang.String namespace, java.lang.String prefsString) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setPreferencesNameSpace);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setPreferencesNameSpace,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setPreferencesNameSpace", null, namespace,prefsString);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setPreferencesNameSpace, e.toString());
-			throw new RuntimeException("remote call failed:  setPreferencesNameSpace", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesNameSpace, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesNameSpace,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setPreferencesNameSpace,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -666,16 +724,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setFlowRunTimeArgs(java.lang.String namespace, java.lang.String appId, java.lang.String flowId, java.lang.String args) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setFlowRunTimeArgs);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setFlowRunTimeArgs,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setFlowRunTimeArgs", null, namespace,appId,flowId,args);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setFlowRunTimeArgs, e.toString());
-			throw new RuntimeException("remote call failed:  setFlowRunTimeArgs", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setFlowRunTimeArgs, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setFlowRunTimeArgs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setFlowRunTimeArgs,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -683,16 +742,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setFlowletInstances(java.lang.String namespace, java.lang.String appId, java.lang.String flowId, java.lang.String flowletId, int nInstances) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setFlowletInstances);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setFlowletInstances,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setFlowletInstances", null, namespace,appId,flowId,flowletId,nInstances);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setFlowletInstances, e.toString());
-			throw new RuntimeException("remote call failed:  setFlowletInstances", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setFlowletInstances, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setFlowletInstances,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setFlowletInstances,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -700,16 +760,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String stopFlow(java.lang.String namespace, java.lang.String appId, java.lang.String flowId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_stopFlow);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopFlow,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "stopFlow", null, namespace,appId,flowId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_stopFlow, e.toString());
-			throw new RuntimeException("remote call failed:  stopFlow", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopFlow, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopFlow,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopFlow,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -717,16 +778,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String stopWorker(java.lang.String namespace, java.lang.String appId, java.lang.String workerId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_stopWorker);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopWorker,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "stopWorker", null, namespace,appId,workerId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_stopWorker, e.toString());
-			throw new RuntimeException("remote call failed:  stopWorker", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopWorker, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopWorker,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopWorker,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -734,16 +796,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String stopService(java.lang.String namespace, java.lang.String appId, java.lang.String serviceId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_stopService);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_stopService,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "stopService", null, namespace,appId,serviceId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_stopService, e.toString());
-			throw new RuntimeException("remote call failed:  stopService", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopService, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopService,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_stopService,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -751,16 +814,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String truncateDataSet(java.lang.String namespace, java.lang.String datasetName) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_truncateDataSet);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_truncateDataSet,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "truncateDataSet", null, namespace,datasetName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_truncateDataSet, e.toString());
-			throw new RuntimeException("remote call failed:  truncateDataSet", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_truncateDataSet, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_truncateDataSet,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_truncateDataSet,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -768,16 +832,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String deleteDataset(java.lang.String namespace, java.lang.String datasetName) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_deleteDataset);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteDataset,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "deleteDataset", null, namespace,datasetName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_deleteDataset, e.toString());
-			throw new RuntimeException("remote call failed:  deleteDataset", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteDataset, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteDataset,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteDataset,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -785,16 +850,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String createStream(java.lang.String namespace, java.lang.String newStreamId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_createStream);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_createStream,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "createStream", null, namespace,newStreamId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_createStream, e.toString());
-			throw new RuntimeException("remote call failed:  createStream", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createStream, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createStream,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createStream,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -802,16 +868,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String deleteStream(java.lang.String namespace, java.lang.String streamId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_deleteStream);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_deleteStream,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "deleteStream", null, namespace,streamId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_deleteStream, e.toString());
-			throw new RuntimeException("remote call failed:  deleteStream", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteStream, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteStream,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_deleteStream,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -819,16 +886,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public EList<java.lang.String> getStreamEvents(java.lang.String namespace, java.lang.String streamId, java.lang.String startTime, java.lang.String endTime, int limit) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_getStreamEvents);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getStreamEvents,client.getRemote());
 		EList<java.lang.String> res;
 		try {
 		  res = (EList<java.lang.String>) client.operationPath("/resources", c, "getStreamEvents", null, namespace,streamId,startTime,endTime,limit);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_getStreamEvents, e.toString());
-			throw new RuntimeException("remote call failed:  getStreamEvents", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getStreamEvents, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getStreamEvents,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getStreamEvents,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -836,16 +904,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public EList<java.lang.String> getStreamStats(java.lang.String namespace, java.lang.String streamId, java.lang.String startTime, java.lang.String endTime, int limit) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_getStreamStats);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_getStreamStats,client.getRemote());
 		EList<java.lang.String> res;
 		try {
 		  res = (EList<java.lang.String>) client.operationPath("/resources", c, "getStreamStats", null, namespace,streamId,startTime,endTime,limit);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_getStreamStats, e.toString());
-			throw new RuntimeException("remote call failed:  getStreamStats", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getStreamStats, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getStreamStats,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_getStreamStats,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -853,16 +922,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String sendEventToStream(java.lang.String namespace, java.lang.String streamId, java.lang.String event) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_sendEventToStream);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_sendEventToStream,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "sendEventToStream", null, namespace,streamId,event);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_sendEventToStream, e.toString());
-			throw new RuntimeException("remote call failed:  sendEventToStream", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_sendEventToStream, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_sendEventToStream,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_sendEventToStream,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -870,16 +940,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String trucateStream(java.lang.String namespace, java.lang.String streamId) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_trucateStream);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_trucateStream,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "trucateStream", null, namespace,streamId);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_trucateStream, e.toString());
-			throw new RuntimeException("remote call failed:  trucateStream", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_trucateStream, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_trucateStream,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_trucateStream,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -887,16 +958,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setStreamProperties(java.lang.String namespace, java.lang.String streamId, java.lang.String propsFile) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setStreamProperties);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setStreamProperties,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setStreamProperties", null, namespace,streamId,propsFile);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setStreamProperties, e.toString());
-			throw new RuntimeException("remote call failed:  setStreamProperties", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setStreamProperties, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setStreamProperties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setStreamProperties,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -904,16 +976,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String restartApp(java.lang.String namespace, java.lang.String appId, java.lang.String progTypes) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_restartApp);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_restartApp,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "restartApp", null, namespace,appId,progTypes);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_restartApp, e.toString());
-			throw new RuntimeException("remote call failed:  restartApp", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_restartApp, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_restartApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_restartApp,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -921,16 +994,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String createApp(java.lang.String namespace, java.lang.String appId, java.lang.String artifactName, java.lang.String artifactVersion, java.lang.String scope) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_createApp);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_createApp,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "createApp", null, namespace,appId,artifactName,artifactVersion,scope);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_createApp, e.toString());
-			throw new RuntimeException("remote call failed:  createApp", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createApp, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createApp,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createApp,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -938,16 +1012,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String createAppWithConfig(java.lang.String namespace, java.lang.String appId, java.lang.String artifactName, java.lang.String artifactVersion, java.lang.String scope, java.lang.String appConfig) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_createAppWithConfig);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_createAppWithConfig,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "createAppWithConfig", null, namespace,appId,artifactName,artifactVersion,scope,appConfig);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_createAppWithConfig, e.toString());
-			throw new RuntimeException("remote call failed:  createAppWithConfig", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createAppWithConfig, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createAppWithConfig,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_createAppWithConfig,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -955,16 +1030,17 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setDatasetProperties(java.lang.String namespace, java.lang.String datasetName, java.lang.String datasetProperties) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setDatasetProperties);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setDatasetProperties,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setDatasetProperties", null, namespace,datasetName,datasetProperties);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setDatasetProperties, e.toString());
-			throw new RuntimeException("remote call failed:  setDatasetProperties", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setDatasetProperties, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setDatasetProperties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setDatasetProperties,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -972,16 +1048,53 @@ public class DcaeCdapClusterManagerClient extends CdapClusterManagerImpl {
 
 	@Override
 	public java.lang.String setStreamTTL(java.lang.String namespace, java.lang.String streamName, int ttlSeconds) {
-		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterManagerOperationEnum.REMOTE_setStreamTTL);
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_setStreamTTL,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "setStreamTTL", null, namespace,streamName,ttlSeconds);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_setStreamTTL, e.toString());
-			throw new RuntimeException("remote call failed:  setStreamTTL", e);
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setStreamTTL, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setStreamTTL,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_setStreamTTL,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public java.lang.String suspendSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_suspendSchedule,client.getRemote());
+		java.lang.String res;
+		try {
+		  res = (java.lang.String) client.operationPath("/resources", c, "suspendSchedule", null, namespace,appId,scheduleId);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_suspendSchedule, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_suspendSchedule,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_suspendSchedule,e.getMessage());
+			throw e1;
+		}
+		ecomplogger.recordMetricEventEnd();
+		return res;
+	}
+
+	@Override
+	public java.lang.String resumeSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+		EClass c = ManagerPackage.eINSTANCE.getCdapClusterManager(); 
+		ecomplogger.recordMetricEventStart(CdapClusterManagerOperationEnum.CdapClusterManager_resumeSchedule,client.getRemote());
+		java.lang.String res;
+		try {
+		  res = (java.lang.String) client.operationPath("/resources", c, "resumeSchedule", null, namespace,appId,scheduleId);
+		}
+		catch (Exception e) {
+			ecomplogger.warn(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_resumeSchedule, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_resumeSchedule,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterManagerMessageEnum.REMOTE_CALL_FAILED_resumeSchedule,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerConsole.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerConsole.java
index 08062a0..6f89203 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerConsole.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerConsole.java
@@ -278,6 +278,17 @@ public class DcaeCdapClusterManagerConsole extends Console {
 		return res;
 	}
 
+	public java.lang.String loadArtifactWithConfig(java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version, java.lang.String config) {
+		java.lang.String res = null;
+		try {
+			res =  controller.loadArtifactWithConfig(namespace,artifactName,jarfile,version,config);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
 	public java.lang.String deleteArtifact(java.lang.String namespace, java.lang.String artifactName, java.lang.String artifactVersion) {
 		java.lang.String res = null;
 		try {
@@ -652,4 +663,26 @@ public class DcaeCdapClusterManagerConsole extends Console {
 		return res;
 	}
 
+	public java.lang.String suspendSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+		java.lang.String res = null;
+		try {
+			res =  controller.suspendSchedule(namespace,appId,scheduleId);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
+	public java.lang.String resumeSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+		java.lang.String res = null;
+		try {
+			res =  controller.resumeSchedule(namespace,appId,scheduleId);
+		}
+		catch (ManagementServerError e) {
+			System.err.println("ERROR: " + e.getJson().toString(2));
+		}
+		return res;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProviderTemplate.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProviderTemplate.java
index f683359..2825ae5 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProviderTemplate.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerProviderTemplate.java
@@ -88,6 +88,12 @@ public class DcaeCdapClusterManagerProviderTemplate extends DcaeVirtualMachineMa
      throw new UnsupportedOperationException();
 	}
 
+	public java.lang.String loadArtifactWithConfig(java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version, java.lang.String config) {
+		java.lang.String res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
 	public java.lang.String deleteArtifact(java.lang.String namespace, java.lang.String artifactName, java.lang.String artifactVersion) {
 		java.lang.String res = null;
      // TODO IMPLEMENT
@@ -292,6 +298,18 @@ public class DcaeCdapClusterManagerProviderTemplate extends DcaeVirtualMachineMa
      throw new UnsupportedOperationException();
 	}
 
+	public java.lang.String suspendSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+		java.lang.String res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
+	public java.lang.String resumeSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+		java.lang.String res = null;
+     // TODO IMPLEMENT
+     throw new UnsupportedOperationException();
+	}
+
 
 
 
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerServer.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerServer.java
index 93dac4b..6934d36 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerServer.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/DcaeCdapClusterManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.cdap.cluster.servers.manager;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.cdap.cluster.manager.CdapClusterManager;
@@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.gui.Dc
 
 
 
-public class DcaeCdapClusterManagerServer implements ISiriusServer {
+public class DcaeCdapClusterManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeCdapClusterManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -69,6 +68,7 @@ public class DcaeCdapClusterManagerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "CdapClusterManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
     
 		server.addFactory(new org.openecomp.ncomp.servers.cdap.CdapCdapFactory(this));
@@ -84,6 +84,7 @@ public class DcaeCdapClusterManagerServer implements ISiriusServer {
         controller = (DcaeCdapClusterManager) server.find("/").o;
         webServer = new Jetty8Server("manager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -112,4 +113,17 @@ public class DcaeCdapClusterManagerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/DcaeGuiClientApi.java
index 8c4d9e0..5f36e4e 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/DcaeGuiClientApi.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/DcaeGuiClientApi.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.cdap.cluster.servers.manager.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.gui.logging.GuiClientApiMessageEnum;
 
 
 
@@ -81,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -98,8 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getTree);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -108,7 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -123,8 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getObject);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -133,7 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -148,8 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -158,7 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -173,8 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -183,7 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -198,8 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -208,7 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -223,8 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -233,7 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -247,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/DcaeGuiClientApiClient.java
index b7197f8..e64b782 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/DcaeGuiClientApiClient.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/DcaeGuiClientApiClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeCdapClusterManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTree, e.toString());
-			throw new RuntimeException("remote call failed:  getTree", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getObject, e.toString());
-			throw new RuntimeException("remote call failed:  getObject", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTimeSerie, e.toString());
-			throw new RuntimeException("remote call failed:  getTimeSerie", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTable, e.toString());
-			throw new RuntimeException("remote call failed:  getTable", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getHtml, e.toString());
-			throw new RuntimeException("remote call failed:  getHtml", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res;
 		try {
 		  res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getGraph, e.toString());
-			throw new RuntimeException("remote call failed:  getGraph", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApi.properties
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApiMessageEnum.java
index 29983b0..adc8b1f 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApiMessageEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.gui.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.gui.logging.GuiClientApi");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApi");
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApiOperationEnum.java
index 7ae8593..ecceec4 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApiOperationEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.gui.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum GuiClientApiOperationEnum implements EcompOperationEnum {
 
-  getTree,
-  getObject,
-  getTimeSerie,
-  getTable,
-  getHtml,
-  getGraph,
-  REMOTE_getTree,
-  REMOTE_getObject,
-  REMOTE_getTimeSerie,
-  REMOTE_getTable,
-  REMOTE_getHtml,
-  REMOTE_getGraph;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManager.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManager.properties
index 4f94eae..31194a9 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManager.properties
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManager.properties
@@ -1,654 +1,690 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
+  {0}|\
+  null|\
+  Operation Failed with Exception
+
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_logs=\
+  REQUEST-FAILED-logs-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_metrics=\
+  REQUEST-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_properties=\
+  REQUEST-FAILED-properties-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-logs=\
-  logs-FAILED-5001W|\
+REQUEST_FAILED_uploadInfo=\
+  REQUEST-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-metrics=\
-  metrics-FAILED-5001W|\
+REQUEST_FAILED_getValues=\
+  REQUEST-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-properties=\
-  properties-FAILED-5001W|\
+REQUEST_FAILED_getValuesAll=\
+  REQUEST-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-uploadInfo=\
-  uploadInfo-FAILED-5001W|\
+REQUEST_FAILED_getMessages=\
+  REQUEST-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValues=\
-  getValues-FAILED-5001W|\
+REQUEST_FAILED_getRequestLogger=\
+  REQUEST-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValuesAll=\
-  getValuesAll-FAILED-5001W|\
+REQUEST_FAILED_evaluate=\
+  REQUEST-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getMessages=\
-  getMessages-FAILED-5001W|\
+REQUEST_FAILED_update=\
+  REQUEST-FAILED-update-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getRequestLogger=\
-  getRequestLogger-FAILED-5001W|\
+REQUEST_FAILED_createNamespace=\
+  REQUEST-FAILED-createNamespace-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-evaluate=\
-  evaluate-FAILED-5001W|\
+REQUEST_FAILED_deleteNamespace=\
+  REQUEST-FAILED-deleteNamespace-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-update=\
-  update-FAILED-5001W|\
+REQUEST_FAILED_deployApp=\
+  REQUEST-FAILED-deployApp-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-createNamespace=\
-  createNamespace-FAILED-5001W|\
+REQUEST_FAILED_loadArtifact=\
+  REQUEST-FAILED-loadArtifact-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-deleteNamespace=\
-  deleteNamespace-FAILED-5001W|\
+REQUEST_FAILED_loadArtifactWithConfig=\
+  REQUEST-FAILED-loadArtifactWithConfig-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-deployApp=\
-  deployApp-FAILED-5001W|\
+REQUEST_FAILED_deleteArtifact=\
+  REQUEST-FAILED-deleteArtifact-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-loadArtifact=\
-  loadArtifact-FAILED-5001W|\
+REQUEST_FAILED_startFlow=\
+  REQUEST-FAILED-startFlow-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-deleteArtifact=\
-  deleteArtifact-FAILED-5001W|\
+REQUEST_FAILED_startWorker=\
+  REQUEST-FAILED-startWorker-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-startFlow=\
-  startFlow-FAILED-5001W|\
+REQUEST_FAILED_startService=\
+  REQUEST-FAILED-startService-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-startWorker=\
-  startWorker-FAILED-5001W|\
+REQUEST_FAILED_startApp=\
+  REQUEST-FAILED-startApp-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-startService=\
-  startService-FAILED-5001W|\
+REQUEST_FAILED_stopApp=\
+  REQUEST-FAILED-stopApp-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-startApp=\
-  startApp-FAILED-5001W|\
+REQUEST_FAILED_deleteApp=\
+  REQUEST-FAILED-deleteApp-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-stopApp=\
-  stopApp-FAILED-5001W|\
+REQUEST_FAILED_loadPreferencesApp=\
+  REQUEST-FAILED-loadPreferencesApp-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-deleteApp=\
-  deleteApp-FAILED-5001W|\
+REQUEST_FAILED_loadPreferencesFlow=\
+  REQUEST-FAILED-loadPreferencesFlow-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-loadPreferencesApp=\
-  loadPreferencesApp-FAILED-5001W|\
+REQUEST_FAILED_loadPreferencesNameSpace=\
+  REQUEST-FAILED-loadPreferencesNameSpace-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-loadPreferencesFlow=\
-  loadPreferencesFlow-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesApp=\
+  REQUEST-FAILED-setPreferencesApp-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-loadPreferencesNameSpace=\
-  loadPreferencesNameSpace-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesFlow=\
+  REQUEST-FAILED-setPreferencesFlow-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setPreferencesApp=\
-  setPreferencesApp-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesWorker=\
+  REQUEST-FAILED-setPreferencesWorker-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setPreferencesFlow=\
-  setPreferencesFlow-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesService=\
+  REQUEST-FAILED-setPreferencesService-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setPreferencesWorker=\
-  setPreferencesWorker-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesNameSpace=\
+  REQUEST-FAILED-setPreferencesNameSpace-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setPreferencesService=\
-  setPreferencesService-FAILED-5001W|\
+REQUEST_FAILED_setFlowRunTimeArgs=\
+  REQUEST-FAILED-setFlowRunTimeArgs-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setPreferencesNameSpace=\
-  setPreferencesNameSpace-FAILED-5001W|\
+REQUEST_FAILED_setFlowletInstances=\
+  REQUEST-FAILED-setFlowletInstances-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setFlowRunTimeArgs=\
-  setFlowRunTimeArgs-FAILED-5001W|\
+REQUEST_FAILED_stopFlow=\
+  REQUEST-FAILED-stopFlow-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setFlowletInstances=\
-  setFlowletInstances-FAILED-5001W|\
+REQUEST_FAILED_stopWorker=\
+  REQUEST-FAILED-stopWorker-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-stopFlow=\
-  stopFlow-FAILED-5001W|\
+REQUEST_FAILED_stopService=\
+  REQUEST-FAILED-stopService-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-stopWorker=\
-  stopWorker-FAILED-5001W|\
+REQUEST_FAILED_truncateDataSet=\
+  REQUEST-FAILED-truncateDataSet-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-stopService=\
-  stopService-FAILED-5001W|\
+REQUEST_FAILED_deleteDataset=\
+  REQUEST-FAILED-deleteDataset-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-truncateDataSet=\
-  truncateDataSet-FAILED-5001W|\
+REQUEST_FAILED_createStream=\
+  REQUEST-FAILED-createStream-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-deleteDataset=\
-  deleteDataset-FAILED-5001W|\
+REQUEST_FAILED_deleteStream=\
+  REQUEST-FAILED-deleteStream-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-createStream=\
-  createStream-FAILED-5001W|\
+REQUEST_FAILED_getStreamEvents=\
+  REQUEST-FAILED-getStreamEvents-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-deleteStream=\
-  deleteStream-FAILED-5001W|\
+REQUEST_FAILED_getStreamStats=\
+  REQUEST-FAILED-getStreamStats-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getStreamEvents=\
-  getStreamEvents-FAILED-5001W|\
+REQUEST_FAILED_sendEventToStream=\
+  REQUEST-FAILED-sendEventToStream-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getStreamStats=\
-  getStreamStats-FAILED-5001W|\
+REQUEST_FAILED_trucateStream=\
+  REQUEST-FAILED-trucateStream-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-sendEventToStream=\
-  sendEventToStream-FAILED-5001W|\
+REQUEST_FAILED_setStreamProperties=\
+  REQUEST-FAILED-setStreamProperties-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-trucateStream=\
-  trucateStream-FAILED-5001W|\
+REQUEST_FAILED_restartApp=\
+  REQUEST-FAILED-restartApp-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setStreamProperties=\
-  setStreamProperties-FAILED-5001W|\
+REQUEST_FAILED_createApp=\
+  REQUEST-FAILED-createApp-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-restartApp=\
-  restartApp-FAILED-5001W|\
+REQUEST_FAILED_createAppWithConfig=\
+  REQUEST-FAILED-createAppWithConfig-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-createApp=\
-  createApp-FAILED-5001W|\
+REQUEST_FAILED_setDatasetProperties=\
+  REQUEST-FAILED-setDatasetProperties-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-createAppWithConfig=\
-  createAppWithConfig-FAILED-5001W|\
+REQUEST_FAILED_setStreamTTL=\
+  REQUEST-FAILED-setStreamTTL-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setDatasetProperties=\
-  setDatasetProperties-FAILED-5001W|\
+REQUEST_FAILED_suspendSchedule=\
+  REQUEST-FAILED-suspendSchedule-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setStreamTTL=\
-  setStreamTTL-FAILED-5001W|\
+REQUEST_FAILED_resumeSchedule=\
+  REQUEST-FAILED-resumeSchedule-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
+  {0}|\
+  null|\
+  Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_logs=\
+  REMOTE-CALL-FAILED-logs-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_metrics=\
+  REMOTE-CALL-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_properties=\
+  REMOTE-CALL-FAILED-properties-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_logs=\
-  REMOTE-logs-FAILED-5001W|\
+REMOTE_CALL_FAILED_uploadInfo=\
+  REMOTE-CALL-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_metrics=\
-  REMOTE-metrics-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValues=\
+  REMOTE-CALL-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_properties=\
-  REMOTE-properties-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValuesAll=\
+  REMOTE-CALL-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_uploadInfo=\
-  REMOTE-uploadInfo-FAILED-5001W|\
+REMOTE_CALL_FAILED_getMessages=\
+  REMOTE-CALL-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValues=\
-  REMOTE-getValues-FAILED-5001W|\
+REMOTE_CALL_FAILED_getRequestLogger=\
+  REMOTE-CALL-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValuesAll=\
-  REMOTE-getValuesAll-FAILED-5001W|\
+REMOTE_CALL_FAILED_evaluate=\
+  REMOTE-CALL-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getMessages=\
-  REMOTE-getMessages-FAILED-5001W|\
+REMOTE_CALL_FAILED_update=\
+  REMOTE-CALL-FAILED-update-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getRequestLogger=\
-  REMOTE-getRequestLogger-FAILED-5001W|\
+REMOTE_CALL_FAILED_createNamespace=\
+  REMOTE-CALL-FAILED-createNamespace-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_evaluate=\
-  REMOTE-evaluate-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteNamespace=\
+  REMOTE-CALL-FAILED-deleteNamespace-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_update=\
-  REMOTE-update-FAILED-5001W|\
+REMOTE_CALL_FAILED_deployApp=\
+  REMOTE-CALL-FAILED-deployApp-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_createNamespace=\
-  REMOTE-createNamespace-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadArtifact=\
+  REMOTE-CALL-FAILED-loadArtifact-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_deleteNamespace=\
-  REMOTE-deleteNamespace-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadArtifactWithConfig=\
+  REMOTE-CALL-FAILED-loadArtifactWithConfig-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_deployApp=\
-  REMOTE-deployApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteArtifact=\
+  REMOTE-CALL-FAILED-deleteArtifact-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_loadArtifact=\
-  REMOTE-loadArtifact-FAILED-5001W|\
+REMOTE_CALL_FAILED_startFlow=\
+  REMOTE-CALL-FAILED-startFlow-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_deleteArtifact=\
-  REMOTE-deleteArtifact-FAILED-5001W|\
+REMOTE_CALL_FAILED_startWorker=\
+  REMOTE-CALL-FAILED-startWorker-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_startFlow=\
-  REMOTE-startFlow-FAILED-5001W|\
+REMOTE_CALL_FAILED_startService=\
+  REMOTE-CALL-FAILED-startService-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_startWorker=\
-  REMOTE-startWorker-FAILED-5001W|\
+REMOTE_CALL_FAILED_startApp=\
+  REMOTE-CALL-FAILED-startApp-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_startService=\
-  REMOTE-startService-FAILED-5001W|\
+REMOTE_CALL_FAILED_stopApp=\
+  REMOTE-CALL-FAILED-stopApp-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_startApp=\
-  REMOTE-startApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteApp=\
+  REMOTE-CALL-FAILED-deleteApp-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_stopApp=\
-  REMOTE-stopApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadPreferencesApp=\
+  REMOTE-CALL-FAILED-loadPreferencesApp-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_deleteApp=\
-  REMOTE-deleteApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadPreferencesFlow=\
+  REMOTE-CALL-FAILED-loadPreferencesFlow-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_loadPreferencesApp=\
-  REMOTE-loadPreferencesApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadPreferencesNameSpace=\
+  REMOTE-CALL-FAILED-loadPreferencesNameSpace-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_loadPreferencesFlow=\
-  REMOTE-loadPreferencesFlow-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesApp=\
+  REMOTE-CALL-FAILED-setPreferencesApp-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_loadPreferencesNameSpace=\
-  REMOTE-loadPreferencesNameSpace-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesFlow=\
+  REMOTE-CALL-FAILED-setPreferencesFlow-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setPreferencesApp=\
-  REMOTE-setPreferencesApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesWorker=\
+  REMOTE-CALL-FAILED-setPreferencesWorker-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setPreferencesFlow=\
-  REMOTE-setPreferencesFlow-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesService=\
+  REMOTE-CALL-FAILED-setPreferencesService-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setPreferencesWorker=\
-  REMOTE-setPreferencesWorker-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesNameSpace=\
+  REMOTE-CALL-FAILED-setPreferencesNameSpace-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setPreferencesService=\
-  REMOTE-setPreferencesService-FAILED-5001W|\
+REMOTE_CALL_FAILED_setFlowRunTimeArgs=\
+  REMOTE-CALL-FAILED-setFlowRunTimeArgs-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setPreferencesNameSpace=\
-  REMOTE-setPreferencesNameSpace-FAILED-5001W|\
+REMOTE_CALL_FAILED_setFlowletInstances=\
+  REMOTE-CALL-FAILED-setFlowletInstances-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setFlowRunTimeArgs=\
-  REMOTE-setFlowRunTimeArgs-FAILED-5001W|\
+REMOTE_CALL_FAILED_stopFlow=\
+  REMOTE-CALL-FAILED-stopFlow-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setFlowletInstances=\
-  REMOTE-setFlowletInstances-FAILED-5001W|\
+REMOTE_CALL_FAILED_stopWorker=\
+  REMOTE-CALL-FAILED-stopWorker-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_stopFlow=\
-  REMOTE-stopFlow-FAILED-5001W|\
+REMOTE_CALL_FAILED_stopService=\
+  REMOTE-CALL-FAILED-stopService-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_stopWorker=\
-  REMOTE-stopWorker-FAILED-5001W|\
+REMOTE_CALL_FAILED_truncateDataSet=\
+  REMOTE-CALL-FAILED-truncateDataSet-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_stopService=\
-  REMOTE-stopService-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteDataset=\
+  REMOTE-CALL-FAILED-deleteDataset-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_truncateDataSet=\
-  REMOTE-truncateDataSet-FAILED-5001W|\
+REMOTE_CALL_FAILED_createStream=\
+  REMOTE-CALL-FAILED-createStream-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_deleteDataset=\
-  REMOTE-deleteDataset-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteStream=\
+  REMOTE-CALL-FAILED-deleteStream-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_createStream=\
-  REMOTE-createStream-FAILED-5001W|\
+REMOTE_CALL_FAILED_getStreamEvents=\
+  REMOTE-CALL-FAILED-getStreamEvents-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_deleteStream=\
-  REMOTE-deleteStream-FAILED-5001W|\
+REMOTE_CALL_FAILED_getStreamStats=\
+  REMOTE-CALL-FAILED-getStreamStats-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getStreamEvents=\
-  REMOTE-getStreamEvents-FAILED-5001W|\
+REMOTE_CALL_FAILED_sendEventToStream=\
+  REMOTE-CALL-FAILED-sendEventToStream-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getStreamStats=\
-  REMOTE-getStreamStats-FAILED-5001W|\
+REMOTE_CALL_FAILED_trucateStream=\
+  REMOTE-CALL-FAILED-trucateStream-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_sendEventToStream=\
-  REMOTE-sendEventToStream-FAILED-5001W|\
+REMOTE_CALL_FAILED_setStreamProperties=\
+  REMOTE-CALL-FAILED-setStreamProperties-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_trucateStream=\
-  REMOTE-trucateStream-FAILED-5001W|\
+REMOTE_CALL_FAILED_restartApp=\
+  REMOTE-CALL-FAILED-restartApp-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setStreamProperties=\
-  REMOTE-setStreamProperties-FAILED-5001W|\
+REMOTE_CALL_FAILED_createApp=\
+  REMOTE-CALL-FAILED-createApp-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_restartApp=\
-  REMOTE-restartApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_createAppWithConfig=\
+  REMOTE-CALL-FAILED-createAppWithConfig-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_createApp=\
-  REMOTE-createApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_setDatasetProperties=\
+  REMOTE-CALL-FAILED-setDatasetProperties-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_createAppWithConfig=\
-  REMOTE-createAppWithConfig-FAILED-5001W|\
+REMOTE_CALL_FAILED_setStreamTTL=\
+  REMOTE-CALL-FAILED-setStreamTTL-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setDatasetProperties=\
-  REMOTE-setDatasetProperties-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspendSchedule=\
+  REMOTE-CALL-FAILED-suspendSchedule-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setStreamTTL=\
-  REMOTE-setStreamTTL-FAILED-5001W|\
+REMOTE_CALL_FAILED_resumeSchedule=\
+  REMOTE-CALL-FAILED-resumeSchedule-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManagerMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManagerMessageEnum.java
index d632aa7..ade48c7 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManagerMessageEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,116 +7,122 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum CdapClusterManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  createNamespace,
-  deleteNamespace,
-  deployApp,
-  loadArtifact,
-  deleteArtifact,
-  startFlow,
-  startWorker,
-  startService,
-  startApp,
-  stopApp,
-  deleteApp,
-  loadPreferencesApp,
-  loadPreferencesFlow,
-  loadPreferencesNameSpace,
-  setPreferencesApp,
-  setPreferencesFlow,
-  setPreferencesWorker,
-  setPreferencesService,
-  setPreferencesNameSpace,
-  setFlowRunTimeArgs,
-  setFlowletInstances,
-  stopFlow,
-  stopWorker,
-  stopService,
-  truncateDataSet,
-  deleteDataset,
-  createStream,
-  deleteStream,
-  getStreamEvents,
-  getStreamStats,
-  sendEventToStream,
-  trucateStream,
-  setStreamProperties,
-  restartApp,
-  createApp,
-  createAppWithConfig,
-  setDatasetProperties,
-  setStreamTTL,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update,
-  REMOTE_createNamespace,
-  REMOTE_deleteNamespace,
-  REMOTE_deployApp,
-  REMOTE_loadArtifact,
-  REMOTE_deleteArtifact,
-  REMOTE_startFlow,
-  REMOTE_startWorker,
-  REMOTE_startService,
-  REMOTE_startApp,
-  REMOTE_stopApp,
-  REMOTE_deleteApp,
-  REMOTE_loadPreferencesApp,
-  REMOTE_loadPreferencesFlow,
-  REMOTE_loadPreferencesNameSpace,
-  REMOTE_setPreferencesApp,
-  REMOTE_setPreferencesFlow,
-  REMOTE_setPreferencesWorker,
-  REMOTE_setPreferencesService,
-  REMOTE_setPreferencesNameSpace,
-  REMOTE_setFlowRunTimeArgs,
-  REMOTE_setFlowletInstances,
-  REMOTE_stopFlow,
-  REMOTE_stopWorker,
-  REMOTE_stopService,
-  REMOTE_truncateDataSet,
-  REMOTE_deleteDataset,
-  REMOTE_createStream,
-  REMOTE_deleteStream,
-  REMOTE_getStreamEvents,
-  REMOTE_getStreamStats,
-  REMOTE_sendEventToStream,
-  REMOTE_trucateStream,
-  REMOTE_setStreamProperties,
-  REMOTE_restartApp,
-  REMOTE_createApp,
-  REMOTE_createAppWithConfig,
-  REMOTE_setDatasetProperties,
-  REMOTE_setStreamTTL;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REQUEST_FAILED_logs,
+  REQUEST_FAILED_metrics,
+  REQUEST_FAILED_properties,
+  REQUEST_FAILED_uploadInfo,
+  REQUEST_FAILED_getValues,
+  REQUEST_FAILED_getValuesAll,
+  REQUEST_FAILED_getMessages,
+  REQUEST_FAILED_getRequestLogger,
+  REQUEST_FAILED_evaluate,
+  REQUEST_FAILED_update,
+  REQUEST_FAILED_createNamespace,
+  REQUEST_FAILED_deleteNamespace,
+  REQUEST_FAILED_deployApp,
+  REQUEST_FAILED_loadArtifact,
+  REQUEST_FAILED_loadArtifactWithConfig,
+  REQUEST_FAILED_deleteArtifact,
+  REQUEST_FAILED_startFlow,
+  REQUEST_FAILED_startWorker,
+  REQUEST_FAILED_startService,
+  REQUEST_FAILED_startApp,
+  REQUEST_FAILED_stopApp,
+  REQUEST_FAILED_deleteApp,
+  REQUEST_FAILED_loadPreferencesApp,
+  REQUEST_FAILED_loadPreferencesFlow,
+  REQUEST_FAILED_loadPreferencesNameSpace,
+  REQUEST_FAILED_setPreferencesApp,
+  REQUEST_FAILED_setPreferencesFlow,
+  REQUEST_FAILED_setPreferencesWorker,
+  REQUEST_FAILED_setPreferencesService,
+  REQUEST_FAILED_setPreferencesNameSpace,
+  REQUEST_FAILED_setFlowRunTimeArgs,
+  REQUEST_FAILED_setFlowletInstances,
+  REQUEST_FAILED_stopFlow,
+  REQUEST_FAILED_stopWorker,
+  REQUEST_FAILED_stopService,
+  REQUEST_FAILED_truncateDataSet,
+  REQUEST_FAILED_deleteDataset,
+  REQUEST_FAILED_createStream,
+  REQUEST_FAILED_deleteStream,
+  REQUEST_FAILED_getStreamEvents,
+  REQUEST_FAILED_getStreamStats,
+  REQUEST_FAILED_sendEventToStream,
+  REQUEST_FAILED_trucateStream,
+  REQUEST_FAILED_setStreamProperties,
+  REQUEST_FAILED_restartApp,
+  REQUEST_FAILED_createApp,
+  REQUEST_FAILED_createAppWithConfig,
+  REQUEST_FAILED_setDatasetProperties,
+  REQUEST_FAILED_setStreamTTL,
+  REQUEST_FAILED_suspendSchedule,
+  REQUEST_FAILED_resumeSchedule,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_logs,
+  REMOTE_CALL_FAILED_metrics,
+  REMOTE_CALL_FAILED_properties,
+  REMOTE_CALL_FAILED_uploadInfo,
+  REMOTE_CALL_FAILED_getValues,
+  REMOTE_CALL_FAILED_getValuesAll,
+  REMOTE_CALL_FAILED_getMessages,
+  REMOTE_CALL_FAILED_getRequestLogger,
+  REMOTE_CALL_FAILED_evaluate,
+  REMOTE_CALL_FAILED_update,
+  REMOTE_CALL_FAILED_createNamespace,
+  REMOTE_CALL_FAILED_deleteNamespace,
+  REMOTE_CALL_FAILED_deployApp,
+  REMOTE_CALL_FAILED_loadArtifact,
+  REMOTE_CALL_FAILED_loadArtifactWithConfig,
+  REMOTE_CALL_FAILED_deleteArtifact,
+  REMOTE_CALL_FAILED_startFlow,
+  REMOTE_CALL_FAILED_startWorker,
+  REMOTE_CALL_FAILED_startService,
+  REMOTE_CALL_FAILED_startApp,
+  REMOTE_CALL_FAILED_stopApp,
+  REMOTE_CALL_FAILED_deleteApp,
+  REMOTE_CALL_FAILED_loadPreferencesApp,
+  REMOTE_CALL_FAILED_loadPreferencesFlow,
+  REMOTE_CALL_FAILED_loadPreferencesNameSpace,
+  REMOTE_CALL_FAILED_setPreferencesApp,
+  REMOTE_CALL_FAILED_setPreferencesFlow,
+  REMOTE_CALL_FAILED_setPreferencesWorker,
+  REMOTE_CALL_FAILED_setPreferencesService,
+  REMOTE_CALL_FAILED_setPreferencesNameSpace,
+  REMOTE_CALL_FAILED_setFlowRunTimeArgs,
+  REMOTE_CALL_FAILED_setFlowletInstances,
+  REMOTE_CALL_FAILED_stopFlow,
+  REMOTE_CALL_FAILED_stopWorker,
+  REMOTE_CALL_FAILED_stopService,
+  REMOTE_CALL_FAILED_truncateDataSet,
+  REMOTE_CALL_FAILED_deleteDataset,
+  REMOTE_CALL_FAILED_createStream,
+  REMOTE_CALL_FAILED_deleteStream,
+  REMOTE_CALL_FAILED_getStreamEvents,
+  REMOTE_CALL_FAILED_getStreamStats,
+  REMOTE_CALL_FAILED_sendEventToStream,
+  REMOTE_CALL_FAILED_trucateStream,
+  REMOTE_CALL_FAILED_setStreamProperties,
+  REMOTE_CALL_FAILED_restartApp,
+  REMOTE_CALL_FAILED_createApp,
+  REMOTE_CALL_FAILED_createAppWithConfig,
+  REMOTE_CALL_FAILED_setDatasetProperties,
+  REMOTE_CALL_FAILED_setStreamTTL,
+  REMOTE_CALL_FAILED_suspendSchedule,
+  REMOTE_CALL_FAILED_resumeSchedule;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.logging.CdapClusterManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManager");
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManagerOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManagerOperationEnum.java
index 64bca0c..ba80c70 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManagerOperationEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/manager/logging/CdapClusterManagerOperationEnum.java
@@ -1,137 +1,78 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum CdapClusterManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  createNamespace,
-  deleteNamespace,
-  deployApp,
-  loadArtifact,
-  deleteArtifact,
-  startFlow,
-  startWorker,
-  startService,
-  startApp,
-  stopApp,
-  deleteApp,
-  loadPreferencesApp,
-  loadPreferencesFlow,
-  loadPreferencesNameSpace,
-  setPreferencesApp,
-  setPreferencesFlow,
-  setPreferencesWorker,
-  setPreferencesService,
-  setPreferencesNameSpace,
-  setFlowRunTimeArgs,
-  setFlowletInstances,
-  stopFlow,
-  stopWorker,
-  stopService,
-  truncateDataSet,
-  deleteDataset,
-  createStream,
-  deleteStream,
-  getStreamEvents,
-  getStreamStats,
-  sendEventToStream,
-  trucateStream,
-  setStreamProperties,
-  restartApp,
-  createApp,
-  createAppWithConfig,
-  setDatasetProperties,
-  setStreamTTL,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update,
-  REMOTE_createNamespace,
-  REMOTE_deleteNamespace,
-  REMOTE_deployApp,
-  REMOTE_loadArtifact,
-  REMOTE_deleteArtifact,
-  REMOTE_startFlow,
-  REMOTE_startWorker,
-  REMOTE_startService,
-  REMOTE_startApp,
-  REMOTE_stopApp,
-  REMOTE_deleteApp,
-  REMOTE_loadPreferencesApp,
-  REMOTE_loadPreferencesFlow,
-  REMOTE_loadPreferencesNameSpace,
-  REMOTE_setPreferencesApp,
-  REMOTE_setPreferencesFlow,
-  REMOTE_setPreferencesWorker,
-  REMOTE_setPreferencesService,
-  REMOTE_setPreferencesNameSpace,
-  REMOTE_setFlowRunTimeArgs,
-  REMOTE_setFlowletInstances,
-  REMOTE_stopFlow,
-  REMOTE_stopWorker,
-  REMOTE_stopService,
-  REMOTE_truncateDataSet,
-  REMOTE_deleteDataset,
-  REMOTE_createStream,
-  REMOTE_deleteStream,
-  REMOTE_getStreamEvents,
-  REMOTE_getStreamStats,
-  REMOTE_sendEventToStream,
-  REMOTE_trucateStream,
-  REMOTE_setStreamProperties,
-  REMOTE_restartApp,
-  REMOTE_createApp,
-  REMOTE_createAppWithConfig,
-  REMOTE_setDatasetProperties,
-  REMOTE_setStreamTTL;
+  CdapClusterManager_test("CdapClusterManager@test"),
+  CdapClusterManager_suspend("CdapClusterManager@suspend"),
+  CdapClusterManager_resume("CdapClusterManager@resume"),
+  CdapClusterManager_publicKey("CdapClusterManager@publicKey"),
+  CdapClusterManager_configurationChanged("CdapClusterManager@configurationChanged"),
+  CdapClusterManager_updateStreams("CdapClusterManager@updateStreams"),
+  CdapClusterManager_logs("CdapClusterManager@logs"),
+  CdapClusterManager_metrics("CdapClusterManager@metrics"),
+  CdapClusterManager_properties("CdapClusterManager@properties"),
+  CdapClusterManager_uploadInfo("CdapClusterManager@uploadInfo"),
+  CdapClusterManager_getValues("CdapClusterManager@getValues"),
+  CdapClusterManager_getValuesAll("CdapClusterManager@getValuesAll"),
+  CdapClusterManager_getMessages("CdapClusterManager@getMessages"),
+  CdapClusterManager_getRequestLogger("CdapClusterManager@getRequestLogger"),
+  CdapClusterManager_evaluate("CdapClusterManager@evaluate"),
+  CdapClusterManager_update("CdapClusterManager@update"),
+  CdapClusterManager_createNamespace("CdapClusterManager@createNamespace"),
+  CdapClusterManager_deleteNamespace("CdapClusterManager@deleteNamespace"),
+  CdapClusterManager_deployApp("CdapClusterManager@deployApp"),
+  CdapClusterManager_loadArtifact("CdapClusterManager@loadArtifact"),
+  CdapClusterManager_loadArtifactWithConfig("CdapClusterManager@loadArtifactWithConfig"),
+  CdapClusterManager_deleteArtifact("CdapClusterManager@deleteArtifact"),
+  CdapClusterManager_startFlow("CdapClusterManager@startFlow"),
+  CdapClusterManager_startWorker("CdapClusterManager@startWorker"),
+  CdapClusterManager_startService("CdapClusterManager@startService"),
+  CdapClusterManager_startApp("CdapClusterManager@startApp"),
+  CdapClusterManager_stopApp("CdapClusterManager@stopApp"),
+  CdapClusterManager_deleteApp("CdapClusterManager@deleteApp"),
+  CdapClusterManager_loadPreferencesApp("CdapClusterManager@loadPreferencesApp"),
+  CdapClusterManager_loadPreferencesFlow("CdapClusterManager@loadPreferencesFlow"),
+  CdapClusterManager_loadPreferencesNameSpace("CdapClusterManager@loadPreferencesNameSpace"),
+  CdapClusterManager_setPreferencesApp("CdapClusterManager@setPreferencesApp"),
+  CdapClusterManager_setPreferencesFlow("CdapClusterManager@setPreferencesFlow"),
+  CdapClusterManager_setPreferencesWorker("CdapClusterManager@setPreferencesWorker"),
+  CdapClusterManager_setPreferencesService("CdapClusterManager@setPreferencesService"),
+  CdapClusterManager_setPreferencesNameSpace("CdapClusterManager@setPreferencesNameSpace"),
+  CdapClusterManager_setFlowRunTimeArgs("CdapClusterManager@setFlowRunTimeArgs"),
+  CdapClusterManager_setFlowletInstances("CdapClusterManager@setFlowletInstances"),
+  CdapClusterManager_stopFlow("CdapClusterManager@stopFlow"),
+  CdapClusterManager_stopWorker("CdapClusterManager@stopWorker"),
+  CdapClusterManager_stopService("CdapClusterManager@stopService"),
+  CdapClusterManager_truncateDataSet("CdapClusterManager@truncateDataSet"),
+  CdapClusterManager_deleteDataset("CdapClusterManager@deleteDataset"),
+  CdapClusterManager_createStream("CdapClusterManager@createStream"),
+  CdapClusterManager_deleteStream("CdapClusterManager@deleteStream"),
+  CdapClusterManager_getStreamEvents("CdapClusterManager@getStreamEvents"),
+  CdapClusterManager_getStreamStats("CdapClusterManager@getStreamStats"),
+  CdapClusterManager_sendEventToStream("CdapClusterManager@sendEventToStream"),
+  CdapClusterManager_trucateStream("CdapClusterManager@trucateStream"),
+  CdapClusterManager_setStreamProperties("CdapClusterManager@setStreamProperties"),
+  CdapClusterManager_restartApp("CdapClusterManager@restartApp"),
+  CdapClusterManager_createApp("CdapClusterManager@createApp"),
+  CdapClusterManager_createAppWithConfig("CdapClusterManager@createAppWithConfig"),
+  CdapClusterManager_setDatasetProperties("CdapClusterManager@setDatasetProperties"),
+  CdapClusterManager_setStreamTTL("CdapClusterManager@setStreamTTL"),
+  CdapClusterManager_suspendSchedule("CdapClusterManager@suspendSchedule"),
+  CdapClusterManager_resumeSchedule("CdapClusterManager@resumeSchedule") ; 
+
+
+	private String n;
+	
+	private CdapClusterManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterService.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterService.java
index e805e70..a061037 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterService.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterService.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.cdap.cluster.servers.service;
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.cdap.cluster.servers.service.logging.CdapClusterServiceOperationEnum;
+import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.logging.CdapClusterServiceMessageEnum;
 
 
 
@@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClust
 
 
 
-public class DcaeCdapClusterService extends CdapClusterServiceImpl implements ISiriusPlugin {
+public class DcaeCdapClusterService extends CdapClusterServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeCdapClusterService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeCdapClusterServiceProvider controller;
 	ISiriusServer server;
 
@@ -68,8 +78,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.deploy);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -78,7 +88,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.undeploy);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -103,7 +116,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_test,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -128,7 +144,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -153,7 +172,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_resume,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -178,7 +200,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -193,8 +218,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.pushManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -203,7 +228,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -218,8 +246,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.pollManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -228,7 +256,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -243,8 +274,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.managerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -253,7 +284,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -268,8 +302,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.managerOperation);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -278,7 +312,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -293,8 +330,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.updateConfigurationFromPolicy);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -303,7 +340,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -318,8 +358,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.runHealthTests);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -328,7 +368,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -343,8 +386,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.updateDeploymentStatus);
+		ecomplogger.recordAuditEventStartIfNeeded(CdapClusterServiceOperationEnum.CdapClusterService_updateDeploymentStatus,server,this);
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_updateDeploymentStatus,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateDeploymentStatus();
 		}
@@ -353,7 +396,10 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 =  EcompException.create(CdapClusterServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -367,6 +413,8 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -375,7 +423,7 @@ public class DcaeCdapClusterService extends CdapClusterServiceImpl implements IS
 	public static void ecoreSetup() {
 		DcaeCdapClusterServiceProvider.ecoreSetup();
 	}
-	public DcaeCdapClusterServiceProvider getSomfProvider() {
+	public DcaeCdapClusterServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterServiceClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterServiceClient.java
index 102cacd..ff1917e 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterServiceClient.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 		DcaeCdapClusterService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeCdapClusterServiceClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeCdapClusterServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_deploy);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed:  deploy", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_undeploy);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed:  undeploy", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_test);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -122,16 +130,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_suspend);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -139,16 +148,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_resume);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pushManagerConfiguration", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pollManagerConfiguration", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  managerConfiguration", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -207,16 +220,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed:  managerOperation", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed:  updateConfigurationFromPolicy", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public void runHealthTests() {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed:  runHealthTests", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -258,16 +274,17 @@ public class DcaeCdapClusterServiceClient extends CdapClusterServiceImpl {
 
 	@Override
 	public void updateDeploymentStatus() {
-		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CdapClusterServiceOperationEnum.REMOTE_updateDeploymentStatus);
+		EClass c = ServicePackage.eINSTANCE.getCdapClusterService(); 
+		ecomplogger.recordMetricEventStart(CdapClusterServiceOperationEnum.CdapClusterService_updateDeploymentStatus,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateDeploymentStatus", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_updateDeploymentStatus, e.toString());
-			throw new RuntimeException("remote call failed:  updateDeploymentStatus", e);
+			ecomplogger.warn(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 = EcompException.create(CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterServiceServer.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterServiceServer.java
index 69ba3f6..4e45f0f 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterServiceServer.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/DcaeCdapClusterServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.cdap.cluster.servers.service;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterSer
 
 
 
-public class DcaeCdapClusterServiceServer implements ISiriusServer {
+public class DcaeCdapClusterServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeCdapClusterServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeCdapClusterServiceServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "CdapClusterService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
         server.addRuntimeFactories(this);
@@ -73,6 +73,7 @@ public class DcaeCdapClusterServiceServer implements ISiriusServer {
         controller = (DcaeCdapClusterService) server.find("/").o;
         webServer = new Jetty8Server("service.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -95,4 +96,17 @@ public class DcaeCdapClusterServiceServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterService.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterService.properties
index d32cf07..1218d2a 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterService.properties
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterService.properties
@@ -1,150 +1,150 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateDeploymentStatus=\
-  updateDeploymentStatus-FAILED-5001W|\
+REQUEST_FAILED_updateDeploymentStatus=\
+  REQUEST-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateDeploymentStatus=\
-  REMOTE-updateDeploymentStatus-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateDeploymentStatus=\
+  REMOTE-CALL-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterServiceMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterServiceMessageEnum.java
index 9ed14d2..d54c19a 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterServiceMessageEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.cdap.cluster.servers.service.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,32 +7,32 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum CdapClusterServiceMessageEnum 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;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REQUEST_FAILED_updateDeploymentStatus,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_updateDeploymentStatus;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.cdap.cluster.servers.service.logging.CdapClusterService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterService");
 	}
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterServiceOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterServiceOperationEnum.java
index b105151..592d36d 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterServiceOperationEnum.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/cdap/cluster/servers/service/logging/CdapClusterServiceOperationEnum.java
@@ -1,53 +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.service.cdap.cluster.servers.service.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum CdapClusterServiceOperationEnum 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;
+  CdapClusterService_deploy("CdapClusterService@deploy"),
+  CdapClusterService_undeploy("CdapClusterService@undeploy"),
+  CdapClusterService_test("CdapClusterService@test"),
+  CdapClusterService_suspend("CdapClusterService@suspend"),
+  CdapClusterService_resume("CdapClusterService@resume"),
+  CdapClusterService_pushManagerConfiguration("CdapClusterService@pushManagerConfiguration"),
+  CdapClusterService_pollManagerConfiguration("CdapClusterService@pollManagerConfiguration"),
+  CdapClusterService_managerConfiguration("CdapClusterService@managerConfiguration"),
+  CdapClusterService_managerOperation("CdapClusterService@managerOperation"),
+  CdapClusterService_updateConfigurationFromPolicy("CdapClusterService@updateConfigurationFromPolicy"),
+  CdapClusterService_runHealthTests("CdapClusterService@runHealthTests"),
+  CdapClusterService_updateDeploymentStatus("CdapClusterService@updateDeploymentStatus") ; 
+
+
+	private String n;
+	
+	private CdapClusterServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.classpath b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.classpath
index 69b19c6..d86c4cf 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.classpath
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.classpath
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/xcore">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/xcore-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/xcore-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.project b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.project
index 8a12b36..257e0c2 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.project
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.core.resources.prefs b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..447ff97
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/xcore=UTF-8
+encoding//src/main/xcore-gen=UTF-8
+encoding/<project>=UTF-8
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..ec4300d 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.jdt.core.prefs
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/META-INF/MANIFEST.MF b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/META-INF/MANIFEST.MF
index b51eaa7..3da1e29 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/META-INF/MANIFEST.MF
@@ -16,15 +16,5 @@ Export-Package: org.openecomp.dcae.controller.service.cdap.cluster.manager,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.ecore.xcore.lib,
- dcae-controller-core-model;visibility:=reexport,
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-openstack-model;visibility:=reexport,
- ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- dcae-controller-service-vm-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-sirius-manager-agent-model;visibility:=reexport,
- dcae-controller-service-cdap-cluster-model;visibility:=reexport,
- ncomp-cdap-model;bundle-version="0.1.0";visibility:=reexport
+ org.eclipse.emf.ecore.xcore.lib
 Bundle-ActivationPolicy: lazy
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java
index 8523dea..90aeb8f 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/ManagerPackage.java
@@ -39,6 +39,24 @@ import org.eclipse.emf.ecore.EPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.cdap.cluster.manager.ManagerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.cdap.cluster'"
@@ -133,13 +151,40 @@ public interface ManagerPackage extends EPackage {
 	int CDAP_CLUSTER_MANAGER__CLUSTER = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Cdap Service Servers</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Health Check Script</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Test Timeout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_MANAGER__TEST_TIMEOUT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 3;
+
+	/**
 	 * The number of structural features of the '<em>Cdap Cluster Manager</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER_FEATURE_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 1;
+	int CDAP_CLUSTER_MANAGER_FEATURE_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_FEATURE_COUNT + 4;
 
 	/**
 	 * The operation id for the '<em>Test</em>' operation.
@@ -322,13 +367,22 @@ public interface ManagerPackage extends EPackage {
 	int CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 3;
 
 	/**
+	 * The operation id for the '<em>Load Artifact With Config</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 4;
+
+	/**
 	 * The operation id for the '<em>Delete Artifact</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___DELETE_ARTIFACT__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 4;
+	int CDAP_CLUSTER_MANAGER___DELETE_ARTIFACT__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 5;
 
 	/**
 	 * The operation id for the '<em>Start Flow</em>' operation.
@@ -337,7 +391,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___START_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 5;
+	int CDAP_CLUSTER_MANAGER___START_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 6;
 
 	/**
 	 * The operation id for the '<em>Start Worker</em>' operation.
@@ -346,7 +400,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___START_WORKER__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 6;
+	int CDAP_CLUSTER_MANAGER___START_WORKER__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 7;
 
 	/**
 	 * The operation id for the '<em>Start Service</em>' operation.
@@ -355,7 +409,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___START_SERVICE__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 7;
+	int CDAP_CLUSTER_MANAGER___START_SERVICE__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 8;
 
 	/**
 	 * The operation id for the '<em>Start App</em>' operation.
@@ -364,7 +418,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___START_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 8;
+	int CDAP_CLUSTER_MANAGER___START_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 9;
 
 	/**
 	 * The operation id for the '<em>Stop App</em>' operation.
@@ -373,7 +427,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 9;
+	int CDAP_CLUSTER_MANAGER___STOP_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 10;
 
 	/**
 	 * The operation id for the '<em>Delete App</em>' operation.
@@ -382,7 +436,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___DELETE_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 10;
+	int CDAP_CLUSTER_MANAGER___DELETE_APP__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 11;
 
 	/**
 	 * The operation id for the '<em>Load Preferences App</em>' operation.
@@ -391,7 +445,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 11;
+	int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 12;
 
 	/**
 	 * The operation id for the '<em>Load Preferences Flow</em>' operation.
@@ -400,7 +454,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 12;
+	int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 13;
 
 	/**
 	 * The operation id for the '<em>Load Preferences Name Space</em>' operation.
@@ -409,7 +463,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_NAME_SPACE__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 13;
+	int CDAP_CLUSTER_MANAGER___LOAD_PREFERENCES_NAME_SPACE__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 14;
 
 	/**
 	 * The operation id for the '<em>Set Preferences App</em>' operation.
@@ -418,7 +472,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 14;
+	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 15;
 
 	/**
 	 * The operation id for the '<em>Set Preferences Flow</em>' operation.
@@ -427,7 +481,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 15;
+	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_FLOW__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 16;
 
 	/**
 	 * The operation id for the '<em>Set Preferences Worker</em>' operation.
@@ -436,7 +490,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_WORKER__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 16;
+	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_WORKER__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 17;
 
 	/**
 	 * The operation id for the '<em>Set Preferences Service</em>' operation.
@@ -445,7 +499,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_SERVICE__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 17;
+	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_SERVICE__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 18;
 
 	/**
 	 * The operation id for the '<em>Set Preferences Name Space</em>' operation.
@@ -454,7 +508,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_NAME_SPACE__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 18;
+	int CDAP_CLUSTER_MANAGER___SET_PREFERENCES_NAME_SPACE__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 19;
 
 	/**
 	 * The operation id for the '<em>Set Flow Run Time Args</em>' operation.
@@ -463,7 +517,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_FLOW_RUN_TIME_ARGS__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 19;
+	int CDAP_CLUSTER_MANAGER___SET_FLOW_RUN_TIME_ARGS__STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 20;
 
 	/**
 	 * The operation id for the '<em>Set Flowlet Instances</em>' operation.
@@ -472,7 +526,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_FLOWLET_INSTANCES__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 20;
+	int CDAP_CLUSTER_MANAGER___SET_FLOWLET_INSTANCES__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 21;
 
 	/**
 	 * The operation id for the '<em>Stop Flow</em>' operation.
@@ -481,7 +535,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___STOP_FLOW__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 21;
+	int CDAP_CLUSTER_MANAGER___STOP_FLOW__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 22;
 
 	/**
 	 * The operation id for the '<em>Stop Worker</em>' operation.
@@ -490,7 +544,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___STOP_WORKER__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 22;
+	int CDAP_CLUSTER_MANAGER___STOP_WORKER__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 23;
 
 	/**
 	 * The operation id for the '<em>Stop Service</em>' operation.
@@ -499,7 +553,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___STOP_SERVICE__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 23;
+	int CDAP_CLUSTER_MANAGER___STOP_SERVICE__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 24;
 
 	/**
 	 * The operation id for the '<em>Truncate Data Set</em>' operation.
@@ -508,7 +562,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___TRUNCATE_DATA_SET__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 24;
+	int CDAP_CLUSTER_MANAGER___TRUNCATE_DATA_SET__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 25;
 
 	/**
 	 * The operation id for the '<em>Delete Dataset</em>' operation.
@@ -517,7 +571,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___DELETE_DATASET__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 25;
+	int CDAP_CLUSTER_MANAGER___DELETE_DATASET__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 26;
 
 	/**
 	 * The operation id for the '<em>Create Stream</em>' operation.
@@ -526,7 +580,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___CREATE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 26;
+	int CDAP_CLUSTER_MANAGER___CREATE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 27;
 
 	/**
 	 * The operation id for the '<em>Delete Stream</em>' operation.
@@ -535,7 +589,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___DELETE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 27;
+	int CDAP_CLUSTER_MANAGER___DELETE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 28;
 
 	/**
 	 * The operation id for the '<em>Get Stream Events</em>' operation.
@@ -544,7 +598,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___GET_STREAM_EVENTS__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 28;
+	int CDAP_CLUSTER_MANAGER___GET_STREAM_EVENTS__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 29;
 
 	/**
 	 * The operation id for the '<em>Get Stream Stats</em>' operation.
@@ -553,7 +607,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___GET_STREAM_STATS__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 29;
+	int CDAP_CLUSTER_MANAGER___GET_STREAM_STATS__STRING_STRING_STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 30;
 
 	/**
 	 * The operation id for the '<em>Send Event To Stream</em>' operation.
@@ -562,7 +616,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SEND_EVENT_TO_STREAM__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 30;
+	int CDAP_CLUSTER_MANAGER___SEND_EVENT_TO_STREAM__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 31;
 
 	/**
 	 * The operation id for the '<em>Trucate Stream</em>' operation.
@@ -571,7 +625,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___TRUCATE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 31;
+	int CDAP_CLUSTER_MANAGER___TRUCATE_STREAM__STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 32;
 
 	/**
 	 * The operation id for the '<em>Set Stream Properties</em>' operation.
@@ -580,7 +634,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_STREAM_PROPERTIES__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 32;
+	int CDAP_CLUSTER_MANAGER___SET_STREAM_PROPERTIES__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 33;
 
 	/**
 	 * The operation id for the '<em>Restart App</em>' operation.
@@ -589,7 +643,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___RESTART_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 33;
+	int CDAP_CLUSTER_MANAGER___RESTART_APP__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 34;
 
 	/**
 	 * The operation id for the '<em>Create App</em>' operation.
@@ -598,7 +652,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___CREATE_APP__STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 34;
+	int CDAP_CLUSTER_MANAGER___CREATE_APP__STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 35;
 
 	/**
 	 * The operation id for the '<em>Create App With Config</em>' operation.
@@ -607,7 +661,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___CREATE_APP_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 35;
+	int CDAP_CLUSTER_MANAGER___CREATE_APP_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 36;
 
 	/**
 	 * The operation id for the '<em>Set Dataset Properties</em>' operation.
@@ -616,7 +670,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_DATASET_PROPERTIES__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 36;
+	int CDAP_CLUSTER_MANAGER___SET_DATASET_PROPERTIES__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 37;
 
 	/**
 	 * The operation id for the '<em>Set Stream TTL</em>' operation.
@@ -625,7 +679,25 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER___SET_STREAM_TTL__STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 37;
+	int CDAP_CLUSTER_MANAGER___SET_STREAM_TTL__STRING_STRING_INT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 38;
+
+	/**
+	 * The operation id for the '<em>Suspend Schedule</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_MANAGER___SUSPEND_SCHEDULE__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 39;
+
+	/**
+	 * The operation id for the '<em>Resume Schedule</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_MANAGER___RESUME_SCHEDULE__STRING_STRING_STRING = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 40;
 
 	/**
 	 * The number of operations of the '<em>Cdap Cluster Manager</em>' class.
@@ -634,7 +706,7 @@ public interface ManagerPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_MANAGER_OPERATION_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 38;
+	int CDAP_CLUSTER_MANAGER_OPERATION_COUNT = VmmanagerPackage.VIRTUAL_MACHINE_MANAGER_OPERATION_COUNT + 41;
 
 
 	/**
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java
index 1ff134b..c5710dc 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/impl/CdapClusterManagerImpl.java
@@ -32,12 +32,14 @@ import org.openecomp.ncomp.cdap.CdapApi;
 import org.openecomp.ncomp.cdap.CdapCluster;
 import org.openecomp.ncomp.cdap.CdapPackage;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
 
 /**
  * <!-- begin-user-doc -->
@@ -45,10 +47,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.manager.impl.CdapClusterManagerImpl#getCluster <em>Cluster</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.manager.impl.CdapClusterManagerImpl#getCdapServiceServers <em>Cdap Service Servers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.manager.impl.CdapClusterManagerImpl#getHealthCheckScript <em>Health Check Script</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.manager.impl.CdapClusterManagerImpl#getTestTimeout <em>Test Timeout</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -64,6 +69,56 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 	protected CdapCluster cluster;
 
 	/**
+	 * The cached value of the '{@link #getCdapServiceServers() <em>Cdap Service Servers</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapServiceServers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> cdapServiceServers;
+
+	/**
+	 * The default value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthCheckScript()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HEALTH_CHECK_SCRIPT_EDEFAULT = "bin/healthCheck.sh";
+
+	/**
+	 * The cached value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthCheckScript()
+	 * @generated
+	 * @ordered
+	 */
+	protected String healthCheckScript = HEALTH_CHECK_SCRIPT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTestTimeout()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int TEST_TIMEOUT_EDEFAULT = 60000;
+
+	/**
+	 * The cached value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTestTimeout()
+	 * @generated
+	 * @ordered
+	 */
+	protected int testTimeout = TEST_TIMEOUT_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -130,6 +185,60 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<String> getCdapServiceServers() {
+		if (cdapServiceServers == null) {
+			cdapServiceServers = new EDataTypeEList<String>(String.class, this, ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS);
+		}
+		return cdapServiceServers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHealthCheckScript() {
+		return healthCheckScript;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHealthCheckScript(String newHealthCheckScript) {
+		String oldHealthCheckScript = healthCheckScript;
+		healthCheckScript = newHealthCheckScript;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT, oldHealthCheckScript, healthCheckScript));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getTestTimeout() {
+		return testTimeout;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTestTimeout(int newTestTimeout) {
+		int oldTestTimeout = testTimeout;
+		testTimeout = newTestTimeout;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT, oldTestTimeout, testTimeout));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String createNamespace(String namespace) {
 		// TODO: implement this method
 		// Ensure that you remove @generated or mark it @generated NOT
@@ -174,6 +283,17 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String loadArtifactWithConfig(String namespace, String artifactName, String jarfile, String version, String config) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public String deleteArtifact(String namespace, String artifactName, String artifactVersion) {
 		// TODO: implement this method
 		// Ensure that you remove @generated or mark it @generated NOT
@@ -548,6 +668,28 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public String suspendSchedule(String namespace, String appId, String scheduleId) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String resumeSchedule(String namespace, String appId, String scheduleId) {
+		// TODO: implement this method
+		// Ensure that you remove @generated or mark it @generated NOT
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -567,6 +709,12 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 		switch (featureID) {
 			case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER:
 				return getCluster();
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS:
+				return getCdapServiceServers();
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT:
+				return getHealthCheckScript();
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT:
+				return getTestTimeout();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -576,12 +724,23 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER:
 				setCluster((CdapCluster)newValue);
 				return;
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS:
+				getCdapServiceServers().clear();
+				getCdapServiceServers().addAll((Collection<? extends String>)newValue);
+				return;
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT:
+				setHealthCheckScript((String)newValue);
+				return;
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT:
+				setTestTimeout((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -597,6 +756,15 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 			case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER:
 				setCluster((CdapCluster)null);
 				return;
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS:
+				getCdapServiceServers().clear();
+				return;
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT:
+				setHealthCheckScript(HEALTH_CHECK_SCRIPT_EDEFAULT);
+				return;
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT:
+				setTestTimeout(TEST_TIMEOUT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -611,6 +779,12 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 		switch (featureID) {
 			case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER:
 				return cluster != null;
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS:
+				return cdapServiceServers != null && !cdapServiceServers.isEmpty();
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT:
+				return HEALTH_CHECK_SCRIPT_EDEFAULT == null ? healthCheckScript != null : !HEALTH_CHECK_SCRIPT_EDEFAULT.equals(healthCheckScript);
+			case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT:
+				return testTimeout != TEST_TIMEOUT_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -625,6 +799,9 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 		if (baseClass == CdapClusterConfiguration.class) {
 			switch (derivedFeatureID) {
 				case ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER;
+				case ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS;
+				case ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT;
+				case ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT;
 				default: return -1;
 			}
 		}
@@ -646,6 +823,9 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 		if (baseClass == CdapClusterConfiguration.class) {
 			switch (baseFeatureID) {
 				case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER: return ManagerPackage.CDAP_CLUSTER_MANAGER__CLUSTER;
+				case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS: return ManagerPackage.CDAP_CLUSTER_MANAGER__CDAP_SERVICE_SERVERS;
+				case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT: return ManagerPackage.CDAP_CLUSTER_MANAGER__HEALTH_CHECK_SCRIPT;
+				case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT: return ManagerPackage.CDAP_CLUSTER_MANAGER__TEST_TIMEOUT;
 				default: return -1;
 			}
 		}
@@ -675,6 +855,7 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 				case CdapPackage.CDAP_API___DELETE_NAMESPACE__STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___DELETE_NAMESPACE__STRING;
 				case CdapPackage.CDAP_API___DEPLOY_APP__STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___DEPLOY_APP__STRING_STRING;
 				case CdapPackage.CDAP_API___LOAD_ARTIFACT__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT__STRING_STRING_STRING_STRING;
+				case CdapPackage.CDAP_API___LOAD_ARTIFACT_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING;
 				case CdapPackage.CDAP_API___DELETE_ARTIFACT__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___DELETE_ARTIFACT__STRING_STRING_STRING;
 				case CdapPackage.CDAP_API___START_FLOW__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___START_FLOW__STRING_STRING_STRING_STRING;
 				case CdapPackage.CDAP_API___START_WORKER__STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___START_WORKER__STRING_STRING_STRING_STRING;
@@ -709,6 +890,8 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 				case CdapPackage.CDAP_API___CREATE_APP_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___CREATE_APP_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING_STRING;
 				case CdapPackage.CDAP_API___SET_DATASET_PROPERTIES__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___SET_DATASET_PROPERTIES__STRING_STRING_STRING;
 				case CdapPackage.CDAP_API___SET_STREAM_TTL__STRING_STRING_INT: return ManagerPackage.CDAP_CLUSTER_MANAGER___SET_STREAM_TTL__STRING_STRING_INT;
+				case CdapPackage.CDAP_API___SUSPEND_SCHEDULE__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___SUSPEND_SCHEDULE__STRING_STRING_STRING;
+				case CdapPackage.CDAP_API___RESUME_SCHEDULE__STRING_STRING_STRING: return ManagerPackage.CDAP_CLUSTER_MANAGER___RESUME_SCHEDULE__STRING_STRING_STRING;
 				default: return -1;
 			}
 		}
@@ -731,6 +914,8 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 				return deployApp((String)arguments.get(0), (String)arguments.get(1));
 			case ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT__STRING_STRING_STRING_STRING:
 				return loadArtifact((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2), (String)arguments.get(3));
+			case ManagerPackage.CDAP_CLUSTER_MANAGER___LOAD_ARTIFACT_WITH_CONFIG__STRING_STRING_STRING_STRING_STRING:
+				return loadArtifactWithConfig((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2), (String)arguments.get(3), (String)arguments.get(4));
 			case ManagerPackage.CDAP_CLUSTER_MANAGER___DELETE_ARTIFACT__STRING_STRING_STRING:
 				return deleteArtifact((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2));
 			case ManagerPackage.CDAP_CLUSTER_MANAGER___START_FLOW__STRING_STRING_STRING_STRING:
@@ -799,8 +984,32 @@ public class CdapClusterManagerImpl extends VirtualMachineManagerImpl implements
 				return setDatasetProperties((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2));
 			case ManagerPackage.CDAP_CLUSTER_MANAGER___SET_STREAM_TTL__STRING_STRING_INT:
 				return setStreamTTL((String)arguments.get(0), (String)arguments.get(1), (Integer)arguments.get(2));
+			case ManagerPackage.CDAP_CLUSTER_MANAGER___SUSPEND_SCHEDULE__STRING_STRING_STRING:
+				return suspendSchedule((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2));
+			case ManagerPackage.CDAP_CLUSTER_MANAGER___RESUME_SCHEDULE__STRING_STRING_STRING:
+				return resumeSchedule((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (cdapServiceServers: ");
+		result.append(cdapServiceServers);
+		result.append(", healthCheckScript: ");
+		result.append(healthCheckScript);
+		result.append(", testTimeout: ");
+		result.append(testTimeout);
+		result.append(')');
+		return result.toString();
+	}
+
 } //CdapClusterManagerImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/util/ManagerSwitch.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/util/ManagerSwitch.java
index 72c1903..e306724 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/util/ManagerSwitch.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/manager/util/ManagerSwitch.java
@@ -78,7 +78,7 @@ public class ManagerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/CdapClusterConfiguration.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/CdapClusterConfiguration.java
index 41d52c0..be93d86 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/CdapClusterConfiguration.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/CdapClusterConfiguration.java
@@ -25,6 +25,7 @@ package org.openecomp.dcae.controller.service.cdap.cluster.service;
 
 import org.openecomp.ncomp.cdap.CdapCluster;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -34,10 +35,13 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getCluster <em>Cluster</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getCdapServiceServers <em>Cdap Service Servers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getHealthCheckScript <em>Health Check Script</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getTestTimeout <em>Test Timeout</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage#getCdapClusterConfiguration()
  * @model
@@ -71,4 +75,74 @@ public interface CdapClusterConfiguration extends EObject {
 	 */
 	void setCluster(CdapCluster value);
 
+	/**
+	 * Returns the value of the '<em><b>Cdap Service Servers</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Cdap Service Servers</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Cdap Service Servers</em>' attribute list.
+	 * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage#getCdapClusterConfiguration_CdapServiceServers()
+	 * @model unique="false"
+	 * @generated
+	 */
+	EList<String> getCdapServiceServers();
+
+	/**
+	 * Returns the value of the '<em><b>Health Check Script</b></em>' attribute.
+	 * The default value is <code>"bin/healthCheck.sh"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Health Check Script</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Health Check Script</em>' attribute.
+	 * @see #setHealthCheckScript(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage#getCdapClusterConfiguration_HealthCheckScript()
+	 * @model default="bin/healthCheck.sh" unique="false"
+	 * @generated
+	 */
+	String getHealthCheckScript();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getHealthCheckScript <em>Health Check Script</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Health Check Script</em>' attribute.
+	 * @see #getHealthCheckScript()
+	 * @generated
+	 */
+	void setHealthCheckScript(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Test Timeout</b></em>' attribute.
+	 * The default value is <code>"60000"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Test Timeout</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Test Timeout</em>' attribute.
+	 * @see #setTestTimeout(int)
+	 * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage#getCdapClusterConfiguration_TestTimeout()
+	 * @model default="60000" unique="false"
+	 * @generated
+	 */
+	int getTestTimeout();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getTestTimeout <em>Test Timeout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Test Timeout</em>' attribute.
+	 * @see #getTestTimeout()
+	 * @generated
+	 */
+	void setTestTimeout(int value);
+
 } // CdapClusterConfiguration
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/ServicePackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/ServicePackage.java
index fe0d0dc..eef3e40 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/ServicePackage.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/ServicePackage.java
@@ -25,6 +25,7 @@ package org.openecomp.dcae.controller.service.cdap.cluster.service;
 
 import org.openecomp.dcae.controller.service.vm.VmPackage;
 
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
@@ -41,6 +42,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.cdap.cluster.service.ServiceFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.cdap.cluster'"
@@ -578,13 +597,40 @@ public interface ServicePackage extends EPackage {
 	int CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Cdap Service Servers</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Health Check Script</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Test Timeout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 3;
+
+	/**
 	 * The number of structural features of the '<em>Cdap Cluster Service Instance</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_SERVICE_INSTANCE_FEATURE_COUNT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 1;
+	int CDAP_CLUSTER_SERVICE_INSTANCE_FEATURE_COUNT = VmPackage.VIRTUAL_MACHINE_SERVICE_INSTANCE_FEATURE_COUNT + 4;
 
 	/**
 	 * The number of operations of the '<em>Cdap Cluster Service Instance</em>' class.
@@ -615,13 +661,40 @@ public interface ServicePackage extends EPackage {
 	int CDAP_CLUSTER_CONFIGURATION__CLUSTER = 0;
 
 	/**
+	 * The feature id for the '<em><b>Cdap Service Servers</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS = 1;
+
+	/**
+	 * The feature id for the '<em><b>Health Check Script</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT = 2;
+
+	/**
+	 * The feature id for the '<em><b>Test Timeout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT = 3;
+
+	/**
 	 * The number of structural features of the '<em>Cdap Cluster Configuration</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_CLUSTER_CONFIGURATION_FEATURE_COUNT = 1;
+	int CDAP_CLUSTER_CONFIGURATION_FEATURE_COUNT = 4;
 
 	/**
 	 * The number of operations of the '<em>Cdap Cluster Configuration</em>' class.
@@ -675,6 +748,39 @@ public interface ServicePackage extends EPackage {
 	EReference getCdapClusterConfiguration_Cluster();
 
 	/**
+	 * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getCdapServiceServers <em>Cdap Service Servers</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Cdap Service Servers</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getCdapServiceServers()
+	 * @see #getCdapClusterConfiguration()
+	 * @generated
+	 */
+	EAttribute getCdapClusterConfiguration_CdapServiceServers();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getHealthCheckScript <em>Health Check Script</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Health Check Script</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getHealthCheckScript()
+	 * @see #getCdapClusterConfiguration()
+	 * @generated
+	 */
+	EAttribute getCdapClusterConfiguration_HealthCheckScript();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getTestTimeout <em>Test Timeout</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Test Timeout</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterConfiguration#getTestTimeout()
+	 * @see #getCdapClusterConfiguration()
+	 * @generated
+	 */
+	EAttribute getCdapClusterConfiguration_TestTimeout();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -735,6 +841,30 @@ public interface ServicePackage extends EPackage {
 		 */
 		EReference CDAP_CLUSTER_CONFIGURATION__CLUSTER = eINSTANCE.getCdapClusterConfiguration_Cluster();
 
+		/**
+		 * The meta object literal for the '<em><b>Cdap Service Servers</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS = eINSTANCE.getCdapClusterConfiguration_CdapServiceServers();
+
+		/**
+		 * The meta object literal for the '<em><b>Health Check Script</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT = eINSTANCE.getCdapClusterConfiguration_HealthCheckScript();
+
+		/**
+		 * The meta object literal for the '<em><b>Test Timeout</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT = eINSTANCE.getCdapClusterConfiguration_TestTimeout();
+
 	}
 
 } //ServicePackage
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterConfigurationImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterConfigurationImpl.java
index 53ae6de..0ab8271 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterConfigurationImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterConfigurationImpl.java
@@ -28,14 +28,17 @@ import org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage
 
 import org.openecomp.ncomp.cdap.CdapCluster;
 
+import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
 
 /**
  * <!-- begin-user-doc -->
@@ -43,10 +46,13 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterConfigurationImpl#getCluster <em>Cluster</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterConfigurationImpl#getCdapServiceServers <em>Cdap Service Servers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterConfigurationImpl#getHealthCheckScript <em>Health Check Script</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterConfigurationImpl#getTestTimeout <em>Test Timeout</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -62,6 +68,56 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i
 	protected CdapCluster cluster;
 
 	/**
+	 * The cached value of the '{@link #getCdapServiceServers() <em>Cdap Service Servers</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapServiceServers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> cdapServiceServers;
+
+	/**
+	 * The default value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthCheckScript()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HEALTH_CHECK_SCRIPT_EDEFAULT = "bin/healthCheck.sh";
+
+	/**
+	 * The cached value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthCheckScript()
+	 * @generated
+	 * @ordered
+	 */
+	protected String healthCheckScript = HEALTH_CHECK_SCRIPT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTestTimeout()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int TEST_TIMEOUT_EDEFAULT = 60000;
+
+	/**
+	 * The cached value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTestTimeout()
+	 * @generated
+	 * @ordered
+	 */
+	protected int testTimeout = TEST_TIMEOUT_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -128,6 +184,60 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<String> getCdapServiceServers() {
+		if (cdapServiceServers == null) {
+			cdapServiceServers = new EDataTypeEList<String>(String.class, this, ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS);
+		}
+		return cdapServiceServers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHealthCheckScript() {
+		return healthCheckScript;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHealthCheckScript(String newHealthCheckScript) {
+		String oldHealthCheckScript = healthCheckScript;
+		healthCheckScript = newHealthCheckScript;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT, oldHealthCheckScript, healthCheckScript));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getTestTimeout() {
+		return testTimeout;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTestTimeout(int newTestTimeout) {
+		int oldTestTimeout = testTimeout;
+		testTimeout = newTestTimeout;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT, oldTestTimeout, testTimeout));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -147,6 +257,12 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i
 		switch (featureID) {
 			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER:
 				return getCluster();
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS:
+				return getCdapServiceServers();
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT:
+				return getHealthCheckScript();
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT:
+				return getTestTimeout();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -156,12 +272,23 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER:
 				setCluster((CdapCluster)newValue);
 				return;
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS:
+				getCdapServiceServers().clear();
+				getCdapServiceServers().addAll((Collection<? extends String>)newValue);
+				return;
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT:
+				setHealthCheckScript((String)newValue);
+				return;
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT:
+				setTestTimeout((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -177,6 +304,15 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i
 			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER:
 				setCluster((CdapCluster)null);
 				return;
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS:
+				getCdapServiceServers().clear();
+				return;
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT:
+				setHealthCheckScript(HEALTH_CHECK_SCRIPT_EDEFAULT);
+				return;
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT:
+				setTestTimeout(TEST_TIMEOUT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -191,8 +327,34 @@ public class CdapClusterConfigurationImpl extends MinimalEObjectImpl.Container i
 		switch (featureID) {
 			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER:
 				return cluster != null;
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS:
+				return cdapServiceServers != null && !cdapServiceServers.isEmpty();
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT:
+				return HEALTH_CHECK_SCRIPT_EDEFAULT == null ? healthCheckScript != null : !HEALTH_CHECK_SCRIPT_EDEFAULT.equals(healthCheckScript);
+			case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT:
+				return testTimeout != TEST_TIMEOUT_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (cdapServiceServers: ");
+		result.append(cdapServiceServers);
+		result.append(", healthCheckScript: ");
+		result.append(healthCheckScript);
+		result.append(", testTimeout: ");
+		result.append(testTimeout);
+		result.append(')');
+		return result.toString();
+	}
+
 } //CdapClusterConfigurationImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceImpl.java
index 2021586..b986cfb 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Cdap Cluster Service</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceInstanceImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceInstanceImpl.java
index 7e31876..abfca1b 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceInstanceImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/CdapClusterServiceInstanceImpl.java
@@ -31,13 +31,16 @@ import org.openecomp.dcae.controller.service.vm.impl.VirtualMachineServiceInstan
 
 import org.openecomp.ncomp.cdap.CdapCluster;
 
+import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EDataTypeEList;
 
 /**
  * <!-- begin-user-doc -->
@@ -45,10 +48,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterServiceInstanceImpl#getCluster <em>Cluster</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterServiceInstanceImpl#getCdapServiceServers <em>Cdap Service Servers</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterServiceInstanceImpl#getHealthCheckScript <em>Health Check Script</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.cluster.service.impl.CdapClusterServiceInstanceImpl#getTestTimeout <em>Test Timeout</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -64,6 +70,56 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc
 	protected CdapCluster cluster;
 
 	/**
+	 * The cached value of the '{@link #getCdapServiceServers() <em>Cdap Service Servers</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getCdapServiceServers()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> cdapServiceServers;
+
+	/**
+	 * The default value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthCheckScript()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String HEALTH_CHECK_SCRIPT_EDEFAULT = "bin/healthCheck.sh";
+
+	/**
+	 * The cached value of the '{@link #getHealthCheckScript() <em>Health Check Script</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getHealthCheckScript()
+	 * @generated
+	 * @ordered
+	 */
+	protected String healthCheckScript = HEALTH_CHECK_SCRIPT_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTestTimeout()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int TEST_TIMEOUT_EDEFAULT = 60000;
+
+	/**
+	 * The cached value of the '{@link #getTestTimeout() <em>Test Timeout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTestTimeout()
+	 * @generated
+	 * @ordered
+	 */
+	protected int testTimeout = TEST_TIMEOUT_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -130,6 +186,60 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<String> getCdapServiceServers() {
+		if (cdapServiceServers == null) {
+			cdapServiceServers = new EDataTypeEList<String>(String.class, this, ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS);
+		}
+		return cdapServiceServers;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getHealthCheckScript() {
+		return healthCheckScript;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setHealthCheckScript(String newHealthCheckScript) {
+		String oldHealthCheckScript = healthCheckScript;
+		healthCheckScript = newHealthCheckScript;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT, oldHealthCheckScript, healthCheckScript));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getTestTimeout() {
+		return testTimeout;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTestTimeout(int newTestTimeout) {
+		int oldTestTimeout = testTimeout;
+		testTimeout = newTestTimeout;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT, oldTestTimeout, testTimeout));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
@@ -149,6 +259,12 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc
 		switch (featureID) {
 			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER:
 				return getCluster();
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS:
+				return getCdapServiceServers();
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT:
+				return getHealthCheckScript();
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT:
+				return getTestTimeout();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -158,12 +274,23 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER:
 				setCluster((CdapCluster)newValue);
 				return;
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS:
+				getCdapServiceServers().clear();
+				getCdapServiceServers().addAll((Collection<? extends String>)newValue);
+				return;
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT:
+				setHealthCheckScript((String)newValue);
+				return;
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT:
+				setTestTimeout((Integer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -179,6 +306,15 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc
 			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER:
 				setCluster((CdapCluster)null);
 				return;
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS:
+				getCdapServiceServers().clear();
+				return;
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT:
+				setHealthCheckScript(HEALTH_CHECK_SCRIPT_EDEFAULT);
+				return;
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT:
+				setTestTimeout(TEST_TIMEOUT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -193,6 +329,12 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc
 		switch (featureID) {
 			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER:
 				return cluster != null;
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS:
+				return cdapServiceServers != null && !cdapServiceServers.isEmpty();
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT:
+				return HEALTH_CHECK_SCRIPT_EDEFAULT == null ? healthCheckScript != null : !HEALTH_CHECK_SCRIPT_EDEFAULT.equals(healthCheckScript);
+			case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT:
+				return testTimeout != TEST_TIMEOUT_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -207,6 +349,9 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc
 		if (baseClass == CdapClusterConfiguration.class) {
 			switch (derivedFeatureID) {
 				case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER;
+				case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS;
+				case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT;
+				case ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT: return ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT;
 				default: return -1;
 			}
 		}
@@ -223,10 +368,33 @@ public class CdapClusterServiceInstanceImpl extends VirtualMachineServiceInstanc
 		if (baseClass == CdapClusterConfiguration.class) {
 			switch (baseFeatureID) {
 				case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CLUSTER: return ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CLUSTER;
+				case ServicePackage.CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS: return ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__CDAP_SERVICE_SERVERS;
+				case ServicePackage.CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT: return ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__HEALTH_CHECK_SCRIPT;
+				case ServicePackage.CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT: return ServicePackage.CDAP_CLUSTER_SERVICE_INSTANCE__TEST_TIMEOUT;
 				default: return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (cdapServiceServers: ");
+		result.append(cdapServiceServers);
+		result.append(", healthCheckScript: ");
+		result.append(healthCheckScript);
+		result.append(", testTimeout: ");
+		result.append(testTimeout);
+		result.append(')');
+		return result.toString();
+	}
+
 } //CdapClusterServiceInstanceImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/ServicePackageImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/ServicePackageImpl.java
index f39f5c0..867aebb 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/ServicePackageImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/impl/ServicePackageImpl.java
@@ -28,11 +28,17 @@ import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterSer
 import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
 import org.openecomp.dcae.controller.service.cdap.cluster.service.ServiceFactory;
 import org.openecomp.dcae.controller.service.cdap.cluster.service.ServicePackage;
+
 import org.openecomp.dcae.controller.service.vm.VmPackage;
+
 import org.openecomp.ncomp.cdap.CdapPackage;
+
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 /**
@@ -110,8 +116,8 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 		isInited = true;
 
 		// Initialize simple dependencies
-		CdapPackage.eINSTANCE.eClass();
 		VmPackage.eINSTANCE.eClass();
+		CdapPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theServicePackage.createPackageContents();
@@ -169,6 +175,33 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getCdapClusterConfiguration_CdapServiceServers() {
+		return (EAttribute)cdapClusterConfigurationEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapClusterConfiguration_HealthCheckScript() {
+		return (EAttribute)cdapClusterConfigurationEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapClusterConfiguration_TestTimeout() {
+		return (EAttribute)cdapClusterConfigurationEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public ServiceFactory getServiceFactory() {
 		return (ServiceFactory)getEFactoryInstance();
 	}
@@ -198,6 +231,9 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 
 		cdapClusterConfigurationEClass = createEClass(CDAP_CLUSTER_CONFIGURATION);
 		createEReference(cdapClusterConfigurationEClass, CDAP_CLUSTER_CONFIGURATION__CLUSTER);
+		createEAttribute(cdapClusterConfigurationEClass, CDAP_CLUSTER_CONFIGURATION__CDAP_SERVICE_SERVERS);
+		createEAttribute(cdapClusterConfigurationEClass, CDAP_CLUSTER_CONFIGURATION__HEALTH_CHECK_SCRIPT);
+		createEAttribute(cdapClusterConfigurationEClass, CDAP_CLUSTER_CONFIGURATION__TEST_TIMEOUT);
 	}
 
 	/**
@@ -226,6 +262,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 		// Obtain other dependent packages
 		VmPackage theVmPackage = (VmPackage)EPackage.Registry.INSTANCE.getEPackage(VmPackage.eNS_URI);
 		CdapPackage theCdapPackage = (CdapPackage)EPackage.Registry.INSTANCE.getEPackage(CdapPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 
 		// Create type parameters
 
@@ -243,6 +280,9 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 
 		initEClass(cdapClusterConfigurationEClass, CdapClusterConfiguration.class, "CdapClusterConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getCdapClusterConfiguration_Cluster(), theCdapPackage.getCdapCluster(), null, "cluster", null, 0, 1, CdapClusterConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapClusterConfiguration_CdapServiceServers(), theEcorePackage.getEString(), "cdapServiceServers", null, 0, -1, CdapClusterConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapClusterConfiguration_HealthCheckScript(), theEcorePackage.getEString(), "healthCheckScript", "bin/healthCheck.sh", 0, 1, CdapClusterConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapClusterConfiguration_TestTimeout(), theEcorePackage.getEInt(), "testTimeout", "60000", 0, 1, CdapClusterConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
@@ -251,7 +291,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 		// http://www.eclipse.org/emf/2011/Xcore
 		createXcoreAnnotations();
 		// http://openecomp.org
-		createEcompAnnotations();
+		createOpenecompAnnotations();
 	}
 
 	/**
@@ -276,7 +316,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void createEcompAnnotations() {
+	protected void createOpenecompAnnotations() {
 		String source = "http://openecomp.org";	
 		addAnnotation
 		  (getCdapClusterConfiguration_Cluster(), 
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/util/ServiceSwitch.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/util/ServiceSwitch.java
index 3d25b7c..c01475f 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/util/ServiceSwitch.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/cluster/service/util/ServiceSwitch.java
@@ -77,7 +77,7 @@ public class ServiceSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore/service.xcore b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore/service.xcore
index 0b3c18c..4c8d734 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore/service.xcore
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/src/main/xcore/service.xcore
@@ -40,6 +40,9 @@ class CdapClusterServiceInstance extends VirtualMachineServiceInstance, CdapClus
 class CdapClusterConfiguration { 

 	@ecomp(^type = "configuration")

 	contains CdapCluster cluster

+	String[] cdapServiceServers

+	String healthCheckScript = "bin/healthCheck.sh"

+	int testTimeout = "60000"

 }

 

 

diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.classpath b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.classpath
index 69b19c6..d86c4cf 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.classpath
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.classpath
@@ -1,17 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/xcore">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/xcore-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/xcore-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.project b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.project
index cca7c12..d15dfb4 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.project
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.settings/org.eclipse.core.resources.prefs b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..447ff97
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/xcore=UTF-8
+encoding//src/main/xcore-gen=UTF-8
+encoding/<project>=UTF-8
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..ec4300d 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.settings/org.eclipse.jdt.core.prefs
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/META-INF/MANIFEST.MF b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/META-INF/MANIFEST.MF
index 067dcd0..da66698 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/META-INF/MANIFEST.MF
@@ -16,15 +16,5 @@ Export-Package: org.openecomp.dcae.controller.service.cdap,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.ecore.xcore.lib,
- ncomp-openstack-model;visibility:=reexport,
- ncomp-sirius-manager-agent-model;visibility:=reexport,
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- dcae-controller-core-model;bundle-version="0.1.0";visibility:=reexport,
- dcae-controller-service-vm-model;visibility:=reexport,
- ncomp-cdap-model;bundle-version="0.1.0";visibility:=reexport,
- dcae-controller-service-cdap-cluster-model;bundle-version="0.1.0";visibility:=reexport
+ org.eclipse.emf.ecore.xcore.lib
 Bundle-ActivationPolicy: lazy
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapApplication.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapApplication.java
index 8ba630c..43669c1 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapApplication.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapApplication.java
@@ -32,13 +32,13 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getJarFile <em>Jar File</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getArtifactName <em>Artifact Name</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getVersion <em>Version</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapApplication#getAppConfigFileContent <em>App Config File Content</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapApplication()
  * @model
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifact.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifact.java
index f7a72e4..154fed0 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifact.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapArtifact.java
@@ -32,11 +32,11 @@ import org.openecomp.ncomp.core.NamedEntity;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact#getJarFile <em>Jar File</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapArtifact#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapArtifact()
  * @model
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateApp.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateApp.java
new file mode 100644
index 0000000..f93986e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateApp.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create App</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getJarfile <em>Jarfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateApp()
+ * @model
+ * @generated
+ */
+public interface CdapCreateApp extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Artifact Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Artifact Name</em>' attribute.
+	 * @see #setArtifactName(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateApp_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getArtifactName <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Artifact Name</em>' attribute.
+	 * @see #getArtifactName()
+	 * @generated
+	 */
+	void setArtifactName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jarfile</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jarfile</em>' attribute.
+	 * @see #setJarfile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateApp_Jarfile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarfile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getJarfile <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jarfile</em>' attribute.
+	 * @see #getJarfile()
+	 * @generated
+	 */
+	void setJarfile(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateApp_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateApp#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+
+} // CdapCreateApp
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppStep.java
new file mode 100644
index 0000000..a9f6434
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppStep.java
@@ -0,0 +1,130 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getScope <em>Scope</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapCreateAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Artifact Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Artifact Name</em>' attribute.
+	 * @see #setArtifactName(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppStep_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getArtifactName <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Artifact Name</em>' attribute.
+	 * @see #getArtifactName()
+	 * @generated
+	 */
+	void setArtifactName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppStep_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Scope</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Scope</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Scope</em>' attribute.
+	 * @see #setScope(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppStep_Scope()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getScope();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getScope <em>Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Scope</em>' attribute.
+	 * @see #getScope()
+	 * @generated
+	 */
+	void setScope(String value);
+
+} // CdapCreateAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfig.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfig.java
new file mode 100644
index 0000000..fec80d2
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfig.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create App With Config</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getJarfile <em>Jarfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfig()
+ * @model
+ * @generated
+ */
+public interface CdapCreateAppWithConfig extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Artifact Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Artifact Name</em>' attribute.
+	 * @see #setArtifactName(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfig_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getArtifactName <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Artifact Name</em>' attribute.
+	 * @see #getArtifactName()
+	 * @generated
+	 */
+	void setArtifactName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jarfile</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jarfile</em>' attribute.
+	 * @see #setJarfile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfig_Jarfile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarfile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getJarfile <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jarfile</em>' attribute.
+	 * @see #getJarfile()
+	 * @generated
+	 */
+	void setJarfile(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfig_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfig#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+
+} // CdapCreateAppWithConfig
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfigStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfigStep.java
new file mode 100644
index 0000000..ef93a2f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapCreateAppWithConfigStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Create App With Config Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep#getAppConfig <em>App Config</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfigStep()
+ * @model
+ * @generated
+ */
+public interface CdapCreateAppWithConfigStep extends CdapCreateAppStep {
+	/**
+	 * Returns the value of the '<em><b>App Config</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Config</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Config</em>' attribute.
+	 * @see #setAppConfig(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapCreateAppWithConfigStep_AppConfig()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppConfig();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep#getAppConfig <em>App Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Config</em>' attribute.
+	 * @see #getAppConfig()
+	 * @generated
+	 */
+	void setAppConfig(String value);
+
+} // CdapCreateAppWithConfigStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteAppStep.java
new file mode 100644
index 0000000..2cfb973
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteAppStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Delete App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeleteAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapDeleteAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeleteAppStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+} // CdapDeleteAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteArtifact.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteArtifact.java
new file mode 100644
index 0000000..01c2ea7
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeleteArtifact.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Delete Artifact</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeleteArtifact()
+ * @model
+ * @generated
+ */
+public interface CdapDeleteArtifact extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Artifact Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Artifact Name</em>' attribute.
+	 * @see #setArtifactName(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeleteArtifact_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getArtifactName <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Artifact Name</em>' attribute.
+	 * @see #getArtifactName()
+	 * @generated
+	 */
+	void setArtifactName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeleteArtifact_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+
+} // CdapDeleteArtifact
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java
new file mode 100644
index 0000000..e4a884e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapDeployAppStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Deploy App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile <em>Jarfile</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeployAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapDeployAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jarfile</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jarfile</em>' attribute.
+	 * @see #setJarfile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapDeployAppStep_Jarfile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarfile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jarfile</em>' attribute.
+	 * @see #getJarfile()
+	 * @generated
+	 */
+	void setJarfile(String value);
+
+} // CdapDeployAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapFactory.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapFactory.java
index b15b7d5..a7c6f18 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapFactory.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapFactory.java
@@ -106,6 +106,159 @@ public interface CdapFactory extends EFactory {
 	CdapServiceDescriptor createCdapServiceDescriptor();
 
 	/**
+	 * Returns a new object of class '<em>Load Artifact Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Load Artifact Step</em>'.
+	 * @generated
+	 */
+	CdapLoadArtifactStep createCdapLoadArtifactStep();
+
+	/**
+	 * Returns a new object of class '<em>Load Artifact With Config Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Load Artifact With Config Step</em>'.
+	 * @generated
+	 */
+	CdapLoadArtifactWithConfigStep createCdapLoadArtifactWithConfigStep();
+
+	/**
+	 * Returns a new object of class '<em>Create App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Create App Step</em>'.
+	 * @generated
+	 */
+	CdapCreateAppStep createCdapCreateAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Create App With Config Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Create App With Config Step</em>'.
+	 * @generated
+	 */
+	CdapCreateAppWithConfigStep createCdapCreateAppWithConfigStep();
+
+	/**
+	 * Returns a new object of class '<em>Deploy App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Deploy App Step</em>'.
+	 * @generated
+	 */
+	CdapDeployAppStep createCdapDeployAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Stop Flow Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stop Flow Step</em>'.
+	 * @generated
+	 */
+	CdapStopFlowStep createCdapStopFlowStep();
+
+	/**
+	 * Returns a new object of class '<em>Stop Worker Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stop Worker Step</em>'.
+	 * @generated
+	 */
+	CdapStopWorkerStep createCdapStopWorkerStep();
+
+	/**
+	 * Returns a new object of class '<em>Stop Service Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stop Service Step</em>'.
+	 * @generated
+	 */
+	CdapStopServiceStep createCdapStopServiceStep();
+
+	/**
+	 * Returns a new object of class '<em>Stop App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Stop App Step</em>'.
+	 * @generated
+	 */
+	CdapStopAppStep createCdapStopAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Start Flow Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Start Flow Step</em>'.
+	 * @generated
+	 */
+	CdapStartFlowStep createCdapStartFlowStep();
+
+	/**
+	 * Returns a new object of class '<em>Start Worker Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Start Worker Step</em>'.
+	 * @generated
+	 */
+	CdapStartWorkerStep createCdapStartWorkerStep();
+
+	/**
+	 * Returns a new object of class '<em>Start Service Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Start Service Step</em>'.
+	 * @generated
+	 */
+	CdapStartServiceStep createCdapStartServiceStep();
+
+	/**
+	 * Returns a new object of class '<em>Start App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Start App Step</em>'.
+	 * @generated
+	 */
+	CdapStartAppStep createCdapStartAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Delete App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Delete App Step</em>'.
+	 * @generated
+	 */
+	CdapDeleteAppStep createCdapDeleteAppStep();
+
+	/**
+	 * Returns a new object of class '<em>Delete Artifact</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Delete Artifact</em>'.
+	 * @generated
+	 */
+	CdapDeleteArtifact createCdapDeleteArtifact();
+
+	/**
+	 * Returns a new object of class '<em>Suspend Schedule Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Suspend Schedule Step</em>'.
+	 * @generated
+	 */
+	CdapSuspendScheduleStep createCdapSuspendScheduleStep();
+
+	/**
+	 * Returns a new object of class '<em>Resume Schedule Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Resume Schedule Step</em>'.
+	 * @generated
+	 */
+	CdapResumeScheduleStep createCdapResumeScheduleStep();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapInternalApplicationConfiguration.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapInternalApplicationConfiguration.java
index 51b9b5c..b03e58a 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapInternalApplicationConfiguration.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapInternalApplicationConfiguration.java
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getConfig <em>Config</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getPreferences <em>Preferences</em>}</li>
@@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getFlows <em>Flows</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration#getServices <em>Services</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapInternalApplicationConfiguration()
  * @model
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifact.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifact.java
new file mode 100644
index 0000000..e6cd4f3
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifact.java
@@ -0,0 +1,17 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Load Artifact</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifact()
+ * @model
+ * @generated
+ */
+public interface CdapLoadArtifact extends CdapStep {
+} // CdapLoadArtifact
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java
new file mode 100644
index 0000000..9826779
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Load Artifact Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile <em>Jarfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactStep()
+ * @model
+ * @generated
+ */
+public interface CdapLoadArtifactStep extends CdapStep {
+
+	/**
+	 * Returns the value of the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Artifact Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Artifact Name</em>' attribute.
+	 * @see #setArtifactName(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactStep_ArtifactName()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getArtifactName();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getArtifactName <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Artifact Name</em>' attribute.
+	 * @see #getArtifactName()
+	 * @generated
+	 */
+	void setArtifactName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Jarfile</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Jarfile</em>' attribute.
+	 * @see #setJarfile(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactStep_Jarfile()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getJarfile();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Jarfile</em>' attribute.
+	 * @see #getJarfile()
+	 * @generated
+	 */
+	void setJarfile(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Version</em>' attribute.
+	 * @see #setVersion(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactStep_Version()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getVersion();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getVersion <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Version</em>' attribute.
+	 * @see #getVersion()
+	 * @generated
+	 */
+	void setVersion(String value);
+} // CdapLoadArtifactStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactWithConfigStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactWithConfigStep.java
new file mode 100644
index 0000000..7f1212f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapLoadArtifactWithConfigStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Load Artifact With Config Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep#getConfig <em>Config</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactWithConfigStep()
+ * @model
+ * @generated
+ */
+public interface CdapLoadArtifactWithConfigStep extends CdapLoadArtifactStep {
+	/**
+	 * Returns the value of the '<em><b>Config</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Config</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Config</em>' attribute.
+	 * @see #setConfig(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapLoadArtifactWithConfigStep_Config()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getConfig();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep#getConfig <em>Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Config</em>' attribute.
+	 * @see #getConfig()
+	 * @generated
+	 */
+	void setConfig(String value);
+
+} // CdapLoadArtifactWithConfigStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java
index afcb67b..d0f18c1 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapPackage.java
@@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.cdap.CdapFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-cdap-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service'"
@@ -427,13 +445,49 @@ public interface CdapPackage extends EPackage {
 	int CDAP_SERVICE_INSTANCE__APPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 5;
 
 	/**
+	 * The feature id for the '<em><b>Deploy Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__DEPLOY_STEPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Undeploy Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Pre Configuration Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Post Configuration Steps</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 9;
+
+	/**
 	 * The feature id for the '<em><b>App Names</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__APP_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 6;
+	int CDAP_SERVICE_INSTANCE__APP_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 10;
 
 	/**
 	 * The feature id for the '<em><b>Worker Names</b></em>' attribute list.
@@ -442,7 +496,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__WORKER_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 7;
+	int CDAP_SERVICE_INSTANCE__WORKER_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 11;
 
 	/**
 	 * The feature id for the '<em><b>Flow Names</b></em>' attribute list.
@@ -451,7 +505,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__FLOW_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 8;
+	int CDAP_SERVICE_INSTANCE__FLOW_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 12;
 
 	/**
 	 * The feature id for the '<em><b>Service Names</b></em>' attribute list.
@@ -460,7 +514,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__SERVICE_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 9;
+	int CDAP_SERVICE_INSTANCE__SERVICE_NAMES = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 13;
 
 	/**
 	 * The feature id for the '<em><b>Configuration</b></em>' containment reference.
@@ -469,7 +523,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 10;
+	int CDAP_SERVICE_INSTANCE__CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 14;
 
 	/**
 	 * The feature id for the '<em><b>Cdap Configuration</b></em>' containment reference.
@@ -478,7 +532,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 11;
+	int CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 15;
 
 	/**
 	 * The feature id for the '<em><b>Cluster Service</b></em>' reference.
@@ -487,7 +541,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 12;
+	int CDAP_SERVICE_INSTANCE__CLUSTER_SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 16;
 
 	/**
 	 * The feature id for the '<em><b>Cdap Namespace</b></em>' reference.
@@ -496,7 +550,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 13;
+	int CDAP_SERVICE_INSTANCE__CDAP_NAMESPACE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 17;
 
 	/**
 	 * The feature id for the '<em><b>Service</b></em>' container reference.
@@ -505,7 +559,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE__SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 14;
+	int CDAP_SERVICE_INSTANCE__SERVICE = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 18;
 
 	/**
 	 * The number of structural features of the '<em>Service Instance</em>' class.
@@ -514,7 +568,7 @@ public interface CdapPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int CDAP_SERVICE_INSTANCE_FEATURE_COUNT = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 15;
+	int CDAP_SERVICE_INSTANCE_FEATURE_COUNT = ServicePackage.DCAE_SERVICE_INSTANCE_FEATURE_COUNT + 19;
 
 	/**
 	 * The number of operations of the '<em>Service Instance</em>' class.
@@ -948,6 +1002,1528 @@ public interface CdapPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStepImpl <em>Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStep()
+	 * @generated
+	 */
+	int CDAP_STEP = 7;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP__NAME = CorePackage.NAMED_ENTITY__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP__LAST_POLLED = CorePackage.NAMED_ENTITY__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP__LAST_CHANGED = CorePackage.NAMED_ENTITY__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP__CREATED = CorePackage.NAMED_ENTITY__CREATED;
+
+	/**
+	 * The number of structural features of the '<em>Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP_FEATURE_COUNT = CorePackage.NAMED_ENTITY_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STEP_OPERATION_COUNT = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl <em>Load Artifact Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapLoadArtifactStep()
+	 * @generated
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP = 8;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__JARFILE = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP__VERSION = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Load Artifact Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Load Artifact Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl <em>Load Artifact With Config Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapLoadArtifactWithConfigStep()
+	 * @generated
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP = 9;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__NAME = CDAP_LOAD_ARTIFACT_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__LAST_POLLED = CDAP_LOAD_ARTIFACT_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__LAST_CHANGED = CDAP_LOAD_ARTIFACT_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CREATED = CDAP_LOAD_ARTIFACT_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__ARTIFACT_NAME = CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__JARFILE = CDAP_LOAD_ARTIFACT_STEP__JARFILE;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__VERSION = CDAP_LOAD_ARTIFACT_STEP__VERSION;
+
+	/**
+	 * The feature id for the '<em><b>Config</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG = CDAP_LOAD_ARTIFACT_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Load Artifact With Config Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP_FEATURE_COUNT = CDAP_LOAD_ARTIFACT_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Load Artifact With Config Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP_OPERATION_COUNT = CDAP_LOAD_ARTIFACT_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl <em>Create App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapCreateAppStep()
+	 * @generated
+	 */
+	int CDAP_CREATE_APP_STEP = 10;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__ARTIFACT_NAME = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__VERSION = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Scope</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP__SCOPE = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of structural features of the '<em>Create App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of operations of the '<em>Create App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl <em>Create App With Config Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapCreateAppWithConfigStep()
+	 * @generated
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP = 11;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__NAME = CDAP_CREATE_APP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__LAST_POLLED = CDAP_CREATE_APP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__LAST_CHANGED = CDAP_CREATE_APP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__CREATED = CDAP_CREATE_APP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_ID = CDAP_CREATE_APP_STEP__APP_ID;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__ARTIFACT_NAME = CDAP_CREATE_APP_STEP__ARTIFACT_NAME;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__VERSION = CDAP_CREATE_APP_STEP__VERSION;
+
+	/**
+	 * The feature id for the '<em><b>Scope</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__SCOPE = CDAP_CREATE_APP_STEP__SCOPE;
+
+	/**
+	 * The feature id for the '<em><b>App Config</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG = CDAP_CREATE_APP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Create App With Config Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP_FEATURE_COUNT = CDAP_CREATE_APP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Create App With Config Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_CREATE_APP_WITH_CONFIG_STEP_OPERATION_COUNT = CDAP_CREATE_APP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl <em>Deploy App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeployAppStep()
+	 * @generated
+	 */
+	int CDAP_DEPLOY_APP_STEP = 12;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Jarfile</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP__JARFILE = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Deploy App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Deploy App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DEPLOY_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl <em>Stop Flow Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopFlowStep()
+	 * @generated
+	 */
+	int CDAP_STOP_FLOW_STEP = 13;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Flow Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP__FLOW_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Stop Flow Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Stop Flow Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_FLOW_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl <em>Stop Worker Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopWorkerStep()
+	 * @generated
+	 */
+	int CDAP_STOP_WORKER_STEP = 14;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Worker Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP__WORKER_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Stop Worker Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Stop Worker Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_WORKER_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl <em>Stop Service Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopServiceStep()
+	 * @generated
+	 */
+	int CDAP_STOP_SERVICE_STEP = 15;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP__SERVICE_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Stop Service Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Stop Service Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_SERVICE_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl <em>Stop App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopAppStep()
+	 * @generated
+	 */
+	int CDAP_STOP_APP_STEP = 16;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Stop App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Stop App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_STOP_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl <em>Start Flow Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartFlowStep()
+	 * @generated
+	 */
+	int CDAP_START_FLOW_STEP = 17;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Flow Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__FLOW_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP__EXTRA_ARGS = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Start Flow Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Start Flow Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_FLOW_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl <em>Start Worker Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartWorkerStep()
+	 * @generated
+	 */
+	int CDAP_START_WORKER_STEP = 18;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Worker Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__WORKER_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP__EXTRA_ARGS = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Start Worker Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Start Worker Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_WORKER_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl <em>Start Service Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartServiceStep()
+	 * @generated
+	 */
+	int CDAP_START_SERVICE_STEP = 19;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Service Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__SERVICE_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP__EXTRA_ARGS = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Start Service Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Start Service Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_SERVICE_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl <em>Start App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartAppStep()
+	 * @generated
+	 */
+	int CDAP_START_APP_STEP = 20;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Start App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Start App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_START_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl <em>Delete App Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeleteAppStep()
+	 * @generated
+	 */
+	int CDAP_DELETE_APP_STEP = 21;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Delete App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Delete App Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_APP_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl <em>Delete Artifact</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeleteArtifact()
+	 * @generated
+	 */
+	int CDAP_DELETE_ARTIFACT = 22;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>Artifact Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__ARTIFACT_NAME = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Version</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT__VERSION = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Delete Artifact</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Delete Artifact</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_DELETE_ARTIFACT_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl <em>Suspend Schedule Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapSuspendScheduleStep()
+	 * @generated
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP = 23;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Schedule Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Suspend Schedule Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Suspend Schedule Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_SUSPEND_SCHEDULE_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl <em>Resume Schedule Step</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl
+	 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapResumeScheduleStep()
+	 * @generated
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP = 24;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__NAME = CDAP_STEP__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Last Polled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__LAST_POLLED = CDAP_STEP__LAST_POLLED;
+
+	/**
+	 * The feature id for the '<em><b>Last Changed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__LAST_CHANGED = CDAP_STEP__LAST_CHANGED;
+
+	/**
+	 * The feature id for the '<em><b>Created</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__CREATED = CDAP_STEP__CREATED;
+
+	/**
+	 * The feature id for the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__APP_ID = CDAP_STEP_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Schedule Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID = CDAP_STEP_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Resume Schedule Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP_FEATURE_COUNT = CDAP_STEP_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of operations of the '<em>Resume Schedule Step</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CDAP_RESUME_SCHEDULE_STEP_OPERATION_COUNT = CDAP_STEP_OPERATION_COUNT + 0;
+
+	/**
 	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapService <em>Service</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1066,6 +2642,50 @@ public interface CdapPackage extends EPackage {
 	EReference getCdapServiceInstance_Apps();
 
 	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getDeploySteps <em>Deploy Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Deploy Steps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getDeploySteps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_DeploySteps();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getUndeploySteps <em>Undeploy Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Undeploy Steps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getUndeploySteps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_UndeploySteps();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPreConfigurationSteps <em>Pre Configuration Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Pre Configuration Steps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPreConfigurationSteps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_PreConfigurationSteps();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPostConfigurationSteps <em>Post Configuration Steps</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Post Configuration Steps</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPostConfigurationSteps()
+	 * @see #getCdapServiceInstance()
+	 * @generated
+	 */
+	EReference getCdapServiceInstance_PostConfigurationSteps();
+
+	/**
 	 * Returns the meta object for the attribute list '{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppNames <em>App Names</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1380,6 +3000,560 @@ public interface CdapPackage extends EPackage {
 	EAttribute getCdapServiceDescriptor_JarFile();
 
 	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStep <em>Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStep
+	 * @generated
+	 */
+	EClass getCdapStep();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep <em>Load Artifact Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Load Artifact Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep
+	 * @generated
+	 */
+	EClass getCdapLoadArtifactStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getArtifactName <em>Artifact Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Artifact Name</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getArtifactName()
+	 * @see #getCdapLoadArtifactStep()
+	 * @generated
+	 */
+	EAttribute getCdapLoadArtifactStep_ArtifactName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile <em>Jarfile</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jarfile</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getJarfile()
+	 * @see #getCdapLoadArtifactStep()
+	 * @generated
+	 */
+	EAttribute getCdapLoadArtifactStep_Jarfile();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Version</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep#getVersion()
+	 * @see #getCdapLoadArtifactStep()
+	 * @generated
+	 */
+	EAttribute getCdapLoadArtifactStep_Version();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep <em>Load Artifact With Config Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Load Artifact With Config Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep
+	 * @generated
+	 */
+	EClass getCdapLoadArtifactWithConfigStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep#getConfig <em>Config</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Config</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep#getConfig()
+	 * @see #getCdapLoadArtifactWithConfigStep()
+	 * @generated
+	 */
+	EAttribute getCdapLoadArtifactWithConfigStep_Config();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep <em>Create App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Create App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep
+	 * @generated
+	 */
+	EClass getCdapCreateAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getAppId()
+	 * @see #getCdapCreateAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getArtifactName <em>Artifact Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Artifact Name</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getArtifactName()
+	 * @see #getCdapCreateAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppStep_ArtifactName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Version</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getVersion()
+	 * @see #getCdapCreateAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppStep_Version();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getScope <em>Scope</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Scope</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep#getScope()
+	 * @see #getCdapCreateAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppStep_Scope();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep <em>Create App With Config Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Create App With Config Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep
+	 * @generated
+	 */
+	EClass getCdapCreateAppWithConfigStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep#getAppConfig <em>App Config</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Config</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep#getAppConfig()
+	 * @see #getCdapCreateAppWithConfigStep()
+	 * @generated
+	 */
+	EAttribute getCdapCreateAppWithConfigStep_AppConfig();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep <em>Deploy App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Deploy App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep
+	 * @generated
+	 */
+	EClass getCdapDeployAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile <em>Jarfile</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Jarfile</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep#getJarfile()
+	 * @see #getCdapDeployAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapDeployAppStep_Jarfile();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep <em>Stop Flow Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stop Flow Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep
+	 * @generated
+	 */
+	EClass getCdapStopFlowStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getAppId()
+	 * @see #getCdapStopFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopFlowStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getFlowId <em>Flow Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Flow Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getFlowId()
+	 * @see #getCdapStopFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopFlowStep_FlowId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep <em>Stop Worker Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stop Worker Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep
+	 * @generated
+	 */
+	EClass getCdapStopWorkerStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getAppId()
+	 * @see #getCdapStopWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopWorkerStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getWorkerId <em>Worker Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Worker Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getWorkerId()
+	 * @see #getCdapStopWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopWorkerStep_WorkerId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep <em>Stop Service Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stop Service Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep
+	 * @generated
+	 */
+	EClass getCdapStopServiceStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getAppId()
+	 * @see #getCdapStopServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopServiceStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getServiceId <em>Service Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getServiceId()
+	 * @see #getCdapStopServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopServiceStep_ServiceId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep <em>Stop App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Stop App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopAppStep
+	 * @generated
+	 */
+	EClass getCdapStopAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId()
+	 * @see #getCdapStopAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapStopAppStep_AppId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep <em>Start Flow Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Start Flow Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep
+	 * @generated
+	 */
+	EClass getCdapStartFlowStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getAppId()
+	 * @see #getCdapStartFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartFlowStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getFlowId <em>Flow Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Flow Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getFlowId()
+	 * @see #getCdapStartFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartFlowStep_FlowId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getExtraArgs <em>Extra Args</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Extra Args</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getExtraArgs()
+	 * @see #getCdapStartFlowStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartFlowStep_ExtraArgs();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep <em>Start Worker Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Start Worker Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep
+	 * @generated
+	 */
+	EClass getCdapStartWorkerStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getAppId()
+	 * @see #getCdapStartWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartWorkerStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getWorkerId <em>Worker Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Worker Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getWorkerId()
+	 * @see #getCdapStartWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartWorkerStep_WorkerId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getExtraArgs <em>Extra Args</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Extra Args</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getExtraArgs()
+	 * @see #getCdapStartWorkerStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartWorkerStep_ExtraArgs();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep <em>Start Service Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Start Service Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep
+	 * @generated
+	 */
+	EClass getCdapStartServiceStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getAppId()
+	 * @see #getCdapStartServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartServiceStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getServiceId <em>Service Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Service Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getServiceId()
+	 * @see #getCdapStartServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartServiceStep_ServiceId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getExtraArgs <em>Extra Args</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Extra Args</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getExtraArgs()
+	 * @see #getCdapStartServiceStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartServiceStep_ExtraArgs();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep <em>Start App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Start App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartAppStep
+	 * @generated
+	 */
+	EClass getCdapStartAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartAppStep#getAppId()
+	 * @see #getCdapStartAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapStartAppStep_AppId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep <em>Delete App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Delete App Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep
+	 * @generated
+	 */
+	EClass getCdapDeleteAppStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep#getAppId()
+	 * @see #getCdapDeleteAppStep()
+	 * @generated
+	 */
+	EAttribute getCdapDeleteAppStep_AppId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact <em>Delete Artifact</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Delete Artifact</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact
+	 * @generated
+	 */
+	EClass getCdapDeleteArtifact();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getArtifactName <em>Artifact Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Artifact Name</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getArtifactName()
+	 * @see #getCdapDeleteArtifact()
+	 * @generated
+	 */
+	EAttribute getCdapDeleteArtifact_ArtifactName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getVersion <em>Version</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Version</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact#getVersion()
+	 * @see #getCdapDeleteArtifact()
+	 * @generated
+	 */
+	EAttribute getCdapDeleteArtifact_Version();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep <em>Suspend Schedule Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Suspend Schedule Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep
+	 * @generated
+	 */
+	EClass getCdapSuspendScheduleStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getAppId()
+	 * @see #getCdapSuspendScheduleStep()
+	 * @generated
+	 */
+	EAttribute getCdapSuspendScheduleStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getScheduleId <em>Schedule Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Schedule Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getScheduleId()
+	 * @see #getCdapSuspendScheduleStep()
+	 * @generated
+	 */
+	EAttribute getCdapSuspendScheduleStep_ScheduleId();
+
+	/**
+	 * Returns the meta object for class '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep <em>Resume Schedule Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Resume Schedule Step</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep
+	 * @generated
+	 */
+	EClass getCdapResumeScheduleStep();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getAppId <em>App Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>App Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getAppId()
+	 * @see #getCdapResumeScheduleStep()
+	 * @generated
+	 */
+	EAttribute getCdapResumeScheduleStep_AppId();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getScheduleId <em>Schedule Id</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Schedule Id</em>'.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getScheduleId()
+	 * @see #getCdapResumeScheduleStep()
+	 * @generated
+	 */
+	EAttribute getCdapResumeScheduleStep_ScheduleId();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1484,6 +3658,34 @@ public interface CdapPackage extends EPackage {
 		 */
 		EReference CDAP_SERVICE_INSTANCE__APPS = eINSTANCE.getCdapServiceInstance_Apps();
 		/**
+		 * The meta object literal for the '<em><b>Deploy Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__DEPLOY_STEPS = eINSTANCE.getCdapServiceInstance_DeploySteps();
+		/**
+		 * The meta object literal for the '<em><b>Undeploy Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS = eINSTANCE.getCdapServiceInstance_UndeploySteps();
+		/**
+		 * The meta object literal for the '<em><b>Pre Configuration Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS = eINSTANCE.getCdapServiceInstance_PreConfigurationSteps();
+		/**
+		 * The meta object literal for the '<em><b>Post Configuration Steps</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS = eINSTANCE.getCdapServiceInstance_PostConfigurationSteps();
+		/**
 		 * The meta object literal for the '<em><b>App Names</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1696,6 +3898,406 @@ public interface CdapPackage extends EPackage {
 		 * @generated
 		 */
 		EAttribute CDAP_SERVICE_DESCRIPTOR__JAR_FILE = eINSTANCE.getCdapServiceDescriptor_JarFile();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStepImpl <em>Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStep()
+		 * @generated
+		 */
+		EClass CDAP_STEP = eINSTANCE.getCdapStep();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl <em>Load Artifact Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapLoadArtifactStep()
+		 * @generated
+		 */
+		EClass CDAP_LOAD_ARTIFACT_STEP = eINSTANCE.getCdapLoadArtifactStep();
+		/**
+		 * The meta object literal for the '<em><b>Artifact Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME = eINSTANCE.getCdapLoadArtifactStep_ArtifactName();
+		/**
+		 * The meta object literal for the '<em><b>Jarfile</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_LOAD_ARTIFACT_STEP__JARFILE = eINSTANCE.getCdapLoadArtifactStep_Jarfile();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_LOAD_ARTIFACT_STEP__VERSION = eINSTANCE.getCdapLoadArtifactStep_Version();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl <em>Load Artifact With Config Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapLoadArtifactWithConfigStep()
+		 * @generated
+		 */
+		EClass CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP = eINSTANCE.getCdapLoadArtifactWithConfigStep();
+		/**
+		 * The meta object literal for the '<em><b>Config</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG = eINSTANCE.getCdapLoadArtifactWithConfigStep_Config();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl <em>Create App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapCreateAppStep()
+		 * @generated
+		 */
+		EClass CDAP_CREATE_APP_STEP = eINSTANCE.getCdapCreateAppStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_STEP__APP_ID = eINSTANCE.getCdapCreateAppStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Artifact Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_STEP__ARTIFACT_NAME = eINSTANCE.getCdapCreateAppStep_ArtifactName();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_STEP__VERSION = eINSTANCE.getCdapCreateAppStep_Version();
+		/**
+		 * The meta object literal for the '<em><b>Scope</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_STEP__SCOPE = eINSTANCE.getCdapCreateAppStep_Scope();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl <em>Create App With Config Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapCreateAppWithConfigStep()
+		 * @generated
+		 */
+		EClass CDAP_CREATE_APP_WITH_CONFIG_STEP = eINSTANCE.getCdapCreateAppWithConfigStep();
+		/**
+		 * The meta object literal for the '<em><b>App Config</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG = eINSTANCE.getCdapCreateAppWithConfigStep_AppConfig();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl <em>Deploy App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeployAppStep()
+		 * @generated
+		 */
+		EClass CDAP_DEPLOY_APP_STEP = eINSTANCE.getCdapDeployAppStep();
+		/**
+		 * The meta object literal for the '<em><b>Jarfile</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_DEPLOY_APP_STEP__JARFILE = eINSTANCE.getCdapDeployAppStep_Jarfile();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl <em>Stop Flow Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopFlowStep()
+		 * @generated
+		 */
+		EClass CDAP_STOP_FLOW_STEP = eINSTANCE.getCdapStopFlowStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_FLOW_STEP__APP_ID = eINSTANCE.getCdapStopFlowStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Flow Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_FLOW_STEP__FLOW_ID = eINSTANCE.getCdapStopFlowStep_FlowId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl <em>Stop Worker Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopWorkerStep()
+		 * @generated
+		 */
+		EClass CDAP_STOP_WORKER_STEP = eINSTANCE.getCdapStopWorkerStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_WORKER_STEP__APP_ID = eINSTANCE.getCdapStopWorkerStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Worker Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_WORKER_STEP__WORKER_ID = eINSTANCE.getCdapStopWorkerStep_WorkerId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl <em>Stop Service Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopServiceStep()
+		 * @generated
+		 */
+		EClass CDAP_STOP_SERVICE_STEP = eINSTANCE.getCdapStopServiceStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_SERVICE_STEP__APP_ID = eINSTANCE.getCdapStopServiceStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Service Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_SERVICE_STEP__SERVICE_ID = eINSTANCE.getCdapStopServiceStep_ServiceId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl <em>Stop App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStopAppStep()
+		 * @generated
+		 */
+		EClass CDAP_STOP_APP_STEP = eINSTANCE.getCdapStopAppStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_STOP_APP_STEP__APP_ID = eINSTANCE.getCdapStopAppStep_AppId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl <em>Start Flow Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartFlowStep()
+		 * @generated
+		 */
+		EClass CDAP_START_FLOW_STEP = eINSTANCE.getCdapStartFlowStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_FLOW_STEP__APP_ID = eINSTANCE.getCdapStartFlowStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Flow Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_FLOW_STEP__FLOW_ID = eINSTANCE.getCdapStartFlowStep_FlowId();
+		/**
+		 * The meta object literal for the '<em><b>Extra Args</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_FLOW_STEP__EXTRA_ARGS = eINSTANCE.getCdapStartFlowStep_ExtraArgs();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl <em>Start Worker Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartWorkerStep()
+		 * @generated
+		 */
+		EClass CDAP_START_WORKER_STEP = eINSTANCE.getCdapStartWorkerStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_WORKER_STEP__APP_ID = eINSTANCE.getCdapStartWorkerStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Worker Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_WORKER_STEP__WORKER_ID = eINSTANCE.getCdapStartWorkerStep_WorkerId();
+		/**
+		 * The meta object literal for the '<em><b>Extra Args</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_WORKER_STEP__EXTRA_ARGS = eINSTANCE.getCdapStartWorkerStep_ExtraArgs();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl <em>Start Service Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartServiceStep()
+		 * @generated
+		 */
+		EClass CDAP_START_SERVICE_STEP = eINSTANCE.getCdapStartServiceStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_SERVICE_STEP__APP_ID = eINSTANCE.getCdapStartServiceStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Service Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_SERVICE_STEP__SERVICE_ID = eINSTANCE.getCdapStartServiceStep_ServiceId();
+		/**
+		 * The meta object literal for the '<em><b>Extra Args</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_SERVICE_STEP__EXTRA_ARGS = eINSTANCE.getCdapStartServiceStep_ExtraArgs();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl <em>Start App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapStartAppStep()
+		 * @generated
+		 */
+		EClass CDAP_START_APP_STEP = eINSTANCE.getCdapStartAppStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_START_APP_STEP__APP_ID = eINSTANCE.getCdapStartAppStep_AppId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl <em>Delete App Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeleteAppStep()
+		 * @generated
+		 */
+		EClass CDAP_DELETE_APP_STEP = eINSTANCE.getCdapDeleteAppStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_DELETE_APP_STEP__APP_ID = eINSTANCE.getCdapDeleteAppStep_AppId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl <em>Delete Artifact</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapDeleteArtifact()
+		 * @generated
+		 */
+		EClass CDAP_DELETE_ARTIFACT = eINSTANCE.getCdapDeleteArtifact();
+		/**
+		 * The meta object literal for the '<em><b>Artifact Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_DELETE_ARTIFACT__ARTIFACT_NAME = eINSTANCE.getCdapDeleteArtifact_ArtifactName();
+		/**
+		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_DELETE_ARTIFACT__VERSION = eINSTANCE.getCdapDeleteArtifact_Version();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl <em>Suspend Schedule Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapSuspendScheduleStep()
+		 * @generated
+		 */
+		EClass CDAP_SUSPEND_SCHEDULE_STEP = eINSTANCE.getCdapSuspendScheduleStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SUSPEND_SCHEDULE_STEP__APP_ID = eINSTANCE.getCdapSuspendScheduleStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Schedule Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID = eINSTANCE.getCdapSuspendScheduleStep_ScheduleId();
+		/**
+		 * The meta object literal for the '{@link org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl <em>Resume Schedule Step</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl
+		 * @see org.openecomp.dcae.controller.service.cdap.impl.CdapPackageImpl#getCdapResumeScheduleStep()
+		 * @generated
+		 */
+		EClass CDAP_RESUME_SCHEDULE_STEP = eINSTANCE.getCdapResumeScheduleStep();
+		/**
+		 * The meta object literal for the '<em><b>App Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_RESUME_SCHEDULE_STEP__APP_ID = eINSTANCE.getCdapResumeScheduleStep_AppId();
+		/**
+		 * The meta object literal for the '<em><b>Schedule Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID = eINSTANCE.getCdapResumeScheduleStep_ScheduleId();
 
 	}
 
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapResumeScheduleStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapResumeScheduleStep.java
new file mode 100644
index 0000000..0407e0d
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapResumeScheduleStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Resume Schedule Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getScheduleId <em>Schedule Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapResumeScheduleStep()
+ * @model
+ * @generated
+ */
+public interface CdapResumeScheduleStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapResumeScheduleStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Schedule Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Schedule Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Schedule Id</em>' attribute.
+	 * @see #setScheduleId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapResumeScheduleStep_ScheduleId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getScheduleId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep#getScheduleId <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Schedule Id</em>' attribute.
+	 * @see #getScheduleId()
+	 * @generated
+	 */
+	void setScheduleId(String value);
+
+} // CdapResumeScheduleStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapService.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapService.java
index ff9c57f..2ed6de3 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapService.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapService.java
@@ -33,10 +33,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapService#getInstances <em>Instances</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapService()
  * @model
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceDescriptor.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceDescriptor.java
index 62a853e..36af311 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceDescriptor.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceDescriptor.java
@@ -32,13 +32,13 @@ import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServicePackage <em>Service Package</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceClass <em>Service Class</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getServiceInstanceClass <em>Service Instance Class</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor#getJarFile <em>Jar File</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceDescriptor()
  * @model
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstance.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstance.java
index 7d695d8..df9fdc0 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstance.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapServiceInstance.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapName <em>Cdap Name</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getNamespace <em>Namespace</em>}</li>
@@ -43,6 +44,10 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppConfigFile <em>App Config File</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getArtifacts <em>Artifacts</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getApps <em>Apps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getDeploySteps <em>Deploy Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getUndeploySteps <em>Undeploy Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPreConfigurationSteps <em>Pre Configuration Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getPostConfigurationSteps <em>Post Configuration Steps</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getAppNames <em>App Names</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getWorkerNames <em>Worker Names</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getFlowNames <em>Flow Names</em>}</li>
@@ -53,7 +58,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getCdapNamespace <em>Cdap Namespace</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapServiceInstance#getService <em>Service</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance()
  * @model
@@ -223,6 +227,70 @@ public interface CdapServiceInstance extends DcaeServiceInstance {
 	EList<CdapApplication> getApps();
 
 	/**
+	 * Returns the value of the '<em><b>Deploy Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Deploy Steps</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Deploy Steps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_DeploySteps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapStep> getDeploySteps();
+
+	/**
+	 * Returns the value of the '<em><b>Undeploy Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Undeploy Steps</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Undeploy Steps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_UndeploySteps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapStep> getUndeploySteps();
+
+	/**
+	 * Returns the value of the '<em><b>Pre Configuration Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Pre Configuration Steps</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Pre Configuration Steps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_PreConfigurationSteps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapStep> getPreConfigurationSteps();
+
+	/**
+	 * Returns the value of the '<em><b>Post Configuration Steps</b></em>' containment reference list.
+	 * The list contents are of type {@link org.openecomp.dcae.controller.service.cdap.CdapStep}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Post Configuration Steps</em>' containment reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Post Configuration Steps</em>' containment reference list.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapServiceInstance_PostConfigurationSteps()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<CdapStep> getPostConfigurationSteps();
+
+	/**
 	 * Returns the value of the '<em><b>App Names</b></em>' attribute list.
 	 * The list contents are of type {@link java.lang.String}.
 	 * <!-- begin-user-doc -->
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartAppStep.java
new file mode 100644
index 0000000..d92b415
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartAppStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Start App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapStartAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartAppStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+} // CdapStartAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartFlowStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartFlowStep.java
new file mode 100644
index 0000000..b4ede0a
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartFlowStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Start Flow Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getFlowId <em>Flow Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartFlowStep()
+ * @model
+ * @generated
+ */
+public interface CdapStartFlowStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartFlowStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Flow Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flow Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flow Id</em>' attribute.
+	 * @see #setFlowId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartFlowStep_FlowId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFlowId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getFlowId <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Flow Id</em>' attribute.
+	 * @see #getFlowId()
+	 * @generated
+	 */
+	void setFlowId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extra Args</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Extra Args</em>' attribute.
+	 * @see #setExtraArgs(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartFlowStep_ExtraArgs()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getExtraArgs();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep#getExtraArgs <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Extra Args</em>' attribute.
+	 * @see #getExtraArgs()
+	 * @generated
+	 */
+	void setExtraArgs(String value);
+
+} // CdapStartFlowStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartServiceStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartServiceStep.java
new file mode 100644
index 0000000..0ac15cd
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartServiceStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Start Service Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getServiceId <em>Service Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartServiceStep()
+ * @model
+ * @generated
+ */
+public interface CdapStartServiceStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartServiceStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Id</em>' attribute.
+	 * @see #setServiceId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartServiceStep_ServiceId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getServiceId <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Id</em>' attribute.
+	 * @see #getServiceId()
+	 * @generated
+	 */
+	void setServiceId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extra Args</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Extra Args</em>' attribute.
+	 * @see #setExtraArgs(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartServiceStep_ExtraArgs()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getExtraArgs();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep#getExtraArgs <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Extra Args</em>' attribute.
+	 * @see #getExtraArgs()
+	 * @generated
+	 */
+	void setExtraArgs(String value);
+
+} // CdapStartServiceStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartWorkerStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartWorkerStep.java
new file mode 100644
index 0000000..b87dbf3
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStartWorkerStep.java
@@ -0,0 +1,103 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Start Worker Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getWorkerId <em>Worker Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartWorkerStep()
+ * @model
+ * @generated
+ */
+public interface CdapStartWorkerStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartWorkerStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Worker Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Worker Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Worker Id</em>' attribute.
+	 * @see #setWorkerId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartWorkerStep_WorkerId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getWorkerId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getWorkerId <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Worker Id</em>' attribute.
+	 * @see #getWorkerId()
+	 * @generated
+	 */
+	void setWorkerId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Extra Args</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Extra Args</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Extra Args</em>' attribute.
+	 * @see #setExtraArgs(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStartWorkerStep_ExtraArgs()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getExtraArgs();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep#getExtraArgs <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Extra Args</em>' attribute.
+	 * @see #getExtraArgs()
+	 * @generated
+	 */
+	void setExtraArgs(String value);
+
+} // CdapStartWorkerStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStep.java
new file mode 100644
index 0000000..85daed1
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStep.java
@@ -0,0 +1,18 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+import org.openecomp.ncomp.core.NamedEntity;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStep()
+ * @model abstract="true"
+ * @generated
+ */
+public interface CdapStep extends NamedEntity {
+} // CdapStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java
new file mode 100644
index 0000000..e882774
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopAppStep.java
@@ -0,0 +1,49 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stop App Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopAppStep()
+ * @model
+ * @generated
+ */
+public interface CdapStopAppStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopAppStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+} // CdapStopAppStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopFlowStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopFlowStep.java
new file mode 100644
index 0000000..f09b196
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopFlowStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stop Flow Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getFlowId <em>Flow Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopFlowStep()
+ * @model
+ * @generated
+ */
+public interface CdapStopFlowStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopFlowStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Flow Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Flow Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Flow Id</em>' attribute.
+	 * @see #setFlowId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopFlowStep_FlowId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getFlowId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep#getFlowId <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Flow Id</em>' attribute.
+	 * @see #getFlowId()
+	 * @generated
+	 */
+	void setFlowId(String value);
+
+} // CdapStopFlowStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopServiceStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopServiceStep.java
new file mode 100644
index 0000000..3e28b8e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopServiceStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stop Service Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getServiceId <em>Service Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopServiceStep()
+ * @model
+ * @generated
+ */
+public interface CdapStopServiceStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopServiceStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Service Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Service Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Service Id</em>' attribute.
+	 * @see #setServiceId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopServiceStep_ServiceId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getServiceId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep#getServiceId <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Service Id</em>' attribute.
+	 * @see #getServiceId()
+	 * @generated
+	 */
+	void setServiceId(String value);
+
+} // CdapStopServiceStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopWorkerStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopWorkerStep.java
new file mode 100644
index 0000000..866381b
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapStopWorkerStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Stop Worker Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getWorkerId <em>Worker Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopWorkerStep()
+ * @model
+ * @generated
+ */
+public interface CdapStopWorkerStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopWorkerStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Worker Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Worker Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Worker Id</em>' attribute.
+	 * @see #setWorkerId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapStopWorkerStep_WorkerId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getWorkerId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep#getWorkerId <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Worker Id</em>' attribute.
+	 * @see #getWorkerId()
+	 * @generated
+	 */
+	void setWorkerId(String value);
+
+} // CdapStopWorkerStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapSuspendScheduleStep.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapSuspendScheduleStep.java
new file mode 100644
index 0000000..fe4097f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/CdapSuspendScheduleStep.java
@@ -0,0 +1,76 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Suspend Schedule Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getScheduleId <em>Schedule Id</em>}</li>
+ * </ul>
+ *
+ * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapSuspendScheduleStep()
+ * @model
+ * @generated
+ */
+public interface CdapSuspendScheduleStep extends CdapStep {
+	/**
+	 * Returns the value of the '<em><b>App Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>App Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>App Id</em>' attribute.
+	 * @see #setAppId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapSuspendScheduleStep_AppId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getAppId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getAppId <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>App Id</em>' attribute.
+	 * @see #getAppId()
+	 * @generated
+	 */
+	void setAppId(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Schedule Id</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Schedule Id</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Schedule Id</em>' attribute.
+	 * @see #setScheduleId(String)
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapPackage#getCdapSuspendScheduleStep_ScheduleId()
+	 * @model unique="false"
+	 * @generated
+	 */
+	String getScheduleId();
+
+	/**
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep#getScheduleId <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Schedule Id</em>' attribute.
+	 * @see #getScheduleId()
+	 * @generated
+	 */
+	void setScheduleId(String value);
+
+} // CdapSuspendScheduleStep
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapApplicationImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapApplicationImpl.java
index 416472f..2d41e94 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapApplicationImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapApplicationImpl.java
@@ -38,13 +38,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl#getJarFile <em>Jar File</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl#getArtifactName <em>Artifact Name</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl#getVersion <em>Version</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapApplicationImpl#getAppConfigFileContent <em>App Config File Content</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapArtifactImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapArtifactImpl.java
index 318204e..1f8f9df 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapArtifactImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapArtifactImpl.java
@@ -40,11 +40,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapArtifactImpl#getJarFile <em>Jar File</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapArtifactImpl#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppStepImpl.java
new file mode 100644
index 0000000..8f2e971
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppStepImpl.java
@@ -0,0 +1,324 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Create App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl#getVersion <em>Version</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppStepImpl#getScope <em>Scope</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapCreateAppStepImpl extends CdapStepImpl implements CdapCreateAppStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getArtifactName() <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifactName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ARTIFACT_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getArtifactName() <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifactName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String artifactName = ARTIFACT_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VERSION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String version = VERSION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getScope() <em>Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScope()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SCOPE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getScope() <em>Scope</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScope()
+	 * @generated
+	 * @ordered
+	 */
+	protected String scope = SCOPE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapCreateAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_CREATE_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_CREATE_APP_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setArtifactName(String newArtifactName) {
+		String oldArtifactName = artifactName;
+		artifactName = newArtifactName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME, oldArtifactName, artifactName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVersion(String newVersion) {
+		String oldVersion = version;
+		version = newVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_CREATE_APP_STEP__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getScope() {
+		return scope;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setScope(String newScope) {
+		String oldScope = scope;
+		scope = newScope;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_CREATE_APP_STEP__SCOPE, oldScope, scope));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME:
+				return getArtifactName();
+			case CdapPackage.CDAP_CREATE_APP_STEP__VERSION:
+				return getVersion();
+			case CdapPackage.CDAP_CREATE_APP_STEP__SCOPE:
+				return getScope();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME:
+				setArtifactName((String)newValue);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__VERSION:
+				setVersion((String)newValue);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__SCOPE:
+				setScope((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME:
+				setArtifactName(ARTIFACT_NAME_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_CREATE_APP_STEP__SCOPE:
+				setScope(SCOPE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_CREATE_APP_STEP__ARTIFACT_NAME:
+				return ARTIFACT_NAME_EDEFAULT == null ? artifactName != null : !ARTIFACT_NAME_EDEFAULT.equals(artifactName);
+			case CdapPackage.CDAP_CREATE_APP_STEP__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+			case CdapPackage.CDAP_CREATE_APP_STEP__SCOPE:
+				return SCOPE_EDEFAULT == null ? scope != null : !SCOPE_EDEFAULT.equals(scope);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", artifactName: ");
+		result.append(artifactName);
+		result.append(", version: ");
+		result.append(version);
+		result.append(", scope: ");
+		result.append(scope);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapCreateAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppWithConfigStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppWithConfigStepImpl.java
new file mode 100644
index 0000000..a203951
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapCreateAppWithConfigStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Create App With Config Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapCreateAppWithConfigStepImpl#getAppConfig <em>App Config</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapCreateAppWithConfigStepImpl extends CdapCreateAppStepImpl implements CdapCreateAppWithConfigStep {
+	/**
+	 * The default value of the '{@link #getAppConfig() <em>App Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_CONFIG_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppConfig() <em>App Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appConfig = APP_CONFIG_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapCreateAppWithConfigStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_CREATE_APP_WITH_CONFIG_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppConfig() {
+		return appConfig;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppConfig(String newAppConfig) {
+		String oldAppConfig = appConfig;
+		appConfig = newAppConfig;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG, oldAppConfig, appConfig));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG:
+				return getAppConfig();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG:
+				setAppConfig((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG:
+				setAppConfig(APP_CONFIG_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG:
+				return APP_CONFIG_EDEFAULT == null ? appConfig != null : !APP_CONFIG_EDEFAULT.equals(appConfig);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appConfig: ");
+		result.append(appConfig);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapCreateAppWithConfigStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteAppStepImpl.java
new file mode 100644
index 0000000..93600b8
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteAppStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Delete App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteAppStepImpl#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapDeleteAppStepImpl extends CdapStepImpl implements CdapDeleteAppStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapDeleteAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_DELETE_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_DELETE_APP_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_APP_STEP__APP_ID:
+				return getAppId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_APP_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_APP_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_APP_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapDeleteAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteArtifactImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteArtifactImpl.java
new file mode 100644
index 0000000..cc9510f
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeleteArtifactImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Delete Artifact</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeleteArtifactImpl#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapDeleteArtifactImpl extends CdapStepImpl implements CdapDeleteArtifact {
+	/**
+	 * The default value of the '{@link #getArtifactName() <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifactName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ARTIFACT_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getArtifactName() <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifactName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String artifactName = ARTIFACT_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VERSION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String version = VERSION_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapDeleteArtifactImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_DELETE_ARTIFACT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setArtifactName(String newArtifactName) {
+		String oldArtifactName = artifactName;
+		artifactName = newArtifactName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_DELETE_ARTIFACT__ARTIFACT_NAME, oldArtifactName, artifactName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVersion(String newVersion) {
+		String oldVersion = version;
+		version = newVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_DELETE_ARTIFACT__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_ARTIFACT__ARTIFACT_NAME:
+				return getArtifactName();
+			case CdapPackage.CDAP_DELETE_ARTIFACT__VERSION:
+				return getVersion();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_ARTIFACT__ARTIFACT_NAME:
+				setArtifactName((String)newValue);
+				return;
+			case CdapPackage.CDAP_DELETE_ARTIFACT__VERSION:
+				setVersion((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_ARTIFACT__ARTIFACT_NAME:
+				setArtifactName(ARTIFACT_NAME_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_DELETE_ARTIFACT__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DELETE_ARTIFACT__ARTIFACT_NAME:
+				return ARTIFACT_NAME_EDEFAULT == null ? artifactName != null : !ARTIFACT_NAME_EDEFAULT.equals(artifactName);
+			case CdapPackage.CDAP_DELETE_ARTIFACT__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (artifactName: ");
+		result.append(artifactName);
+		result.append(", version: ");
+		result.append(version);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapDeleteArtifactImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java
new file mode 100644
index 0000000..507a60e
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapDeployAppStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Deploy App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapDeployAppStepImpl#getJarfile <em>Jarfile</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapDeployAppStepImpl extends CdapStepImpl implements CdapDeployAppStep {
+	/**
+	 * The default value of the '{@link #getJarfile() <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarfile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JARFILE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getJarfile() <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarfile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jarfile = JARFILE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapDeployAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_DEPLOY_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getJarfile() {
+		return jarfile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJarfile(String newJarfile) {
+		String oldJarfile = jarfile;
+		jarfile = newJarfile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE, oldJarfile, jarfile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE:
+				return getJarfile();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE:
+				setJarfile((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE:
+				setJarfile(JARFILE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_DEPLOY_APP_STEP__JARFILE:
+				return JARFILE_EDEFAULT == null ? jarfile != null : !JARFILE_EDEFAULT.equals(jarfile);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (jarfile: ");
+		result.append(jarfile);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapDeployAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapFactoryImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapFactoryImpl.java
index d0d0018..99f4b2d 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapFactoryImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapFactoryImpl.java
@@ -84,6 +84,23 @@ public class CdapFactoryImpl extends EFactoryImpl implements CdapFactory {
 			case CdapPackage.CDAP_SERVICE_INSTANCE_CONFIGURATION: return createCdapServiceInstanceConfiguration();
 			case CdapPackage.CDAP_INTERNAL_APPLICATION_CONFIGURATION: return createCdapInternalApplicationConfiguration();
 			case CdapPackage.CDAP_SERVICE_DESCRIPTOR: return createCdapServiceDescriptor();
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP: return createCdapLoadArtifactStep();
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP: return createCdapLoadArtifactWithConfigStep();
+			case CdapPackage.CDAP_CREATE_APP_STEP: return createCdapCreateAppStep();
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP: return createCdapCreateAppWithConfigStep();
+			case CdapPackage.CDAP_DEPLOY_APP_STEP: return createCdapDeployAppStep();
+			case CdapPackage.CDAP_STOP_FLOW_STEP: return createCdapStopFlowStep();
+			case CdapPackage.CDAP_STOP_WORKER_STEP: return createCdapStopWorkerStep();
+			case CdapPackage.CDAP_STOP_SERVICE_STEP: return createCdapStopServiceStep();
+			case CdapPackage.CDAP_STOP_APP_STEP: return createCdapStopAppStep();
+			case CdapPackage.CDAP_START_FLOW_STEP: return createCdapStartFlowStep();
+			case CdapPackage.CDAP_START_WORKER_STEP: return createCdapStartWorkerStep();
+			case CdapPackage.CDAP_START_SERVICE_STEP: return createCdapStartServiceStep();
+			case CdapPackage.CDAP_START_APP_STEP: return createCdapStartAppStep();
+			case CdapPackage.CDAP_DELETE_APP_STEP: return createCdapDeleteAppStep();
+			case CdapPackage.CDAP_DELETE_ARTIFACT: return createCdapDeleteArtifact();
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP: return createCdapSuspendScheduleStep();
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP: return createCdapResumeScheduleStep();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -164,6 +181,176 @@ public class CdapFactoryImpl extends EFactoryImpl implements CdapFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CdapLoadArtifactStep createCdapLoadArtifactStep() {
+		CdapLoadArtifactStepImpl cdapLoadArtifactStep = new CdapLoadArtifactStepImpl();
+		return cdapLoadArtifactStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapLoadArtifactWithConfigStep createCdapLoadArtifactWithConfigStep() {
+		CdapLoadArtifactWithConfigStepImpl cdapLoadArtifactWithConfigStep = new CdapLoadArtifactWithConfigStepImpl();
+		return cdapLoadArtifactWithConfigStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapCreateAppStep createCdapCreateAppStep() {
+		CdapCreateAppStepImpl cdapCreateAppStep = new CdapCreateAppStepImpl();
+		return cdapCreateAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapCreateAppWithConfigStep createCdapCreateAppWithConfigStep() {
+		CdapCreateAppWithConfigStepImpl cdapCreateAppWithConfigStep = new CdapCreateAppWithConfigStepImpl();
+		return cdapCreateAppWithConfigStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapDeployAppStep createCdapDeployAppStep() {
+		CdapDeployAppStepImpl cdapDeployAppStep = new CdapDeployAppStepImpl();
+		return cdapDeployAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStopFlowStep createCdapStopFlowStep() {
+		CdapStopFlowStepImpl cdapStopFlowStep = new CdapStopFlowStepImpl();
+		return cdapStopFlowStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStopWorkerStep createCdapStopWorkerStep() {
+		CdapStopWorkerStepImpl cdapStopWorkerStep = new CdapStopWorkerStepImpl();
+		return cdapStopWorkerStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStopServiceStep createCdapStopServiceStep() {
+		CdapStopServiceStepImpl cdapStopServiceStep = new CdapStopServiceStepImpl();
+		return cdapStopServiceStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStopAppStep createCdapStopAppStep() {
+		CdapStopAppStepImpl cdapStopAppStep = new CdapStopAppStepImpl();
+		return cdapStopAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStartFlowStep createCdapStartFlowStep() {
+		CdapStartFlowStepImpl cdapStartFlowStep = new CdapStartFlowStepImpl();
+		return cdapStartFlowStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStartWorkerStep createCdapStartWorkerStep() {
+		CdapStartWorkerStepImpl cdapStartWorkerStep = new CdapStartWorkerStepImpl();
+		return cdapStartWorkerStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStartServiceStep createCdapStartServiceStep() {
+		CdapStartServiceStepImpl cdapStartServiceStep = new CdapStartServiceStepImpl();
+		return cdapStartServiceStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapStartAppStep createCdapStartAppStep() {
+		CdapStartAppStepImpl cdapStartAppStep = new CdapStartAppStepImpl();
+		return cdapStartAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapDeleteAppStep createCdapDeleteAppStep() {
+		CdapDeleteAppStepImpl cdapDeleteAppStep = new CdapDeleteAppStepImpl();
+		return cdapDeleteAppStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapDeleteArtifact createCdapDeleteArtifact() {
+		CdapDeleteArtifactImpl cdapDeleteArtifact = new CdapDeleteArtifactImpl();
+		return cdapDeleteArtifact;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapSuspendScheduleStep createCdapSuspendScheduleStep() {
+		CdapSuspendScheduleStepImpl cdapSuspendScheduleStep = new CdapSuspendScheduleStepImpl();
+		return cdapSuspendScheduleStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CdapResumeScheduleStep createCdapResumeScheduleStep() {
+		CdapResumeScheduleStepImpl cdapResumeScheduleStep = new CdapResumeScheduleStepImpl();
+		return cdapResumeScheduleStep;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CdapPackage getCdapPackage() {
 		return (CdapPackage)getEPackage();
 	}
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapInternalApplicationConfigurationImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapInternalApplicationConfigurationImpl.java
index 03941cd..f39a849 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapInternalApplicationConfigurationImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapInternalApplicationConfigurationImpl.java
@@ -49,6 +49,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getConfig <em>Config</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getPreferences <em>Preferences</em>}</li>
@@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getFlows <em>Flows</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapInternalApplicationConfigurationImpl#getServices <em>Services</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java
new file mode 100644
index 0000000..c9c3ccc
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactStepImpl.java
@@ -0,0 +1,263 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Load Artifact Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl#getArtifactName <em>Artifact Name</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl#getJarfile <em>Jarfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactStepImpl#getVersion <em>Version</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapLoadArtifactStepImpl extends CdapStepImpl implements CdapLoadArtifactStep {
+	/**
+	 * The default value of the '{@link #getArtifactName() <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifactName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String ARTIFACT_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getArtifactName() <em>Artifact Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getArtifactName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String artifactName = ARTIFACT_NAME_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getJarfile() <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarfile()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String JARFILE_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getJarfile() <em>Jarfile</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getJarfile()
+	 * @generated
+	 * @ordered
+	 */
+	protected String jarfile = JARFILE_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VERSION_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getVersion()
+	 * @generated
+	 * @ordered
+	 */
+	protected String version = VERSION_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapLoadArtifactStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_LOAD_ARTIFACT_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getArtifactName() {
+		return artifactName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setArtifactName(String newArtifactName) {
+		String oldArtifactName = artifactName;
+		artifactName = newArtifactName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME, oldArtifactName, artifactName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getJarfile() {
+		return jarfile;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setJarfile(String newJarfile) {
+		String oldJarfile = jarfile;
+		jarfile = newJarfile;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE, oldJarfile, jarfile));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setVersion(String newVersion) {
+		String oldVersion = version;
+		version = newVersion;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION, oldVersion, version));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME:
+				return getArtifactName();
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE:
+				return getJarfile();
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION:
+				return getVersion();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME:
+				setArtifactName((String)newValue);
+				return;
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE:
+				setJarfile((String)newValue);
+				return;
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION:
+				setVersion((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME:
+				setArtifactName(ARTIFACT_NAME_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE:
+				setJarfile(JARFILE_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION:
+				setVersion(VERSION_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME:
+				return ARTIFACT_NAME_EDEFAULT == null ? artifactName != null : !ARTIFACT_NAME_EDEFAULT.equals(artifactName);
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__JARFILE:
+				return JARFILE_EDEFAULT == null ? jarfile != null : !JARFILE_EDEFAULT.equals(jarfile);
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP__VERSION:
+				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (artifactName: ");
+		result.append(artifactName);
+		result.append(", jarfile: ");
+		result.append(jarfile);
+		result.append(", version: ");
+		result.append(version);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapLoadArtifactStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactWithConfigStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactWithConfigStepImpl.java
new file mode 100644
index 0000000..7bf5cda
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapLoadArtifactWithConfigStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep;
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Load Artifact With Config Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapLoadArtifactWithConfigStepImpl#getConfig <em>Config</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapLoadArtifactWithConfigStepImpl extends CdapLoadArtifactStepImpl implements CdapLoadArtifactWithConfigStep {
+	/**
+	 * The default value of the '{@link #getConfig() <em>Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CONFIG_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getConfig() <em>Config</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getConfig()
+	 * @generated
+	 * @ordered
+	 */
+	protected String config = CONFIG_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapLoadArtifactWithConfigStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getConfig() {
+		return config;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setConfig(String newConfig) {
+		String oldConfig = config;
+		config = newConfig;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG, oldConfig, config));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG:
+				return getConfig();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG:
+				setConfig((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG:
+				setConfig(CONFIG_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG:
+				return CONFIG_EDEFAULT == null ? config != null : !CONFIG_EDEFAULT.equals(config);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (config: ");
+		result.append(config);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapLoadArtifactWithConfigStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java
index e6e6f7c..1f60df4 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapPackageImpl.java
@@ -26,13 +26,31 @@ package org.openecomp.dcae.controller.service.cdap.impl;
 import org.openecomp.dcae.controller.core.service.ServicePackage;
 import org.openecomp.dcae.controller.service.cdap.CdapApplication;
 import org.openecomp.dcae.controller.service.cdap.CdapArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep;
+import org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact;
+import org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep;
 import org.openecomp.dcae.controller.service.cdap.CdapFactory;
 import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep;
+import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep;
 import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep;
 import org.openecomp.dcae.controller.service.cdap.CdapService;
 import org.openecomp.dcae.controller.service.cdap.CdapServiceDescriptor;
 import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance;
 import org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapStartAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopAppStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep;
+import org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep;
+import org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep;
 import org.openecomp.ncomp.core.CorePackage;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -99,6 +117,132 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	private EClass cdapServiceDescriptorEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapLoadArtifactStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapLoadArtifactWithConfigStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapCreateAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapCreateAppWithConfigStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapDeployAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStopFlowStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStopWorkerStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStopServiceStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStopAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStartFlowStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStartWorkerStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStartServiceStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapStartAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapDeleteAppStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapDeleteArtifactEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapSuspendScheduleStepEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cdapResumeScheduleStepEClass = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
@@ -213,7 +357,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_CdapNamespace() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(13);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(17);
 	}
 
 	/**
@@ -266,8 +410,44 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EReference getCdapServiceInstance_DeploySteps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_UndeploySteps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_PreConfigurationSteps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCdapServiceInstance_PostConfigurationSteps() {
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EAttribute getCdapServiceInstance_AppNames() {
-		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(6);
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(10);
 	}
 
 	/**
@@ -276,7 +456,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EAttribute getCdapServiceInstance_WorkerNames() {
-		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(7);
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(11);
 	}
 
 	/**
@@ -285,7 +465,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EAttribute getCdapServiceInstance_FlowNames() {
-		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(8);
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(12);
 	}
 
 	/**
@@ -294,7 +474,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EAttribute getCdapServiceInstance_ServiceNames() {
-		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(9);
+		return (EAttribute)cdapServiceInstanceEClass.getEStructuralFeatures().get(13);
 	}
 
 	/**
@@ -303,7 +483,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_Configuration() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(10);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(14);
 	}
 
 	/**
@@ -312,7 +492,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_CdapConfiguration() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(11);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(15);
 	}
 
 	/**
@@ -321,7 +501,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_ClusterService() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(12);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(16);
 	}
 
 	/**
@@ -330,7 +510,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * @generated
 	 */
 	public EReference getCdapServiceInstance_Service() {
-		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(14);
+		return (EReference)cdapServiceInstanceEClass.getEStructuralFeatures().get(18);
 	}
 
 	/**
@@ -527,6 +707,474 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getCdapStep() {
+		return cdapStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapLoadArtifactStep() {
+		return cdapLoadArtifactStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapLoadArtifactStep_ArtifactName() {
+		return (EAttribute)cdapLoadArtifactStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapLoadArtifactStep_Jarfile() {
+		return (EAttribute)cdapLoadArtifactStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapLoadArtifactStep_Version() {
+		return (EAttribute)cdapLoadArtifactStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapLoadArtifactWithConfigStep() {
+		return cdapLoadArtifactWithConfigStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapLoadArtifactWithConfigStep_Config() {
+		return (EAttribute)cdapLoadArtifactWithConfigStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapCreateAppStep() {
+		return cdapCreateAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppStep_AppId() {
+		return (EAttribute)cdapCreateAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppStep_ArtifactName() {
+		return (EAttribute)cdapCreateAppStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppStep_Version() {
+		return (EAttribute)cdapCreateAppStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppStep_Scope() {
+		return (EAttribute)cdapCreateAppStepEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapCreateAppWithConfigStep() {
+		return cdapCreateAppWithConfigStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapCreateAppWithConfigStep_AppConfig() {
+		return (EAttribute)cdapCreateAppWithConfigStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapDeployAppStep() {
+		return cdapDeployAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapDeployAppStep_Jarfile() {
+		return (EAttribute)cdapDeployAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStopFlowStep() {
+		return cdapStopFlowStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopFlowStep_AppId() {
+		return (EAttribute)cdapStopFlowStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopFlowStep_FlowId() {
+		return (EAttribute)cdapStopFlowStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStopWorkerStep() {
+		return cdapStopWorkerStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopWorkerStep_AppId() {
+		return (EAttribute)cdapStopWorkerStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopWorkerStep_WorkerId() {
+		return (EAttribute)cdapStopWorkerStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStopServiceStep() {
+		return cdapStopServiceStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopServiceStep_AppId() {
+		return (EAttribute)cdapStopServiceStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopServiceStep_ServiceId() {
+		return (EAttribute)cdapStopServiceStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStopAppStep() {
+		return cdapStopAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStopAppStep_AppId() {
+		return (EAttribute)cdapStopAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStartFlowStep() {
+		return cdapStartFlowStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartFlowStep_AppId() {
+		return (EAttribute)cdapStartFlowStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartFlowStep_FlowId() {
+		return (EAttribute)cdapStartFlowStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartFlowStep_ExtraArgs() {
+		return (EAttribute)cdapStartFlowStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStartWorkerStep() {
+		return cdapStartWorkerStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartWorkerStep_AppId() {
+		return (EAttribute)cdapStartWorkerStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartWorkerStep_WorkerId() {
+		return (EAttribute)cdapStartWorkerStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartWorkerStep_ExtraArgs() {
+		return (EAttribute)cdapStartWorkerStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStartServiceStep() {
+		return cdapStartServiceStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartServiceStep_AppId() {
+		return (EAttribute)cdapStartServiceStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartServiceStep_ServiceId() {
+		return (EAttribute)cdapStartServiceStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartServiceStep_ExtraArgs() {
+		return (EAttribute)cdapStartServiceStepEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapStartAppStep() {
+		return cdapStartAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapStartAppStep_AppId() {
+		return (EAttribute)cdapStartAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapDeleteAppStep() {
+		return cdapDeleteAppStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapDeleteAppStep_AppId() {
+		return (EAttribute)cdapDeleteAppStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapDeleteArtifact() {
+		return cdapDeleteArtifactEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapDeleteArtifact_ArtifactName() {
+		return (EAttribute)cdapDeleteArtifactEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapDeleteArtifact_Version() {
+		return (EAttribute)cdapDeleteArtifactEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapSuspendScheduleStep() {
+		return cdapSuspendScheduleStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapSuspendScheduleStep_AppId() {
+		return (EAttribute)cdapSuspendScheduleStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapSuspendScheduleStep_ScheduleId() {
+		return (EAttribute)cdapSuspendScheduleStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCdapResumeScheduleStep() {
+		return cdapResumeScheduleStepEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapResumeScheduleStep_AppId() {
+		return (EAttribute)cdapResumeScheduleStepEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCdapResumeScheduleStep_ScheduleId() {
+		return (EAttribute)cdapResumeScheduleStepEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public CdapFactory getCdapFactory() {
 		return (CdapFactory)getEFactoryInstance();
 	}
@@ -561,6 +1209,10 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APP_CONFIG_FILE);
 		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__ARTIFACTS);
 		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APPS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__DEPLOY_STEPS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS);
+		createEReference(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS);
 		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__APP_NAMES);
 		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__WORKER_NAMES);
 		createEAttribute(cdapServiceInstanceEClass, CDAP_SERVICE_INSTANCE__FLOW_NAMES);
@@ -596,6 +1248,76 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__SERVICE_CLASS);
 		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__SERVICE_INSTANCE_CLASS);
 		createEAttribute(cdapServiceDescriptorEClass, CDAP_SERVICE_DESCRIPTOR__JAR_FILE);
+
+		cdapStepEClass = createEClass(CDAP_STEP);
+
+		cdapLoadArtifactStepEClass = createEClass(CDAP_LOAD_ARTIFACT_STEP);
+		createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__ARTIFACT_NAME);
+		createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__JARFILE);
+		createEAttribute(cdapLoadArtifactStepEClass, CDAP_LOAD_ARTIFACT_STEP__VERSION);
+
+		cdapLoadArtifactWithConfigStepEClass = createEClass(CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP);
+		createEAttribute(cdapLoadArtifactWithConfigStepEClass, CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP__CONFIG);
+
+		cdapCreateAppStepEClass = createEClass(CDAP_CREATE_APP_STEP);
+		createEAttribute(cdapCreateAppStepEClass, CDAP_CREATE_APP_STEP__APP_ID);
+		createEAttribute(cdapCreateAppStepEClass, CDAP_CREATE_APP_STEP__ARTIFACT_NAME);
+		createEAttribute(cdapCreateAppStepEClass, CDAP_CREATE_APP_STEP__VERSION);
+		createEAttribute(cdapCreateAppStepEClass, CDAP_CREATE_APP_STEP__SCOPE);
+
+		cdapCreateAppWithConfigStepEClass = createEClass(CDAP_CREATE_APP_WITH_CONFIG_STEP);
+		createEAttribute(cdapCreateAppWithConfigStepEClass, CDAP_CREATE_APP_WITH_CONFIG_STEP__APP_CONFIG);
+
+		cdapDeployAppStepEClass = createEClass(CDAP_DEPLOY_APP_STEP);
+		createEAttribute(cdapDeployAppStepEClass, CDAP_DEPLOY_APP_STEP__JARFILE);
+
+		cdapStopFlowStepEClass = createEClass(CDAP_STOP_FLOW_STEP);
+		createEAttribute(cdapStopFlowStepEClass, CDAP_STOP_FLOW_STEP__APP_ID);
+		createEAttribute(cdapStopFlowStepEClass, CDAP_STOP_FLOW_STEP__FLOW_ID);
+
+		cdapStopWorkerStepEClass = createEClass(CDAP_STOP_WORKER_STEP);
+		createEAttribute(cdapStopWorkerStepEClass, CDAP_STOP_WORKER_STEP__APP_ID);
+		createEAttribute(cdapStopWorkerStepEClass, CDAP_STOP_WORKER_STEP__WORKER_ID);
+
+		cdapStopServiceStepEClass = createEClass(CDAP_STOP_SERVICE_STEP);
+		createEAttribute(cdapStopServiceStepEClass, CDAP_STOP_SERVICE_STEP__APP_ID);
+		createEAttribute(cdapStopServiceStepEClass, CDAP_STOP_SERVICE_STEP__SERVICE_ID);
+
+		cdapStopAppStepEClass = createEClass(CDAP_STOP_APP_STEP);
+		createEAttribute(cdapStopAppStepEClass, CDAP_STOP_APP_STEP__APP_ID);
+
+		cdapStartFlowStepEClass = createEClass(CDAP_START_FLOW_STEP);
+		createEAttribute(cdapStartFlowStepEClass, CDAP_START_FLOW_STEP__APP_ID);
+		createEAttribute(cdapStartFlowStepEClass, CDAP_START_FLOW_STEP__FLOW_ID);
+		createEAttribute(cdapStartFlowStepEClass, CDAP_START_FLOW_STEP__EXTRA_ARGS);
+
+		cdapStartWorkerStepEClass = createEClass(CDAP_START_WORKER_STEP);
+		createEAttribute(cdapStartWorkerStepEClass, CDAP_START_WORKER_STEP__APP_ID);
+		createEAttribute(cdapStartWorkerStepEClass, CDAP_START_WORKER_STEP__WORKER_ID);
+		createEAttribute(cdapStartWorkerStepEClass, CDAP_START_WORKER_STEP__EXTRA_ARGS);
+
+		cdapStartServiceStepEClass = createEClass(CDAP_START_SERVICE_STEP);
+		createEAttribute(cdapStartServiceStepEClass, CDAP_START_SERVICE_STEP__APP_ID);
+		createEAttribute(cdapStartServiceStepEClass, CDAP_START_SERVICE_STEP__SERVICE_ID);
+		createEAttribute(cdapStartServiceStepEClass, CDAP_START_SERVICE_STEP__EXTRA_ARGS);
+
+		cdapStartAppStepEClass = createEClass(CDAP_START_APP_STEP);
+		createEAttribute(cdapStartAppStepEClass, CDAP_START_APP_STEP__APP_ID);
+
+		cdapDeleteAppStepEClass = createEClass(CDAP_DELETE_APP_STEP);
+		createEAttribute(cdapDeleteAppStepEClass, CDAP_DELETE_APP_STEP__APP_ID);
+
+		cdapDeleteArtifactEClass = createEClass(CDAP_DELETE_ARTIFACT);
+		createEAttribute(cdapDeleteArtifactEClass, CDAP_DELETE_ARTIFACT__ARTIFACT_NAME);
+		createEAttribute(cdapDeleteArtifactEClass, CDAP_DELETE_ARTIFACT__VERSION);
+
+		cdapSuspendScheduleStepEClass = createEClass(CDAP_SUSPEND_SCHEDULE_STEP);
+		createEAttribute(cdapSuspendScheduleStepEClass, CDAP_SUSPEND_SCHEDULE_STEP__APP_ID);
+		createEAttribute(cdapSuspendScheduleStepEClass, CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID);
+
+		cdapResumeScheduleStepEClass = createEClass(CDAP_RESUME_SCHEDULE_STEP);
+		createEAttribute(cdapResumeScheduleStepEClass, CDAP_RESUME_SCHEDULE_STEP__APP_ID);
+		createEAttribute(cdapResumeScheduleStepEClass, CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID);
 	}
 
 	/**
@@ -638,6 +1360,24 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		cdapApplicationEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
 		cdapArtifactEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
 		cdapServiceDescriptorEClass.getESuperTypes().add(theServicePackage_1.getDcaeServiceDescriptor());
+		cdapStepEClass.getESuperTypes().add(theCorePackage.getNamedEntity());
+		cdapLoadArtifactStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapLoadArtifactWithConfigStepEClass.getESuperTypes().add(this.getCdapLoadArtifactStep());
+		cdapCreateAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapCreateAppWithConfigStepEClass.getESuperTypes().add(this.getCdapCreateAppStep());
+		cdapDeployAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStopFlowStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStopWorkerStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStopServiceStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStopAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStartFlowStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStartWorkerStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStartServiceStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapStartAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapDeleteAppStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapDeleteArtifactEClass.getESuperTypes().add(this.getCdapStep());
+		cdapSuspendScheduleStepEClass.getESuperTypes().add(this.getCdapStep());
+		cdapResumeScheduleStepEClass.getESuperTypes().add(this.getCdapStep());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(cdapServiceEClass, CdapService.class, "CdapService", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -653,6 +1393,10 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		initEAttribute(getCdapServiceInstance_AppConfigFile(), theEcorePackage.getEString(), "appConfigFile", null, 0, 1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCdapServiceInstance_Artifacts(), this.getCdapArtifact(), null, "artifacts", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCdapServiceInstance_Apps(), this.getCdapApplication(), null, "apps", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_DeploySteps(), this.getCdapStep(), null, "deploySteps", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_UndeploySteps(), this.getCdapStep(), null, "undeploySteps", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_PreConfigurationSteps(), this.getCdapStep(), null, "preConfigurationSteps", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCdapServiceInstance_PostConfigurationSteps(), this.getCdapStep(), null, "postConfigurationSteps", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCdapServiceInstance_AppNames(), theEcorePackage.getEString(), "appNames", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCdapServiceInstance_WorkerNames(), theEcorePackage.getEString(), "workerNames", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCdapServiceInstance_FlowNames(), theEcorePackage.getEString(), "flowNames", null, 0, -1, CdapServiceInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -689,6 +1433,76 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		initEAttribute(getCdapServiceDescriptor_ServiceInstanceClass(), theEcorePackage.getEString(), "serviceInstanceClass", null, 0, 1, CdapServiceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCdapServiceDescriptor_JarFile(), theEcorePackage.getEString(), "jarFile", null, 0, 1, CdapServiceDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(cdapStepEClass, CdapStep.class, "CdapStep", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cdapLoadArtifactStepEClass, CdapLoadArtifactStep.class, "CdapLoadArtifactStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapLoadArtifactStep_ArtifactName(), theEcorePackage.getEString(), "artifactName", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapLoadArtifactStep_Jarfile(), theEcorePackage.getEString(), "jarfile", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapLoadArtifactStep_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapLoadArtifactStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapLoadArtifactWithConfigStepEClass, CdapLoadArtifactWithConfigStep.class, "CdapLoadArtifactWithConfigStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapLoadArtifactWithConfigStep_Config(), theEcorePackage.getEString(), "config", null, 0, 1, CdapLoadArtifactWithConfigStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapCreateAppStepEClass, CdapCreateAppStep.class, "CdapCreateAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapCreateAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapCreateAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapCreateAppStep_ArtifactName(), theEcorePackage.getEString(), "artifactName", null, 0, 1, CdapCreateAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapCreateAppStep_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapCreateAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapCreateAppStep_Scope(), theEcorePackage.getEString(), "scope", null, 0, 1, CdapCreateAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapCreateAppWithConfigStepEClass, CdapCreateAppWithConfigStep.class, "CdapCreateAppWithConfigStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapCreateAppWithConfigStep_AppConfig(), theEcorePackage.getEString(), "appConfig", null, 0, 1, CdapCreateAppWithConfigStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapDeployAppStepEClass, CdapDeployAppStep.class, "CdapDeployAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapDeployAppStep_Jarfile(), theEcorePackage.getEString(), "jarfile", null, 0, 1, CdapDeployAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStopFlowStepEClass, CdapStopFlowStep.class, "CdapStopFlowStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStopFlowStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStopFlowStep_FlowId(), theEcorePackage.getEString(), "flowId", null, 0, 1, CdapStopFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStopWorkerStepEClass, CdapStopWorkerStep.class, "CdapStopWorkerStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStopWorkerStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStopWorkerStep_WorkerId(), theEcorePackage.getEString(), "workerId", null, 0, 1, CdapStopWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStopServiceStepEClass, CdapStopServiceStep.class, "CdapStopServiceStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStopServiceStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStopServiceStep_ServiceId(), theEcorePackage.getEString(), "serviceId", null, 0, 1, CdapStopServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStopAppStepEClass, CdapStopAppStep.class, "CdapStopAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStopAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStopAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStartFlowStepEClass, CdapStartFlowStep.class, "CdapStartFlowStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStartFlowStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartFlowStep_FlowId(), theEcorePackage.getEString(), "flowId", null, 0, 1, CdapStartFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartFlowStep_ExtraArgs(), theEcorePackage.getEString(), "extraArgs", null, 0, 1, CdapStartFlowStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStartWorkerStepEClass, CdapStartWorkerStep.class, "CdapStartWorkerStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStartWorkerStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartWorkerStep_WorkerId(), theEcorePackage.getEString(), "workerId", null, 0, 1, CdapStartWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartWorkerStep_ExtraArgs(), theEcorePackage.getEString(), "extraArgs", null, 0, 1, CdapStartWorkerStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStartServiceStepEClass, CdapStartServiceStep.class, "CdapStartServiceStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStartServiceStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartServiceStep_ServiceId(), theEcorePackage.getEString(), "serviceId", null, 0, 1, CdapStartServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapStartServiceStep_ExtraArgs(), theEcorePackage.getEString(), "extraArgs", null, 0, 1, CdapStartServiceStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapStartAppStepEClass, CdapStartAppStep.class, "CdapStartAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapStartAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapStartAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapDeleteAppStepEClass, CdapDeleteAppStep.class, "CdapDeleteAppStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapDeleteAppStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapDeleteAppStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapDeleteArtifactEClass, CdapDeleteArtifact.class, "CdapDeleteArtifact", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapDeleteArtifact_ArtifactName(), theEcorePackage.getEString(), "artifactName", null, 0, 1, CdapDeleteArtifact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapDeleteArtifact_Version(), theEcorePackage.getEString(), "version", null, 0, 1, CdapDeleteArtifact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapSuspendScheduleStepEClass, CdapSuspendScheduleStep.class, "CdapSuspendScheduleStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapSuspendScheduleStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapSuspendScheduleStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapSuspendScheduleStep_ScheduleId(), theEcorePackage.getEString(), "scheduleId", null, 0, 1, CdapSuspendScheduleStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(cdapResumeScheduleStepEClass, CdapResumeScheduleStep.class, "CdapResumeScheduleStep", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getCdapResumeScheduleStep_AppId(), theEcorePackage.getEString(), "appId", null, 0, 1, CdapResumeScheduleStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCdapResumeScheduleStep_ScheduleId(), theEcorePackage.getEString(), "scheduleId", null, 0, 1, CdapResumeScheduleStep.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 
@@ -696,7 +1510,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 		// http://www.eclipse.org/emf/2011/Xcore
 		createXcoreAnnotations();
 		// http://openecomp.org
-		createEcompAnnotations();
+		createOpenecompAnnotations();
 	}
 
 	/**
@@ -722,7 +1536,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void createEcompAnnotations() {
+	protected void createOpenecompAnnotations() {
 		String source = "http://openecomp.org";	
 		addAnnotation
 		  (getCdapServiceInstance_Configuration(), 
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapResumeScheduleStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapResumeScheduleStepImpl.java
new file mode 100644
index 0000000..b04fd25
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapResumeScheduleStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Resume Schedule Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapResumeScheduleStepImpl#getScheduleId <em>Schedule Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapResumeScheduleStepImpl extends CdapStepImpl implements CdapResumeScheduleStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getScheduleId() <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScheduleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SCHEDULE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getScheduleId() <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScheduleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String scheduleId = SCHEDULE_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapResumeScheduleStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_RESUME_SCHEDULE_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_RESUME_SCHEDULE_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getScheduleId() {
+		return scheduleId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setScheduleId(String newScheduleId) {
+		String oldScheduleId = scheduleId;
+		scheduleId = newScheduleId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID, oldScheduleId, scheduleId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID:
+				return getScheduleId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID:
+				setScheduleId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID:
+				setScheduleId(SCHEDULE_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP__SCHEDULE_ID:
+				return SCHEDULE_ID_EDEFAULT == null ? scheduleId != null : !SCHEDULE_ID_EDEFAULT.equals(scheduleId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", scheduleId: ");
+		result.append(scheduleId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapResumeScheduleStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceDescriptorImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceDescriptorImpl.java
index 7855124..a2a7691 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceDescriptorImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceDescriptorImpl.java
@@ -40,13 +40,13 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl#getServicePackage <em>Service Package</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl#getServiceClass <em>Service Class</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl#getServiceInstanceClass <em>Service Instance Class</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceDescriptorImpl#getJarFile <em>Jar File</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceImpl.java
index a219229..55955b5 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceImpl.java
@@ -42,10 +42,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceImpl#getInstances <em>Instances</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceConfigurationImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceConfigurationImpl.java
index b4fbc69..601a80a 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceConfigurationImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceConfigurationImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Service Instance Configuration</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceImpl.java
index 07ebb3e..5786fd1 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapServiceInstanceImpl.java
@@ -33,6 +33,7 @@ import org.openecomp.dcae.controller.service.cdap.CdapService;
 import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance;
 
 import org.openecomp.dcae.controller.service.cdap.CdapServiceInstanceConfiguration;
+import org.openecomp.dcae.controller.service.cdap.CdapStep;
 import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance;
 import org.openecomp.ncomp.cdap.CdapNamespace;
 
@@ -56,6 +57,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getCdapName <em>Cdap Name</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getNamespace <em>Namespace</em>}</li>
@@ -63,6 +65,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getAppConfigFile <em>App Config File</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getArtifacts <em>Artifacts</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getApps <em>Apps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getDeploySteps <em>Deploy Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getUndeploySteps <em>Undeploy Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getPreConfigurationSteps <em>Pre Configuration Steps</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getPostConfigurationSteps <em>Post Configuration Steps</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getAppNames <em>App Names</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getWorkerNames <em>Worker Names</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getFlowNames <em>Flow Names</em>}</li>
@@ -73,7 +79,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getCdapNamespace <em>Cdap Namespace</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapServiceInstanceImpl#getService <em>Service</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -179,6 +184,46 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 	protected EList<CdapApplication> apps;
 
 	/**
+	 * The cached value of the '{@link #getDeploySteps() <em>Deploy Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDeploySteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapStep> deploySteps;
+
+	/**
+	 * The cached value of the '{@link #getUndeploySteps() <em>Undeploy Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUndeploySteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapStep> undeploySteps;
+
+	/**
+	 * The cached value of the '{@link #getPreConfigurationSteps() <em>Pre Configuration Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPreConfigurationSteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapStep> preConfigurationSteps;
+
+	/**
+	 * The cached value of the '{@link #getPostConfigurationSteps() <em>Post Configuration Steps</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getPostConfigurationSteps()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<CdapStep> postConfigurationSteps;
+
+	/**
 	 * The cached value of the '{@link #getAppNames() <em>App Names</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -428,6 +473,54 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EList<CdapStep> getDeploySteps() {
+		if (deploySteps == null) {
+			deploySteps = new EObjectContainmentEList<CdapStep>(CdapStep.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS);
+		}
+		return deploySteps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapStep> getUndeploySteps() {
+		if (undeploySteps == null) {
+			undeploySteps = new EObjectContainmentEList<CdapStep>(CdapStep.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS);
+		}
+		return undeploySteps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapStep> getPreConfigurationSteps() {
+		if (preConfigurationSteps == null) {
+			preConfigurationSteps = new EObjectContainmentEList<CdapStep>(CdapStep.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS);
+		}
+		return preConfigurationSteps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<CdapStep> getPostConfigurationSteps() {
+		if (postConfigurationSteps == null) {
+			postConfigurationSteps = new EObjectContainmentEList<CdapStep>(CdapStep.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS);
+		}
+		return postConfigurationSteps;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public EList<String> getAppNames() {
 		if (appNames == null) {
 			appNames = new EDataTypeEList<String>(String.class, this, CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES);
@@ -674,6 +767,14 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 				return ((InternalEList<?>)getArtifacts()).basicRemove(otherEnd, msgs);
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
 				return ((InternalEList<?>)getApps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				return ((InternalEList<?>)getDeploySteps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				return ((InternalEList<?>)getUndeploySteps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				return ((InternalEList<?>)getPreConfigurationSteps()).basicRemove(otherEnd, msgs);
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				return ((InternalEList<?>)getPostConfigurationSteps()).basicRemove(otherEnd, msgs);
 			case CdapPackage.CDAP_SERVICE_INSTANCE__CONFIGURATION:
 				return basicSetConfiguration(null, msgs);
 			case CdapPackage.CDAP_SERVICE_INSTANCE__CDAP_CONFIGURATION:
@@ -718,6 +819,14 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 				return getArtifacts();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
 				return getApps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				return getDeploySteps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				return getUndeploySteps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				return getPreConfigurationSteps();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				return getPostConfigurationSteps();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
 				return getAppNames();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES:
@@ -772,6 +881,22 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 				getApps().clear();
 				getApps().addAll((Collection<? extends CdapApplication>)newValue);
 				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				getDeploySteps().clear();
+				getDeploySteps().addAll((Collection<? extends CdapStep>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				getUndeploySteps().clear();
+				getUndeploySteps().addAll((Collection<? extends CdapStep>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				getPreConfigurationSteps().clear();
+				getPreConfigurationSteps().addAll((Collection<? extends CdapStep>)newValue);
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				getPostConfigurationSteps().clear();
+				getPostConfigurationSteps().addAll((Collection<? extends CdapStep>)newValue);
+				return;
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
 				getAppNames().clear();
 				getAppNames().addAll((Collection<? extends String>)newValue);
@@ -833,6 +958,18 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
 				getApps().clear();
 				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				getDeploySteps().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				getUndeploySteps().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				getPreConfigurationSteps().clear();
+				return;
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				getPostConfigurationSteps().clear();
+				return;
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
 				getAppNames().clear();
 				return;
@@ -884,6 +1021,14 @@ public class CdapServiceInstanceImpl extends DcaeServiceInstanceImpl implements
 				return artifacts != null && !artifacts.isEmpty();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APPS:
 				return apps != null && !apps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__DEPLOY_STEPS:
+				return deploySteps != null && !deploySteps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__UNDEPLOY_STEPS:
+				return undeploySteps != null && !undeploySteps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__PRE_CONFIGURATION_STEPS:
+				return preConfigurationSteps != null && !preConfigurationSteps.isEmpty();
+			case CdapPackage.CDAP_SERVICE_INSTANCE__POST_CONFIGURATION_STEPS:
+				return postConfigurationSteps != null && !postConfigurationSteps.isEmpty();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__APP_NAMES:
 				return appNames != null && !appNames.isEmpty();
 			case CdapPackage.CDAP_SERVICE_INSTANCE__WORKER_NAMES:
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartAppStepImpl.java
new file mode 100644
index 0000000..3d40664
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartAppStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStartAppStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Start App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartAppStepImpl#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStartAppStepImpl extends CdapStepImpl implements CdapStartAppStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStartAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_START_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_APP_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_APP_STEP__APP_ID:
+				return getAppId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_APP_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_APP_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_APP_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStartAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartFlowStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartFlowStepImpl.java
new file mode 100644
index 0000000..f3c5ebe
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartFlowStepImpl.java
@@ -0,0 +1,270 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Start Flow Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl#getFlowId <em>Flow Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartFlowStepImpl#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStartFlowStepImpl extends CdapStepImpl implements CdapStartFlowStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFlowId() <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FLOW_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFlowId() <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String flowId = FLOW_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EXTRA_ARGS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected String extraArgs = EXTRA_ARGS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStartFlowStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_START_FLOW_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_FLOW_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFlowId() {
+		return flowId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFlowId(String newFlowId) {
+		String oldFlowId = flowId;
+		flowId = newFlowId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID, oldFlowId, flowId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getExtraArgs() {
+		return extraArgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExtraArgs(String newExtraArgs) {
+		String oldExtraArgs = extraArgs;
+		extraArgs = newExtraArgs;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS, oldExtraArgs, extraArgs));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_FLOW_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID:
+				return getFlowId();
+			case CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS:
+				return getExtraArgs();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_FLOW_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID:
+				setFlowId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS:
+				setExtraArgs((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_FLOW_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID:
+				setFlowId(FLOW_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS:
+				setExtraArgs(EXTRA_ARGS_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_FLOW_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_START_FLOW_STEP__FLOW_ID:
+				return FLOW_ID_EDEFAULT == null ? flowId != null : !FLOW_ID_EDEFAULT.equals(flowId);
+			case CdapPackage.CDAP_START_FLOW_STEP__EXTRA_ARGS:
+				return EXTRA_ARGS_EDEFAULT == null ? extraArgs != null : !EXTRA_ARGS_EDEFAULT.equals(extraArgs);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", flowId: ");
+		result.append(flowId);
+		result.append(", extraArgs: ");
+		result.append(extraArgs);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStartFlowStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartServiceStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartServiceStepImpl.java
new file mode 100644
index 0000000..03833b6
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartServiceStepImpl.java
@@ -0,0 +1,270 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Start Service Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl#getServiceId <em>Service Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartServiceStepImpl#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStartServiceStepImpl extends CdapStepImpl implements CdapStartServiceStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceId() <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceId() <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceId = SERVICE_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EXTRA_ARGS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected String extraArgs = EXTRA_ARGS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStartServiceStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_START_SERVICE_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_SERVICE_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceId(String newServiceId) {
+		String oldServiceId = serviceId;
+		serviceId = newServiceId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID, oldServiceId, serviceId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getExtraArgs() {
+		return extraArgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExtraArgs(String newExtraArgs) {
+		String oldExtraArgs = extraArgs;
+		extraArgs = newExtraArgs;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS, oldExtraArgs, extraArgs));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_SERVICE_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID:
+				return getServiceId();
+			case CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS:
+				return getExtraArgs();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_SERVICE_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID:
+				setServiceId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS:
+				setExtraArgs((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_SERVICE_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID:
+				setServiceId(SERVICE_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS:
+				setExtraArgs(EXTRA_ARGS_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_SERVICE_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_START_SERVICE_STEP__SERVICE_ID:
+				return SERVICE_ID_EDEFAULT == null ? serviceId != null : !SERVICE_ID_EDEFAULT.equals(serviceId);
+			case CdapPackage.CDAP_START_SERVICE_STEP__EXTRA_ARGS:
+				return EXTRA_ARGS_EDEFAULT == null ? extraArgs != null : !EXTRA_ARGS_EDEFAULT.equals(extraArgs);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", serviceId: ");
+		result.append(serviceId);
+		result.append(", extraArgs: ");
+		result.append(extraArgs);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStartServiceStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartWorkerStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartWorkerStepImpl.java
new file mode 100644
index 0000000..a9caa76
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStartWorkerStepImpl.java
@@ -0,0 +1,270 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Start Worker Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl#getWorkerId <em>Worker Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStartWorkerStepImpl#getExtraArgs <em>Extra Args</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStartWorkerStepImpl extends CdapStepImpl implements CdapStartWorkerStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getWorkerId() <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String WORKER_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getWorkerId() <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String workerId = WORKER_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String EXTRA_ARGS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getExtraArgs() <em>Extra Args</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getExtraArgs()
+	 * @generated
+	 * @ordered
+	 */
+	protected String extraArgs = EXTRA_ARGS_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStartWorkerStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_START_WORKER_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_WORKER_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getWorkerId() {
+		return workerId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setWorkerId(String newWorkerId) {
+		String oldWorkerId = workerId;
+		workerId = newWorkerId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID, oldWorkerId, workerId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getExtraArgs() {
+		return extraArgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setExtraArgs(String newExtraArgs) {
+		String oldExtraArgs = extraArgs;
+		extraArgs = newExtraArgs;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS, oldExtraArgs, extraArgs));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_WORKER_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID:
+				return getWorkerId();
+			case CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS:
+				return getExtraArgs();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_WORKER_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID:
+				setWorkerId((String)newValue);
+				return;
+			case CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS:
+				setExtraArgs((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_WORKER_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID:
+				setWorkerId(WORKER_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS:
+				setExtraArgs(EXTRA_ARGS_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_START_WORKER_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_START_WORKER_STEP__WORKER_ID:
+				return WORKER_ID_EDEFAULT == null ? workerId != null : !WORKER_ID_EDEFAULT.equals(workerId);
+			case CdapPackage.CDAP_START_WORKER_STEP__EXTRA_ARGS:
+				return EXTRA_ARGS_EDEFAULT == null ? extraArgs != null : !EXTRA_ARGS_EDEFAULT.equals(extraArgs);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", workerId: ");
+		result.append(workerId);
+		result.append(", extraArgs: ");
+		result.append(extraArgs);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStartWorkerStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStepImpl.java
new file mode 100644
index 0000000..f6c9f80
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStepImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStep;
+
+import org.openecomp.ncomp.core.impl.NamedEntityImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Step</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class CdapStepImpl extends NamedEntityImpl implements CdapStep {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STEP;
+	}
+
+} //CdapStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java
new file mode 100644
index 0000000..90eb037
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopAppStepImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStopAppStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stop App Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopAppStepImpl#getAppId <em>App Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStopAppStepImpl extends CdapStepImpl implements CdapStopAppStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStopAppStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STOP_APP_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_APP_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_APP_STEP__APP_ID:
+				return getAppId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_APP_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_APP_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_APP_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStopAppStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopFlowStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopFlowStepImpl.java
new file mode 100644
index 0000000..35e93eb
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopFlowStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stop Flow Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopFlowStepImpl#getFlowId <em>Flow Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStopFlowStepImpl extends CdapStepImpl implements CdapStopFlowStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFlowId() <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FLOW_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFlowId() <em>Flow Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFlowId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String flowId = FLOW_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStopFlowStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STOP_FLOW_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_FLOW_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFlowId() {
+		return flowId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFlowId(String newFlowId) {
+		String oldFlowId = flowId;
+		flowId = newFlowId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID, oldFlowId, flowId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_FLOW_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID:
+				return getFlowId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_FLOW_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID:
+				setFlowId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_FLOW_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID:
+				setFlowId(FLOW_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_FLOW_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_STOP_FLOW_STEP__FLOW_ID:
+				return FLOW_ID_EDEFAULT == null ? flowId != null : !FLOW_ID_EDEFAULT.equals(flowId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", flowId: ");
+		result.append(flowId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStopFlowStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopServiceStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopServiceStepImpl.java
new file mode 100644
index 0000000..7b0971b
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopServiceStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stop Service Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopServiceStepImpl#getServiceId <em>Service Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStopServiceStepImpl extends CdapStepImpl implements CdapStopServiceStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getServiceId() <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SERVICE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getServiceId() <em>Service Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getServiceId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String serviceId = SERVICE_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStopServiceStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STOP_SERVICE_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_SERVICE_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setServiceId(String newServiceId) {
+		String oldServiceId = serviceId;
+		serviceId = newServiceId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID, oldServiceId, serviceId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID:
+				return getServiceId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID:
+				setServiceId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID:
+				setServiceId(SERVICE_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_STOP_SERVICE_STEP__SERVICE_ID:
+				return SERVICE_ID_EDEFAULT == null ? serviceId != null : !SERVICE_ID_EDEFAULT.equals(serviceId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", serviceId: ");
+		result.append(serviceId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStopServiceStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopWorkerStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopWorkerStepImpl.java
new file mode 100644
index 0000000..b5134d2
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapStopWorkerStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Stop Worker Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapStopWorkerStepImpl#getWorkerId <em>Worker Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapStopWorkerStepImpl extends CdapStepImpl implements CdapStopWorkerStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getWorkerId() <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String WORKER_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getWorkerId() <em>Worker Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWorkerId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String workerId = WORKER_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapStopWorkerStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_STOP_WORKER_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_WORKER_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getWorkerId() {
+		return workerId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setWorkerId(String newWorkerId) {
+		String oldWorkerId = workerId;
+		workerId = newWorkerId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID, oldWorkerId, workerId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_WORKER_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID:
+				return getWorkerId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_WORKER_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID:
+				setWorkerId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_WORKER_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID:
+				setWorkerId(WORKER_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_STOP_WORKER_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_STOP_WORKER_STEP__WORKER_ID:
+				return WORKER_ID_EDEFAULT == null ? workerId != null : !WORKER_ID_EDEFAULT.equals(workerId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", workerId: ");
+		result.append(workerId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapStopWorkerStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapSuspendScheduleStepImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapSuspendScheduleStepImpl.java
new file mode 100644
index 0000000..02d817d
--- /dev/null
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/impl/CdapSuspendScheduleStepImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package org.openecomp.dcae.controller.service.cdap.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.openecomp.dcae.controller.service.cdap.CdapPackage;
+import org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Suspend Schedule Step</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl#getAppId <em>App Id</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.cdap.impl.CdapSuspendScheduleStepImpl#getScheduleId <em>Schedule Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CdapSuspendScheduleStepImpl extends CdapStepImpl implements CdapSuspendScheduleStep {
+	/**
+	 * The default value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String APP_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getAppId() <em>App Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAppId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String appId = APP_ID_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getScheduleId() <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScheduleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String SCHEDULE_ID_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getScheduleId() <em>Schedule Id</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScheduleId()
+	 * @generated
+	 * @ordered
+	 */
+	protected String scheduleId = SCHEDULE_ID_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CdapSuspendScheduleStepImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return CdapPackage.Literals.CDAP_SUSPEND_SCHEDULE_STEP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getAppId() {
+		return appId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAppId(String newAppId) {
+		String oldAppId = appId;
+		appId = newAppId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__APP_ID, oldAppId, appId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getScheduleId() {
+		return scheduleId;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setScheduleId(String newScheduleId) {
+		String oldScheduleId = scheduleId;
+		scheduleId = newScheduleId;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID, oldScheduleId, scheduleId));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__APP_ID:
+				return getAppId();
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID:
+				return getScheduleId();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__APP_ID:
+				setAppId((String)newValue);
+				return;
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID:
+				setScheduleId((String)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__APP_ID:
+				setAppId(APP_ID_EDEFAULT);
+				return;
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID:
+				setScheduleId(SCHEDULE_ID_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__APP_ID:
+				return APP_ID_EDEFAULT == null ? appId != null : !APP_ID_EDEFAULT.equals(appId);
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP__SCHEDULE_ID:
+				return SCHEDULE_ID_EDEFAULT == null ? scheduleId != null : !SCHEDULE_ID_EDEFAULT.equals(scheduleId);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (appId: ");
+		result.append(appId);
+		result.append(", scheduleId: ");
+		result.append(scheduleId);
+		result.append(')');
+		return result.toString();
+	}
+
+} //CdapSuspendScheduleStepImpl
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapAdapterFactory.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapAdapterFactory.java
index 6df62fb..175f828 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapAdapterFactory.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapAdapterFactory.java
@@ -121,6 +121,78 @@ public class CdapAdapterFactory extends AdapterFactoryImpl {
 				return createCdapServiceDescriptorAdapter();
 			}
 			@Override
+			public Adapter caseCdapStep(CdapStep object) {
+				return createCdapStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapLoadArtifactStep(CdapLoadArtifactStep object) {
+				return createCdapLoadArtifactStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapLoadArtifactWithConfigStep(CdapLoadArtifactWithConfigStep object) {
+				return createCdapLoadArtifactWithConfigStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapCreateAppStep(CdapCreateAppStep object) {
+				return createCdapCreateAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapCreateAppWithConfigStep(CdapCreateAppWithConfigStep object) {
+				return createCdapCreateAppWithConfigStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapDeployAppStep(CdapDeployAppStep object) {
+				return createCdapDeployAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStopFlowStep(CdapStopFlowStep object) {
+				return createCdapStopFlowStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStopWorkerStep(CdapStopWorkerStep object) {
+				return createCdapStopWorkerStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStopServiceStep(CdapStopServiceStep object) {
+				return createCdapStopServiceStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStopAppStep(CdapStopAppStep object) {
+				return createCdapStopAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStartFlowStep(CdapStartFlowStep object) {
+				return createCdapStartFlowStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStartWorkerStep(CdapStartWorkerStep object) {
+				return createCdapStartWorkerStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStartServiceStep(CdapStartServiceStep object) {
+				return createCdapStartServiceStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapStartAppStep(CdapStartAppStep object) {
+				return createCdapStartAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapDeleteAppStep(CdapDeleteAppStep object) {
+				return createCdapDeleteAppStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapDeleteArtifact(CdapDeleteArtifact object) {
+				return createCdapDeleteArtifactAdapter();
+			}
+			@Override
+			public Adapter caseCdapSuspendScheduleStep(CdapSuspendScheduleStep object) {
+				return createCdapSuspendScheduleStepAdapter();
+			}
+			@Override
+			public Adapter caseCdapResumeScheduleStep(CdapResumeScheduleStep object) {
+				return createCdapResumeScheduleStepAdapter();
+			}
+			@Override
 			public Adapter caseNamedEntity(NamedEntity object) {
 				return createNamedEntityAdapter();
 			}
@@ -255,6 +327,258 @@ public class CdapAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStep <em>Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStep
+	 * @generated
+	 */
+	public Adapter createCdapStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep <em>Load Artifact Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep
+	 * @generated
+	 */
+	public Adapter createCdapLoadArtifactStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep <em>Load Artifact With Config Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep
+	 * @generated
+	 */
+	public Adapter createCdapLoadArtifactWithConfigStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep <em>Create App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep
+	 * @generated
+	 */
+	public Adapter createCdapCreateAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep <em>Create App With Config Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep
+	 * @generated
+	 */
+	public Adapter createCdapCreateAppWithConfigStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep <em>Deploy App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep
+	 * @generated
+	 */
+	public Adapter createCdapDeployAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep <em>Stop Flow Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep
+	 * @generated
+	 */
+	public Adapter createCdapStopFlowStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep <em>Stop Worker Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep
+	 * @generated
+	 */
+	public Adapter createCdapStopWorkerStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep <em>Stop Service Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep
+	 * @generated
+	 */
+	public Adapter createCdapStopServiceStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStopAppStep <em>Stop App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStopAppStep
+	 * @generated
+	 */
+	public Adapter createCdapStopAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep <em>Start Flow Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep
+	 * @generated
+	 */
+	public Adapter createCdapStartFlowStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep <em>Start Worker Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep
+	 * @generated
+	 */
+	public Adapter createCdapStartWorkerStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep <em>Start Service Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep
+	 * @generated
+	 */
+	public Adapter createCdapStartServiceStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapStartAppStep <em>Start App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapStartAppStep
+	 * @generated
+	 */
+	public Adapter createCdapStartAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep <em>Delete App Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteAppStep
+	 * @generated
+	 */
+	public Adapter createCdapDeleteAppStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact <em>Delete Artifact</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapDeleteArtifact
+	 * @generated
+	 */
+	public Adapter createCdapDeleteArtifactAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep <em>Suspend Schedule Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapSuspendScheduleStep
+	 * @generated
+	 */
+	public Adapter createCdapSuspendScheduleStepAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep <em>Resume Schedule Step</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep
+	 * @generated
+	 */
+	public Adapter createCdapResumeScheduleStepAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.openecomp.ncomp.core.NamedEntity <em>Named Entity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapSwitch.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapSwitch.java
index ae39c7b..f61edd0 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapSwitch.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdap/util/CdapSwitch.java
@@ -72,7 +72,7 @@ public class CdapSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -141,6 +141,151 @@ public class CdapSwitch<T> extends Switch<T> {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case CdapPackage.CDAP_STEP: {
+				CdapStep cdapStep = (CdapStep)theEObject;
+				T result = caseCdapStep(cdapStep);
+				if (result == null) result = caseNamedEntity(cdapStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_LOAD_ARTIFACT_STEP: {
+				CdapLoadArtifactStep cdapLoadArtifactStep = (CdapLoadArtifactStep)theEObject;
+				T result = caseCdapLoadArtifactStep(cdapLoadArtifactStep);
+				if (result == null) result = caseCdapStep(cdapLoadArtifactStep);
+				if (result == null) result = caseNamedEntity(cdapLoadArtifactStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_LOAD_ARTIFACT_WITH_CONFIG_STEP: {
+				CdapLoadArtifactWithConfigStep cdapLoadArtifactWithConfigStep = (CdapLoadArtifactWithConfigStep)theEObject;
+				T result = caseCdapLoadArtifactWithConfigStep(cdapLoadArtifactWithConfigStep);
+				if (result == null) result = caseCdapLoadArtifactStep(cdapLoadArtifactWithConfigStep);
+				if (result == null) result = caseCdapStep(cdapLoadArtifactWithConfigStep);
+				if (result == null) result = caseNamedEntity(cdapLoadArtifactWithConfigStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_CREATE_APP_STEP: {
+				CdapCreateAppStep cdapCreateAppStep = (CdapCreateAppStep)theEObject;
+				T result = caseCdapCreateAppStep(cdapCreateAppStep);
+				if (result == null) result = caseCdapStep(cdapCreateAppStep);
+				if (result == null) result = caseNamedEntity(cdapCreateAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_CREATE_APP_WITH_CONFIG_STEP: {
+				CdapCreateAppWithConfigStep cdapCreateAppWithConfigStep = (CdapCreateAppWithConfigStep)theEObject;
+				T result = caseCdapCreateAppWithConfigStep(cdapCreateAppWithConfigStep);
+				if (result == null) result = caseCdapCreateAppStep(cdapCreateAppWithConfigStep);
+				if (result == null) result = caseCdapStep(cdapCreateAppWithConfigStep);
+				if (result == null) result = caseNamedEntity(cdapCreateAppWithConfigStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_DEPLOY_APP_STEP: {
+				CdapDeployAppStep cdapDeployAppStep = (CdapDeployAppStep)theEObject;
+				T result = caseCdapDeployAppStep(cdapDeployAppStep);
+				if (result == null) result = caseCdapStep(cdapDeployAppStep);
+				if (result == null) result = caseNamedEntity(cdapDeployAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_STOP_FLOW_STEP: {
+				CdapStopFlowStep cdapStopFlowStep = (CdapStopFlowStep)theEObject;
+				T result = caseCdapStopFlowStep(cdapStopFlowStep);
+				if (result == null) result = caseCdapStep(cdapStopFlowStep);
+				if (result == null) result = caseNamedEntity(cdapStopFlowStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_STOP_WORKER_STEP: {
+				CdapStopWorkerStep cdapStopWorkerStep = (CdapStopWorkerStep)theEObject;
+				T result = caseCdapStopWorkerStep(cdapStopWorkerStep);
+				if (result == null) result = caseCdapStep(cdapStopWorkerStep);
+				if (result == null) result = caseNamedEntity(cdapStopWorkerStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_STOP_SERVICE_STEP: {
+				CdapStopServiceStep cdapStopServiceStep = (CdapStopServiceStep)theEObject;
+				T result = caseCdapStopServiceStep(cdapStopServiceStep);
+				if (result == null) result = caseCdapStep(cdapStopServiceStep);
+				if (result == null) result = caseNamedEntity(cdapStopServiceStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_STOP_APP_STEP: {
+				CdapStopAppStep cdapStopAppStep = (CdapStopAppStep)theEObject;
+				T result = caseCdapStopAppStep(cdapStopAppStep);
+				if (result == null) result = caseCdapStep(cdapStopAppStep);
+				if (result == null) result = caseNamedEntity(cdapStopAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_START_FLOW_STEP: {
+				CdapStartFlowStep cdapStartFlowStep = (CdapStartFlowStep)theEObject;
+				T result = caseCdapStartFlowStep(cdapStartFlowStep);
+				if (result == null) result = caseCdapStep(cdapStartFlowStep);
+				if (result == null) result = caseNamedEntity(cdapStartFlowStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_START_WORKER_STEP: {
+				CdapStartWorkerStep cdapStartWorkerStep = (CdapStartWorkerStep)theEObject;
+				T result = caseCdapStartWorkerStep(cdapStartWorkerStep);
+				if (result == null) result = caseCdapStep(cdapStartWorkerStep);
+				if (result == null) result = caseNamedEntity(cdapStartWorkerStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_START_SERVICE_STEP: {
+				CdapStartServiceStep cdapStartServiceStep = (CdapStartServiceStep)theEObject;
+				T result = caseCdapStartServiceStep(cdapStartServiceStep);
+				if (result == null) result = caseCdapStep(cdapStartServiceStep);
+				if (result == null) result = caseNamedEntity(cdapStartServiceStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_START_APP_STEP: {
+				CdapStartAppStep cdapStartAppStep = (CdapStartAppStep)theEObject;
+				T result = caseCdapStartAppStep(cdapStartAppStep);
+				if (result == null) result = caseCdapStep(cdapStartAppStep);
+				if (result == null) result = caseNamedEntity(cdapStartAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_DELETE_APP_STEP: {
+				CdapDeleteAppStep cdapDeleteAppStep = (CdapDeleteAppStep)theEObject;
+				T result = caseCdapDeleteAppStep(cdapDeleteAppStep);
+				if (result == null) result = caseCdapStep(cdapDeleteAppStep);
+				if (result == null) result = caseNamedEntity(cdapDeleteAppStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_DELETE_ARTIFACT: {
+				CdapDeleteArtifact cdapDeleteArtifact = (CdapDeleteArtifact)theEObject;
+				T result = caseCdapDeleteArtifact(cdapDeleteArtifact);
+				if (result == null) result = caseCdapStep(cdapDeleteArtifact);
+				if (result == null) result = caseNamedEntity(cdapDeleteArtifact);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_SUSPEND_SCHEDULE_STEP: {
+				CdapSuspendScheduleStep cdapSuspendScheduleStep = (CdapSuspendScheduleStep)theEObject;
+				T result = caseCdapSuspendScheduleStep(cdapSuspendScheduleStep);
+				if (result == null) result = caseCdapStep(cdapSuspendScheduleStep);
+				if (result == null) result = caseNamedEntity(cdapSuspendScheduleStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case CdapPackage.CDAP_RESUME_SCHEDULE_STEP: {
+				CdapResumeScheduleStep cdapResumeScheduleStep = (CdapResumeScheduleStep)theEObject;
+				T result = caseCdapResumeScheduleStep(cdapResumeScheduleStep);
+				if (result == null) result = caseCdapStep(cdapResumeScheduleStep);
+				if (result == null) result = caseNamedEntity(cdapResumeScheduleStep);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -251,6 +396,276 @@ public class CdapSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStep(CdapStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Load Artifact Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Load Artifact Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapLoadArtifactStep(CdapLoadArtifactStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Load Artifact With Config Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Load Artifact With Config Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapLoadArtifactWithConfigStep(CdapLoadArtifactWithConfigStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Create App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Create App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapCreateAppStep(CdapCreateAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Create App With Config Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Create App With Config Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapCreateAppWithConfigStep(CdapCreateAppWithConfigStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Deploy App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Deploy App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapDeployAppStep(CdapDeployAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stop Flow Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Stop Flow Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStopFlowStep(CdapStopFlowStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stop Worker Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Stop Worker Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStopWorkerStep(CdapStopWorkerStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stop Service Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Stop Service Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStopServiceStep(CdapStopServiceStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Stop App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Stop App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStopAppStep(CdapStopAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Start Flow Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Start Flow Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStartFlowStep(CdapStartFlowStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Start Worker Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Start Worker Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStartWorkerStep(CdapStartWorkerStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Start Service Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Start Service Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStartServiceStep(CdapStartServiceStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Start App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Start App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapStartAppStep(CdapStartAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Delete App Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Delete App Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapDeleteAppStep(CdapDeleteAppStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Delete Artifact</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Delete Artifact</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapDeleteArtifact(CdapDeleteArtifact object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Suspend Schedule Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Suspend Schedule Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapSuspendScheduleStep(CdapSuspendScheduleStep object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Resume Schedule Step</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Resume Schedule Step</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCdapResumeScheduleStep(CdapResumeScheduleStep object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Named Entity</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapManager.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapManager.java
index f20e1fa..e75da7d 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapManager.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapManager.java
@@ -34,10 +34,10 @@ import org.openecomp.ncomp.cdap.CdapConfiguration;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdapmanager.CdapManager#getConfiguration <em>Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerPackage#getCdapManager()
  * @model
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerPackage.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerPackage.java
index edc40a8..48147bf 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerPackage.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/CdapmanagerPackage.java
@@ -41,6 +41,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.cdapmanager.CdapmanagerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-cdap-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service'"
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapManagerImpl.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapManagerImpl.java
index 2a0e857..2147326 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapManagerImpl.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/impl/CdapManagerImpl.java
@@ -32,7 +32,6 @@ import org.openecomp.ncomp.cdap.CdapConfiguration;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
@@ -44,10 +43,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl#getConfiguration <em>Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerSwitch.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerSwitch.java
index a423091..95ef83e 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerSwitch.java
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/cdapmanager/util/CdapmanagerSwitch.java
@@ -70,7 +70,7 @@ public class CdapmanagerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore
index 5a26378..71dceb7 100644
--- a/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore
+++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-model/src/main/xcore/service.xcore
@@ -48,7 +48,11 @@ class CdapServiceInstance extends DcaeServiceInstance {
 	String appJar //

 	String appConfigFile

 	contains CdapArtifact[] artifacts

-	contains CdapApplication[] apps

+	contains CdapApplication[] apps
+	contains CdapStep[] deploySteps
+	contains CdapStep[] undeploySteps
+	contains CdapStep[] preConfigurationSteps
+	contains CdapStep[] postConfigurationSteps

 	String[] appNames

 	String[] workerNames 

 	String[] flowNames 

@@ -97,5 +101,99 @@ class CdapServiceDescriptor extends DcaeServiceDescriptor {
 	String serviceClass 			

 	String serviceInstanceClass 	

 	String jarFile

-}

+}
+
+abstract class CdapStep extends NamedEntity {
+	
+}
+
+class CdapLoadArtifactStep extends CdapStep {
+	String artifactName
+	String jarfile
+	String version
+}
+
+class CdapLoadArtifactWithConfigStep extends CdapLoadArtifactStep {
+	String config
+}
+
+class CdapCreateAppStep extends CdapStep {
+	String appId
+	String artifactName
+	String version
+	String scope 
+}
+
+class CdapCreateAppWithConfigStep extends CdapCreateAppStep {
+	String appConfig
+}
+
+class CdapDeployAppStep extends CdapStep {
+	String jarfile
+}
+
+class CdapStopFlowStep extends CdapStep {
+	String appId
+	String flowId
+}
+
+class CdapStopWorkerStep extends CdapStep {
+	String appId
+	String workerId
+}
+
+class CdapStopServiceStep extends CdapStep {
+	String appId
+	String serviceId
+}
+
+class CdapStopAppStep extends CdapStep {
+	String appId
+}
+
+class CdapStartFlowStep extends CdapStep {
+	String appId
+	String flowId
+	String extraArgs
+}
+
+class CdapStartWorkerStep extends CdapStep {
+	String appId
+	String workerId
+	String extraArgs
+}
+
+class CdapStartServiceStep extends CdapStep {
+	String appId
+	String serviceId
+	String extraArgs
+}
+
+class CdapStartAppStep extends CdapStep {
+	String appId
+}
+
+class CdapDeleteAppStep extends CdapStep {
+	String appId
+}
+
+class CdapDeleteArtifact extends CdapStep {
+	String artifactName
+	String version
+}
+
+class CdapSuspendScheduleStep extends CdapStep {
+	String appId
+	String scheduleId
+}
+
+class CdapResumeScheduleStep extends CdapStep {
+	String appId
+	String scheduleId
+}
+
+
+
+
+

 

diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/.classpath b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/.classpath
index d2d34b3..89273c0 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/.classpath
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/.classpath
@@ -21,7 +21,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/META-INF/MANIFEST.MF b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/META-INF/MANIFEST.MF
index 1fca900..57da28b 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/META-INF/MANIFEST.MF
@@ -5,10 +5,3 @@ Bundle-SymbolicName: dcae-controller-service-common-docker-manager
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.common.docker.manager.tools,
   org.openecomp.dcae.controller.service.common.docker.servers.manager
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-common-docker-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0"
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/assembly/assemble_zip.xml b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/assembly/assemble_zip.xml
index af936c4..dfc8344 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/assembly/assemble_zip.xml
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/assembly/assemble_zip.xml
@@ -38,6 +38,7 @@
 			<directory>src/main/server-gen/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
@@ -45,16 +46,19 @@
 			<directory>src/main/server/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server-gen/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 	</fileSets>
 
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/java/org/openecomp/dcae/controller/service/common/docker/manager/tools/Generator.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/java/org/openecomp/dcae/controller/service/common/docker/manager/tools/Generator.java
index 1245eee..a301a3c 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/java/org/openecomp/dcae/controller/service/common/docker/manager/tools/Generator.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/java/org/openecomp/dcae/controller/service/common/docker/manager/tools/Generator.java
@@ -53,12 +53,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCommonDockerManager");

 		m.setTitle("ControllerServiceCommonDockerManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(false);

 		g.addFactory(ServiceFactory.eINSTANCE);

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

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCommonDockerService");

 		m.setTitle("ControllerServiceCommonDockerService");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(true);

 		g.addFactory(ServiceFactory.eINSTANCE);

diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/java/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceProvider.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/java/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceProvider.java
index 37771f6..0e841ff 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/java/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceProvider.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/java/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceProvider.java
@@ -75,6 +75,7 @@ public class DcaeCommonDockerServiceProvider extends DcaeDockerServiceProvider {
 		c.setSuspendTimeout(i1.getSuspendTimeout());
 		c.setResumeTimeout(i1.getResumeTimeout());
 		c.setDockerConfiguration(EcoreUtil.copy(i1.getDockerConfiguration()));
+		ManagementServer.decryptPasswords(c.getDockerConfiguration());
 		return c;
 	}
 
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/server-gen/bin/controller-service-common-docker-manager-controller b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/server-gen/bin/controller-service-common-docker-manager-controller
index 936326e..828de88 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/server-gen/bin/controller-service-common-docker-manager-controller
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/server-gen/bin/controller-service-common-docker-manager-controller
@@ -93,7 +93,7 @@ case $CMD in
     if [ -e $_DIR/logs/$PNAME.out ]; then mv $_DIR/logs/$PNAME.out $_DIR/logs/$PNAME.out.1; fi
     if [ -e $_DIR/logs/$PNAME.err ]; then mv $_DIR/logs/$PNAME.err $_DIR/logs/$PNAME.err.1; fi
 
-    nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS > $_DIR/logs/$PNAME.out 2> $_DIR/logs/$PNAME.err  &
+    nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS >> $_DIR/logs/$PNAME.out 2>> $_DIR/logs/$PNAME.err  &
 
     _PID=$!
     echo $_PID > $_PIDFILE
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/CommonDockerManager.yaml b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/CommonDockerManager.yaml
index 6ab6771..e8114eb 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/CommonDockerManager.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/CommonDockerManager.yaml
@@ -1,69 +1,57 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
+  CommonDockerManager@test: {}
+  CommonDockerManager@suspend: {}
+  CommonDockerManager@resume: {}
+  CommonDockerManager@publicKey: {}
+  CommonDockerManager@configurationChanged: {}
+  CommonDockerManager@updateStreams: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/CommonDockerService.yaml b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/CommonDockerService.yaml
index c449feb..eaf4e49 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/CommonDockerService.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/CommonDockerService.yaml
@@ -1,124 +1,102 @@
 operations:
-  deploy: {}
-  undeploy: {}
-  test: {}
-  suspend: {}
-  resume: {}
-  pushManagerConfiguration: {}
-  pollManagerConfiguration: {}
-  managerConfiguration: {}
-  managerOperation: {}
-  updateConfigurationFromPolicy: {}
-  runHealthTests: {}
-  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
+  CommonDockerService@deploy: {}
+  CommonDockerService@undeploy: {}
+  CommonDockerService@test: {}
+  CommonDockerService@suspend: {}
+  CommonDockerService@resume: {}
+  CommonDockerService@pushManagerConfiguration: {}
+  CommonDockerService@pollManagerConfiguration: {}
+  CommonDockerService@managerConfiguration: {}
+  CommonDockerService@managerOperation: {}
+  CommonDockerService@updateConfigurationFromPolicy: {}
+  CommonDockerService@runHealthTests: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/GuiClientApi.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManager.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManager.java
index 06abb03..ad995f6 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManager.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManager.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.common.docker.servers.manager;
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.common.docker.servers.manager.logging.CommonDockerManagerOperationEnum;
+import org.openecomp.dcae.controller.service.common.docker.servers.manager.logging.CommonDockerManagerMessageEnum;
 
 
 
@@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.common.docker.manager.impl.CommonDo
 
 
 
-public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
+public class DcaeCommonDockerManager extends CommonDockerManagerImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeCommonDockerManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeCommonDockerManagerProvider controller;
 	ISiriusServer server;
 
@@ -68,8 +78,8 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerManagerOperationEnum.CommonDockerManager_test,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -78,7 +88,10 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerManagerOperationEnum.CommonDockerManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -103,7 +116,10 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerManagerOperationEnum.CommonDockerManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -128,7 +144,10 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.publicKey);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerManagerOperationEnum.CommonDockerManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -153,7 +172,10 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.configurationChanged);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerManagerOperationEnum.CommonDockerManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -178,7 +200,10 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -193,8 +218,8 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.updateStreams);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerManagerOperationEnum.CommonDockerManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -203,7 +228,10 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -217,10 +245,12 @@ public class DcaeCommonDockerManager extends CommonDockerManagerImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeCommonDockerManagerProvider.ecoreSetup();
 	}
-	public DcaeCommonDockerManagerProvider getSomfProvider() {
+	public DcaeCommonDockerManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManagerClient.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManagerClient.java
index 669bad8..e0dde73 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManagerClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeCommonDockerManagerClient extends CommonDockerManagerImpl {
 		DcaeCommonDockerManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeCommonDockerManagerClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeCommonDockerManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.REMOTE_test);
+		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); 
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -88,16 +94,17 @@ public class DcaeCommonDockerManagerClient extends CommonDockerManagerImpl {
 
 	@Override
 	public void suspend() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.REMOTE_suspend);
+		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); 
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeCommonDockerManagerClient extends CommonDockerManagerImpl {
 
 	@Override
 	public void resume() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.REMOTE_resume);
+		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); 
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeCommonDockerManagerClient extends CommonDockerManagerImpl {
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.REMOTE_publicKey);
+		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); 
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed:  publicKey", e);
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeCommonDockerManagerClient extends CommonDockerManagerImpl {
 
 	@Override
 	public void configurationChanged() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); 
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed:  configurationChanged", e);
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeCommonDockerManagerClient extends CommonDockerManagerImpl {
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = ManagerPackage.eINSTANCE.getCommonDockerManager(); 
+		ecomplogger.recordMetricEventStart(CommonDockerManagerOperationEnum.CommonDockerManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed:  updateStreams", e);
+			ecomplogger.warn(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManagerServer.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManagerServer.java
index 1bbc232..a4dc017 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManagerServer.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/DcaeCommonDockerManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.common.docker.servers.manager;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.common.docker.manager.CommonDockerManager;
@@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.common.docker.servers.manager.gui.D
 
 
 
-public class DcaeCommonDockerManagerServer implements ISiriusServer {
+public class DcaeCommonDockerManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeCommonDockerManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -69,6 +68,7 @@ public class DcaeCommonDockerManagerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "CommonDockerManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
 		server.addFactory(org.openecomp.dcae.controller.service.common.docker.service.ServiceFactory.eINSTANCE);
@@ -81,6 +81,7 @@ public class DcaeCommonDockerManagerServer implements ISiriusServer {
         controller = (DcaeCommonDockerManager) server.find("/").o;
         webServer = new Jetty8Server("manager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -109,4 +110,17 @@ public class DcaeCommonDockerManagerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/DcaeGuiClientApi.java
index 0573e74..e3beedb 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/DcaeGuiClientApi.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/DcaeGuiClientApi.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.common.docker.servers.manager.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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.common.docker.servers.manager.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.dcae.controller.service.common.docker.servers.manager.gui.logging.GuiClientApiMessageEnum;
 
 
 
@@ -81,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -98,8 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getTree);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -108,7 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -123,8 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getObject);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -133,7 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -148,8 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -158,7 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -173,8 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -183,7 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -198,8 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -208,7 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -223,8 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -233,7 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -247,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/DcaeGuiClientApiClient.java
index 3d09fd0..32f3d26 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/DcaeGuiClientApiClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/DcaeGuiClientApiClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeCommonDockerManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTree, e.toString());
-			throw new RuntimeException("remote call failed:  getTree", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getObject, e.toString());
-			throw new RuntimeException("remote call failed:  getObject", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTimeSerie, e.toString());
-			throw new RuntimeException("remote call failed:  getTimeSerie", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTable, e.toString());
-			throw new RuntimeException("remote call failed:  getTable", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getHtml, e.toString());
-			throw new RuntimeException("remote call failed:  getHtml", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res;
 		try {
 		  res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getGraph, e.toString());
-			throw new RuntimeException("remote call failed:  getGraph", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApi.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApiMessageEnum.java
index 2e524ab..9c4ca3b 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApiMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.docker.servers.manager.gui.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.common.docker.servers.manager.gui.logging.GuiClientApi");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApi");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApiOperationEnum.java
index 45c9703..ca9cd38 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApiOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.docker.servers.manager.gui.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum GuiClientApiOperationEnum implements EcompOperationEnum {
 
-  getTree,
-  getObject,
-  getTimeSerie,
-  getTable,
-  getHtml,
-  getGraph,
-  REMOTE_getTree,
-  REMOTE_getObject,
-  REMOTE_getTimeSerie,
-  REMOTE_getTable,
-  REMOTE_getHtml,
-  REMOTE_getGraph;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManager.properties b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManager.properties
index ef19f9b..4580ed4 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManager.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManager.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManagerMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManagerMessageEnum.java
index 4ae696f..7c4468e 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManagerMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.docker.servers.manager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum CommonDockerManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.common.docker.servers.manager.logging.CommonDockerManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManager");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManagerOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManagerOperationEnum.java
index 30478f6..a304ffd 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManagerOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/manager/logging/CommonDockerManagerOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.docker.servers.manager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum CommonDockerManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams;
+  CommonDockerManager_test("CommonDockerManager@test"),
+  CommonDockerManager_suspend("CommonDockerManager@suspend"),
+  CommonDockerManager_resume("CommonDockerManager@resume"),
+  CommonDockerManager_publicKey("CommonDockerManager@publicKey"),
+  CommonDockerManager_configurationChanged("CommonDockerManager@configurationChanged"),
+  CommonDockerManager_updateStreams("CommonDockerManager@updateStreams") ; 
+
+
+	private String n;
+	
+	private CommonDockerManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerService.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerService.java
index 6b6f7bc..961cef1 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerService.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerService.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.common.docker.servers.service;
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.common.docker.servers.service.logging.CommonDockerServiceOperationEnum;
+import org.openecomp.dcae.controller.service.common.docker.servers.service.logging.CommonDockerServiceMessageEnum;
 
 
 
@@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.common.docker.service.impl.CommonDo
 
 
 
-public class DcaeCommonDockerService extends CommonDockerServiceImpl implements ISiriusPlugin {
+public class DcaeCommonDockerService extends CommonDockerServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeCommonDockerService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeCommonDockerServiceProvider controller;
 	ISiriusServer server;
 
@@ -68,8 +78,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.deploy);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -78,7 +88,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.undeploy);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -103,7 +116,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_test,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -128,7 +144,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -153,7 +172,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_resume,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -178,7 +200,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -193,8 +218,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.pushManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -203,7 +228,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -218,8 +246,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.pollManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -228,7 +256,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -243,8 +274,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.managerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -253,7 +284,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -268,8 +302,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.managerOperation);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -278,7 +312,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -293,8 +330,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.updateConfigurationFromPolicy);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -303,7 +340,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -318,8 +358,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.runHealthTests);
+		ecomplogger.recordAuditEventStartIfNeeded(CommonDockerServiceOperationEnum.CommonDockerService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -328,7 +368,10 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(CommonDockerServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonDockerServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -342,6 +385,8 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -350,7 +395,7 @@ public class DcaeCommonDockerService extends CommonDockerServiceImpl implements
 	public static void ecoreSetup() {
 		DcaeCommonDockerServiceProvider.ecoreSetup();
 	}
-	public DcaeCommonDockerServiceProvider getSomfProvider() {
+	public DcaeCommonDockerServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceClient.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceClient.java
index 876ed4f..f98e6b7 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 		DcaeCommonDockerService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeCommonDockerServiceClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeCommonDockerServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_deploy);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed:  deploy", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_undeploy);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed:  undeploy", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_test);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -122,16 +130,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_suspend);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -139,16 +148,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_resume);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pushManagerConfiguration", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pollManagerConfiguration", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  managerConfiguration", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -207,16 +220,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed:  managerOperation", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed:  updateConfigurationFromPolicy", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeCommonDockerServiceClient extends CommonDockerServiceImpl {
 
 	@Override
 	public void runHealthTests() {
-		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonDockerServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = ServicePackage.eINSTANCE.getCommonDockerService(); 
+		ecomplogger.recordMetricEventStart(CommonDockerServiceOperationEnum.CommonDockerService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed:  runHealthTests", e);
+			ecomplogger.warn(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonDockerServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceServer.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceServer.java
index 6be777d..b9ca4f1 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceServer.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/DcaeCommonDockerServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.common.docker.servers.service;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.common.docker.service.CommonDockerService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.common.docker.service.CommonDockerS
 
 
 
-public class DcaeCommonDockerServiceServer implements ISiriusServer {
+public class DcaeCommonDockerServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeCommonDockerServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeCommonDockerServiceServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "CommonDockerService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
 		server.addFactory(org.openecomp.dcae.controller.service.common.docker.service.ServiceFactory.eINSTANCE);
@@ -76,6 +76,7 @@ public class DcaeCommonDockerServiceServer implements ISiriusServer {
         controller = (DcaeCommonDockerService) server.find("/").o;
         webServer = new Jetty8Server("service.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -98,4 +99,17 @@ public class DcaeCommonDockerServiceServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerService.properties b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerService.properties
index 13a57d6..f3a3955 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerService.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerService.properties
@@ -1,138 +1,138 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerServiceMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerServiceMessageEnum.java
index 4680af8..31ec024 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerServiceMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.docker.servers.service.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,30 +7,30 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum CommonDockerServiceMessageEnum implements EcompMessageEnum {
 
   dummy,
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.common.docker.servers.service.logging.CommonDockerService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerService");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerServiceOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerServiceOperationEnum.java
index a614511..c032e87 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerServiceOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/docker/servers/service/logging/CommonDockerServiceOperationEnum.java
@@ -1,51 +1,32 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.docker.servers.service.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum CommonDockerServiceOperationEnum implements EcompOperationEnum {
 
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests;
+  CommonDockerService_deploy("CommonDockerService@deploy"),
+  CommonDockerService_undeploy("CommonDockerService@undeploy"),
+  CommonDockerService_test("CommonDockerService@test"),
+  CommonDockerService_suspend("CommonDockerService@suspend"),
+  CommonDockerService_resume("CommonDockerService@resume"),
+  CommonDockerService_pushManagerConfiguration("CommonDockerService@pushManagerConfiguration"),
+  CommonDockerService_pollManagerConfiguration("CommonDockerService@pollManagerConfiguration"),
+  CommonDockerService_managerConfiguration("CommonDockerService@managerConfiguration"),
+  CommonDockerService_managerOperation("CommonDockerService@managerOperation"),
+  CommonDockerService_updateConfigurationFromPolicy("CommonDockerService@updateConfigurationFromPolicy"),
+  CommonDockerService_runHealthTests("CommonDockerService@runHealthTests") ; 
+
+
+	private String n;
+	
+	private CommonDockerServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.classpath b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.classpath
index 69b19c6..ed6d9f7 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.classpath
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.classpath
@@ -1,17 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/xcore">
+	<classpathentry kind="src" output="target/classes" path="src/main/xcore-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/xcore-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.project b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.project
index d5dc9d5..4701cda 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.project
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.settings/org.eclipse.core.resources.prefs b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..447ff97
--- /dev/null
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/xcore=UTF-8
+encoding//src/main/xcore-gen=UTF-8
+encoding/<project>=UTF-8
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..ec4300d 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.settings/org.eclipse.jdt.core.prefs
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/META-INF/MANIFEST.MF b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/META-INF/MANIFEST.MF
index 7570ca5..48fdc74 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/META-INF/MANIFEST.MF
@@ -16,17 +16,5 @@ Export-Package: org.openecomp.dcae.controller.service.common.docker.manager,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.ecore.xcore.lib,
- dcae-controller-core-model;visibility:=reexport,
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- dcae-controller-service-vm-model;visibility:=reexport,
- ncomp-openstack-model;visibility:=reexport,
- ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport,
- dcae-controller-service-common-docker-model;visibility:=reexport,
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- dcae-controller-service-docker-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-docker-model;visibility:=reexport,
- dcae-controller-service-docker-host-model;visibility:=reexport,
- ncomp-sirius-manager-agent-model;visibility:=reexport
+ org.eclipse.emf.ecore.xcore.lib
 Bundle-ActivationPolicy: lazy
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/CommonDockerManager.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/CommonDockerManager.java
index 84985d4..0dcfd3d 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/CommonDockerManager.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/CommonDockerManager.java
@@ -34,6 +34,7 @@ import org.openecomp.dcae.controller.service.dockermanager.DockerManager;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.manager.CommonDockerManager#getScript <em>Script</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.manager.CommonDockerManager#getConfigureTimeout <em>Configure Timeout</em>}</li>
@@ -42,7 +43,6 @@ import org.openecomp.dcae.controller.service.dockermanager.DockerManager;
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.manager.CommonDockerManager#getResumeTimeout <em>Resume Timeout</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.manager.CommonDockerManager#getDockerConfiguration <em>Docker Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.common.docker.manager.ManagerPackage#getCommonDockerManager()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/ManagerPackage.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/ManagerPackage.java
index c8a2eb4..1c3a5fa 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/ManagerPackage.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/ManagerPackage.java
@@ -42,6 +42,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.common.docker.manager.ManagerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-common-docker-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.common.docker'"
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/impl/CommonDockerManagerImpl.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/impl/CommonDockerManagerImpl.java
index 99ac592..8fc74b4 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/impl/CommonDockerManagerImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/impl/CommonDockerManagerImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.manager.impl.CommonDockerManagerImpl#getScript <em>Script</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.manager.impl.CommonDockerManagerImpl#getConfigureTimeout <em>Configure Timeout</em>}</li>
@@ -52,7 +53,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.manager.impl.CommonDockerManagerImpl#getResumeTimeout <em>Resume Timeout</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.manager.impl.CommonDockerManagerImpl#getDockerConfiguration <em>Docker Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/impl/ManagerPackageImpl.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/impl/ManagerPackageImpl.java
index c17888e..1e82873 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/impl/ManagerPackageImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/impl/ManagerPackageImpl.java
@@ -100,8 +100,8 @@ public class ManagerPackageImpl extends EPackageImpl implements ManagerPackage {
 		isInited = true;
 
 		// Initialize simple dependencies
-		ServicePackage.eINSTANCE.eClass();
 		DockermanagerPackage.eINSTANCE.eClass();
+		ServicePackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theManagerPackage.createPackageContents();
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/util/ManagerSwitch.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/util/ManagerSwitch.java
index c80ae7e..b5bb3a7 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/util/ManagerSwitch.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/manager/util/ManagerSwitch.java
@@ -72,7 +72,7 @@ public class ManagerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/CommonDockerServiceInstance.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/CommonDockerServiceInstance.java
index 653b7f5..932458d 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/CommonDockerServiceInstance.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/CommonDockerServiceInstance.java
@@ -32,6 +32,7 @@ import org.openecomp.dcae.controller.service.docker.DockerServiceInstance;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.CommonDockerServiceInstance#getScript <em>Script</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.CommonDockerServiceInstance#getConfigureTimeout <em>Configure Timeout</em>}</li>
@@ -40,7 +41,6 @@ import org.openecomp.dcae.controller.service.docker.DockerServiceInstance;
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.CommonDockerServiceInstance#getResumeTimeout <em>Resume Timeout</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.CommonDockerServiceInstance#getDockerConfiguration <em>Docker Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.common.docker.service.ServicePackage#getCommonDockerServiceInstance()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/ServicePackage.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/ServicePackage.java
index 1db6c99..2915e9d 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/ServicePackage.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/ServicePackage.java
@@ -42,6 +42,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.common.docker.service.ServiceFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-common-docker-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.common.docker'"
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/TommyDockerServiceConfiguration.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/TommyDockerServiceConfiguration.java
index 47dee2b..336b788 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/TommyDockerServiceConfiguration.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/TommyDockerServiceConfiguration.java
@@ -31,12 +31,12 @@ package org.openecomp.dcae.controller.service.common.docker.service;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.TommyDockerServiceConfiguration#getPostgresUserName <em>Postgres User Name</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.TommyDockerServiceConfiguration#getPostgresPassword <em>Postgres Password</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.TommyDockerServiceConfiguration#getPortgresJdbc <em>Portgres Jdbc</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.common.docker.service.ServicePackage#getTommyDockerServiceConfiguration()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceConfigurationImpl.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceConfigurationImpl.java
index eb82953..47769f2 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceConfigurationImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceConfigurationImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Common Docker Service Configuration</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceImpl.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceImpl.java
index 06c2bba..0eb1d5b 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Common Docker Service</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceInstanceImpl.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceInstanceImpl.java
index 22ad45f..13dd4bc 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceInstanceImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/CommonDockerServiceInstanceImpl.java
@@ -43,6 +43,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.impl.CommonDockerServiceInstanceImpl#getScript <em>Script</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.impl.CommonDockerServiceInstanceImpl#getConfigureTimeout <em>Configure Timeout</em>}</li>
@@ -51,7 +52,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.impl.CommonDockerServiceInstanceImpl#getResumeTimeout <em>Resume Timeout</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.impl.CommonDockerServiceInstanceImpl#getDockerConfiguration <em>Docker Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/TommyDockerServiceConfigurationImpl.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/TommyDockerServiceConfigurationImpl.java
index 352c399..0483e55 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/TommyDockerServiceConfigurationImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/impl/TommyDockerServiceConfigurationImpl.java
@@ -38,12 +38,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.impl.TommyDockerServiceConfigurationImpl#getPostgresUserName <em>Postgres User Name</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.impl.TommyDockerServiceConfigurationImpl#getPostgresPassword <em>Postgres Password</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.common.docker.service.impl.TommyDockerServiceConfigurationImpl#getPortgresJdbc <em>Portgres Jdbc</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/util/ServiceSwitch.java b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/util/ServiceSwitch.java
index 197cfbe..bead1b1 100644
--- a/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/util/ServiceSwitch.java
+++ b/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/docker/service/util/ServiceSwitch.java
@@ -76,7 +76,7 @@ public class ServiceSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/.classpath b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/.classpath
index d2d34b3..89273c0 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/.classpath
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/.classpath
@@ -21,7 +21,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/META-INF/MANIFEST.MF b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/META-INF/MANIFEST.MF
index f9af4b5..7e02738 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/META-INF/MANIFEST.MF
@@ -6,14 +6,3 @@ Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.docker.manager.tools,
   org.openecomp.dcae.controller.service.servers.docker,
   org.openecomp.dcae.controller.service.servers.dockermanager
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-docker-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-docker-adaptor;bundle-version="0.1.0",
- dcae-controller-service-docker-host-manager;bundle-version="0.1.0",
- dcae-controller-service-docker-host-model;bundle-version="0.1.0",
- dcae-controller-core-utils;bundle-version="0.1.0"
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/DockerManager2.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/DockerManager2.yaml
new file mode 100644
index 0000000..cc67863
--- /dev/null
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/DockerManager2.yaml
@@ -0,0 +1,12 @@
+operations:
+  DOCKER-MANAGER-START-NEW-CRON: {}
+  DOCKER-MANAGER-START-CRON-RUN: {}
+messages:
+  DOCKER-MANAGER-START-NEW-CRON:
+    errorCode: 2001I
+    messageFormat: cmd={0} frequency={1}
+    description: Defining new cron job
+  DOCKER-MANAGER-CRON-FAILURE:
+    errorCode: 4001W
+    messageFormat: cmd={0} error={1}
+    description: Cron Operation Failed
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/docker/manager/tools/Generator.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/docker/manager/tools/Generator.java
index 49ba09f..e040825 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/docker/manager/tools/Generator.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/docker/manager/tools/Generator.java
@@ -19,78 +19,80 @@
  * ============LICENSE_END============================================
  */
 	
-package org.openecomp.dcae.controller.service.docker.manager.tools;

-

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

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

-

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

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

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

-import org.openecomp.ncomp.gwt.siriusportal.model.*;

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

-import org.openecomp.dcae.controller.service.docker.DockerFactory;

-import org.openecomp.dcae.controller.service.dockermanager.DockermanagerFactory;

-import org.openecomp.utils.YamlToJava;

-

-public class Generator {

-

-	/**

-	 * @param args

-	 */

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

-		@SuppressWarnings("unused")

-		ServerPackage f = ServerPackage.eINSTANCE;

-		genManager();

-		genService();

-	}

-

-	public static void genManager() {

-		EObject o = DockermanagerFactory.eINSTANCE.createDockerManager();

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

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

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

-		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

-		m.setPrefix("Dcae");

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

-		m.setName("ControllerServiceDockerManager");

-		m.setTitle("ControllerServiceDockerManager");

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

-		g.setEnableIRequestHandler(false);

-		g.setEnableISiriusPlugin(false);

-		g.addFactory("org.openecomp.ncomp.servers.docker.DockerDockerFactory");

-		g.addFactory(DockerFactory.eINSTANCE);

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

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

-		g.generate(dir);

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

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

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

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

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

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

-	}

-

-	public static void genService() {

-		EObject o = DockerFactory.eINSTANCE.createDockerService();

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

-		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+"$", "") + "servers." + p.getNsPrefix();

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

-		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

-		m.setPrefix("Dcae");

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

-		m.setName("ControllerServiceDockerService");

-		m.setTitle("ControllerServiceDockerService");

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

-		g.setEnableIRequestHandler(false);

-		g.setEnableISiriusPlugin(true);

-		g.generate(dir);

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

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

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

-

-	}

-

-}

+package org.openecomp.dcae.controller.service.docker.manager.tools;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel;
+import org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelFactory;
+import org.openecomp.ncomp.sirius.manager.generator.ControllerGenerator;
+import org.openecomp.ncomp.gwt.siriusportal.model.*;
+import org.openecomp.ncomp.sirius.manager.server.ServerPackage;
+import org.openecomp.dcae.controller.service.docker.DockerFactory;
+import org.openecomp.dcae.controller.service.dockermanager.DockermanagerFactory;
+import org.openecomp.utils.YamlToJava;
+
+public class Generator {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		@SuppressWarnings("unused")
+		ServerPackage f = ServerPackage.eINSTANCE;
+		genManager();
+		genService();
+	}
+
+	public static void genManager() {
+		EObject o = DockermanagerFactory.eINSTANCE.createDockerManager();
+		EPackage p = o.eClass().getEPackage();
+		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();
+		dir = "src/main/sirius-gen/" + dir.replace('.', '/');
+		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
+		m.setTemplateDirectory("../../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+		m.setPrefix("Dcae");
+		m.setPluginName(p.getNsURI());
+		m.setName("ControllerServiceDockerManager");
+		m.setTitle("ControllerServiceDockerManager");
+		ControllerGenerator g = new ControllerGenerator(o, m);
+		g.setVersion("ONAP-R2");
+		g.setEnableIRequestHandler(false);
+		g.setEnableISiriusPlugin(false);
+		g.addFactory("org.openecomp.ncomp.servers.docker.DockerDockerFactory");
+		g.addFactory(DockerFactory.eINSTANCE);
+		EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();
+		g.addObject("gui", gui, m);
+		g.generate(dir);
+		g.generateScripts("src/main/server-gen/bin", "controller-service-docker-manager");
+		String pName = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".logging";
+//		YamlToJava.convert("src/main/resources/DockerAdaptor.yaml", dir + "/logging", pName);
+		YamlToJava.convert("src/main/sirius-gen/DockerManager.yaml", dir + "/logging", pName);
+		YamlToJava.convert("src/main/java/DockerManager2.yaml", dir + "/logging", pName);
+		String pName1 = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".gui.logging";
+		YamlToJava.convert("src/main/sirius-gen/GuiClientApi.yaml", dir + "/gui/logging", pName1);
+	}
+
+	public static void genService() {
+		EObject o = DockerFactory.eINSTANCE.createDockerService();
+		EPackage p = o.eClass().getEPackage();
+		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+"$", "") + "servers." + p.getNsPrefix();
+		dir = "src/main/sirius-gen/" + dir.replace('.', '/');
+		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
+		m.setTemplateDirectory("../../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+		m.setPrefix("Dcae");
+		m.setPluginName(p.getNsURI());
+		m.setName("ControllerServiceDockerService");
+		m.setTitle("ControllerServiceDockerService");
+		ControllerGenerator g = new ControllerGenerator(o, m);
+		g.setVersion("ONAP-R2");
+		g.setEnableIRequestHandler(false);
+		g.setEnableISiriusPlugin(true);
+		g.generate(dir);
+		String pName = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".logging";
+//		YamlToJava.convert("src/main/resources/DcaeServiceDockerHost.yaml", dir + "/logging", pName);
+		YamlToJava.convert("src/main/sirius-gen/DockerService.yaml", dir + "/logging", pName);
+	}
+
+}
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceProvider.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceProvider.java
index e653107..cdfc596 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceProvider.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceProvider.java
@@ -45,6 +45,7 @@ import org.openecomp.dcae.controller.service.docker.host.servers.service.DcaeDoc
 import org.openecomp.dcae.controller.service.docker.host.service.DockerHostServiceInstance;
 import org.openecomp.dcae.controller.service.servers.dockermanager.DcaeDockerManagerConsole;
 import org.openecomp.dcae.controller.service.servers.vmmanager.DcaeVirtualMachineManagerConsole;
+import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
 import org.openecomp.dcae.controller.service.vm.VirtualMachineServiceInstance;
 import org.openecomp.ncomp.core.DeploymentStatus;
 import org.openecomp.ncomp.docker.ContainerOptions;
@@ -54,6 +55,7 @@ import org.openecomp.ncomp.docker.DockerFactory;
 import org.openecomp.ncomp.servers.docker.DockerDockerHostConsole;
 import org.openecomp.ncomp.sirius.manager.AbstractClient;
 import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 import org.openecomp.ncomp.sirius.manager.JavaHttpClient;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
@@ -96,8 +98,8 @@ public class DcaeDockerServiceProvider extends BasicAdaptorProvider {
 		}
 		console(instanceName).setupConfiguration(o.getName(), instanceName);
 		consoleHost(i).dockerRunWithOptions("/resources/dockerHost", image(i), opts);
-		long toolate = System.currentTimeMillis() + 2 * 60 * 1000; 
-		// if has manager wait 2 minutes for container manager
+		long toolate = System.currentTimeMillis() + 15 * 60 * 1000; 
+		// wait 15 minutes for container manager
 		while (i.getManagerPortNumber() > 0 && System.currentTimeMillis() < toolate) {
 			try {
 				o.pushManagerConfiguration(instanceName);
@@ -136,15 +138,15 @@ public class DcaeDockerServiceProvider extends BasicAdaptorProvider {
 
 	public AbstractClient getClient(DockerServiceInstance i) {
 		DockerHostServiceInstance instance = i.getHostService();
-		DcaeDockerHostService service = (DcaeDockerHostService) instance.getService();
-		DcaeDockerHostServiceProvider provider = service.getSomfProvider();
+		VirtualMachineService service = instance.getService();
+		DcaeDockerHostServiceProvider provider = (DcaeDockerHostServiceProvider) ((ISiriusProvider) service).getSiriusProvider();
 		return provider.getClient(instance);
 	}
 
 	private DockerDockerHostConsole consoleHost(DockerServiceInstance i) {
 		DockerHostServiceInstance instance = i.getHostService();
-		DcaeDockerHostService service = (DcaeDockerHostService) instance.getService();
-		DcaeDockerHostServiceProvider provider = service.getSomfProvider();
+		VirtualMachineService service = instance.getService();
+		DcaeDockerHostServiceProvider provider = (DcaeDockerHostServiceProvider) ((ISiriusProvider) service).getSiriusProvider();
 		AbstractClient c = provider.getClient(instance);
 		return new DockerDockerHostConsole(c);
 	}
@@ -265,11 +267,17 @@ public class DcaeDockerServiceProvider extends BasicAdaptorProvider {
 	}
 
 	public void runHealthTests() {
-		System.out.println("DOCKER: runHealthTests" + o.getName());
+//		System.out.println("DOCKER: runHealthTests" + o.getName());
 		for (DockerServiceInstance i : o.getInstances()) {
 			HealthTestResponse s = null;
 			try {
-				s = o.test(i.getName());
+				if (i.getStatus() == DeploymentStatus.DEPLOYED) {
+					s = test(i.getName());
+				} else {
+					s = ServiceFactory.eINSTANCE.createHealthTestResponse();
+					s.setMessageCode("Not deployed");
+					s.setStatus(HealthTestStatus.YELLOW);
+				}
 			} catch (Exception e) {
 				s = ServiceFactory.eINSTANCE.createHealthTestResponse();
 				s.setMessageCode("Unable to determine health: " + e);
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerProvider.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerProvider.java
index a6e70da..13173ac 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerProvider.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerProvider.java
@@ -19,45 +19,36 @@
  * ============LICENSE_END============================================
  */
 	
-
 package org.openecomp.dcae.controller.service.servers.dockermanager;
 
-
-
-
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.util.Date;
 
-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.manager.ManagementServer;
-import org.openecomp.ncomp.sirius.manager.ManagementServerUtils;
-import org.openecomp.ncomp.sirius.function.FunctionUtils;
-
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-
-
-
-import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
-import org.openecomp.ncomp.webservice.utils.FileUtils;
 import org.openecomp.dcae.controller.core.service.HealthTestResponse;
 import org.openecomp.dcae.controller.core.service.HealthTestStatus;
 import org.openecomp.dcae.controller.core.service.ServiceFactory;
 import org.openecomp.dcae.controller.core.stream.DcaeStream;
-import org.openecomp.dcae.controller.service.dockermanager.impl.DockerManagerImpl;
 import org.openecomp.dcae.controller.service.dockermanager.DockerManager;
-
+import org.openecomp.dcae.controller.service.servers.dockermanager.logging.DockerManager2MessageEnum;
+import org.openecomp.dcae.controller.service.servers.dockermanager.logging.DockerManager2OperationEnum;
+import org.openecomp.logger.EcompMessageEnum;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider;
+import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.ManagementServerUtils;
+import org.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.ncomp.utils.ShellCmd;
+import org.openecomp.ncomp.webservice.utils.FileUtils;
 
 public class DcaeDockerManagerProvider extends BasicAdaptorProvider {
 	private static final Logger logger = Logger.getLogger(DcaeDockerManagerProvider.class);
+	private static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	DockerManager o;
 	private boolean suspended;
 
@@ -102,9 +93,9 @@ public class DcaeDockerManagerProvider extends BasicAdaptorProvider {
 			json.put("dmaapStreamId", s.getName());
 			a.put(json);
 		}
-		write2file(a,"/tmp/dmaap.conf2");
-		write2file(a,"/etc/dcae/dmaap.conf");
-		
+		write2file(a, "/tmp/dmaap.conf2");
+		write2file(a, "/etc/dcae/dmaap.conf");
+
 	}
 
 	private void write2file(JSONArray a, String fileName) {
@@ -124,49 +115,51 @@ public class DcaeDockerManagerProvider extends BasicAdaptorProvider {
 		o.getOutputStreams().clear();
 		o.getOutputStreams().addAll(outputStreams);
 	}
-	
+
 	public void scheduleCronjob(final String cmd, final long frequency) {
-    	Thread t = new Thread("crontab: " + cmd) {
-            @Override
-            public void run() {
-                while (true) {
-                    try {
-                    	Date now = new Date();
-                    	long wait = frequency - (now.getTime() % frequency);
-                    	Thread.sleep(wait);
-                    	if (suspended) continue;
-                		Runtime runtime = Runtime.getRuntime();
-                		Process proc;
-                		try {
-                			now = new Date();
-                			proc = runtime.exec(cmd);
-                			ByteArrayOutputStream o = new ByteArrayOutputStream();
-                			ByteArrayOutputStream e = new ByteArrayOutputStream();
-                			FileUtils.copyStream(proc.getInputStream(), o);
-                			FileUtils.copyStream(proc.getErrorStream(), e);
-                			int i = proc.waitFor();
-                			if (i != 0) 
-                				logger.warn("crontab return error: " + cmd + " " + i);
-                			long duration = new Date().getTime()-now.getTime();
-							if (duration  > frequency) 
-                				logger.warn("crontab took too long: " + cmd + " " + duration);
-                		} catch (Exception e) {
-                			e.printStackTrace();
-                			logger.warn("ERROR: " + e);
-                		}
-                    } catch (Exception e) {
-                        ManagementServerUtils.printStackTrace(e);
-                        logger.fatal("crontab: " + cmd + " " + e);
-                        try {
-                            Thread.sleep(30000);
-                        } catch (InterruptedException e1) {
-                        }
-                    }
-                }
-            };
-        };
-        t.start();
+		ecomplogger.setOperation(DockerManager2OperationEnum.DOCKER_MANAGER_START_NEW_CRON);
+		ecomplogger.newRequestId();
+		ecomplogger.setInstanceId(controller, o);
+		ecomplogger.recordAuditEventStart();
+		EcompMessageEnum msg1 = DockerManager2MessageEnum.DOCKER_MANAGER_START_NEW_CRON;
+		;
+		ecomplogger.recordAuditEventEnd(StatusCodeEnum.COMPLETE, msg1, cmd, Long.toString(frequency));
+
+		Thread t = new Thread("crontab: " + cmd) {
+			@Override
+			public void run() {
+				while (true) {
+					try {
+						Date now = new Date();
+						long wait = frequency - (now.getTime() % frequency);
+						Thread.sleep(wait);
+						if (suspended)
+							continue;
+						try {
+							ecomplogger.setOperation(DockerManager2OperationEnum.DOCKER_MANAGER_START_CRON_RUN);
+							ecomplogger.newRequestId();
+							ecomplogger.setInstanceId(controller, o);
+							ecomplogger.recordAuditEventStart();
+							ShellCmd c = new ShellCmd(cmd);
+							c.result(frequency);
+							ecomplogger.recordAuditEventEnd();
+						} catch (Exception e) {
+							e.printStackTrace();
+							EcompMessageEnum msg = DockerManager2MessageEnum.DOCKER_MANAGER_CRON_FAILURE;
+							ecomplogger.recordAuditEventEnd(StatusCodeEnum.ERROR, msg, cmd, e.toString());
+						}
+					} catch (Exception e) {
+						ManagementServerUtils.printStackTrace(e);
+						logger.fatal("crontab: " + cmd + " " + e);
+						try {
+							Thread.sleep(30000);
+						} catch (InterruptedException e1) {
+						}
+					}
+				}
+			};
+		};
+		t.start();
 	}
 
-	
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/server-gen/bin/controller-service-docker-manager-controller b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/server-gen/bin/controller-service-docker-manager-controller
index c774595..16cf560 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/server-gen/bin/controller-service-docker-manager-controller
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/server-gen/bin/controller-service-docker-manager-controller
@@ -93,7 +93,7 @@ case $CMD in
     if [ -e $_DIR/logs/$PNAME.out ]; then mv $_DIR/logs/$PNAME.out $_DIR/logs/$PNAME.out.1; fi
     if [ -e $_DIR/logs/$PNAME.err ]; then mv $_DIR/logs/$PNAME.err $_DIR/logs/$PNAME.err.1; fi
 
-    nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS > $_DIR/logs/$PNAME.out 2> $_DIR/logs/$PNAME.err  &
+    nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS >> $_DIR/logs/$PNAME.out 2>> $_DIR/logs/$PNAME.err  &
 
     _PID=$!
     echo $_PID > $_PIDFILE
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/DockerManager.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/DockerManager.yaml
index 6ab6771..a234cae 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/DockerManager.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/DockerManager.yaml
@@ -1,69 +1,57 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
+  DockerManager@test: {}
+  DockerManager@suspend: {}
+  DockerManager@resume: {}
+  DockerManager@publicKey: {}
+  DockerManager@configurationChanged: {}
+  DockerManager@updateStreams: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/DockerService.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/DockerService.yaml
index c449feb..580d4bd 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/DockerService.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/DockerService.yaml
@@ -1,124 +1,102 @@
 operations:
-  deploy: {}
-  undeploy: {}
-  test: {}
-  suspend: {}
-  resume: {}
-  pushManagerConfiguration: {}
-  pollManagerConfiguration: {}
-  managerConfiguration: {}
-  managerOperation: {}
-  updateConfigurationFromPolicy: {}
-  runHealthTests: {}
-  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
+  DockerService@deploy: {}
+  DockerService@undeploy: {}
+  DockerService@test: {}
+  DockerService@suspend: {}
+  DockerService@resume: {}
+  DockerService@pushManagerConfiguration: {}
+  DockerService@pollManagerConfiguration: {}
+  DockerService@managerConfiguration: {}
+  DockerService@managerOperation: {}
+  DockerService@updateConfigurationFromPolicy: {}
+  DockerService@runHealthTests: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/GuiClientApi.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerService.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerService.java
index 886713f..43a5c67 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerService.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerService.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.servers.docker;
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.servers.docker.logging.DockerServiceOperationEnum;
+import org.openecomp.dcae.controller.service.servers.docker.logging.DockerServiceMessageEnum;
 
 
 
@@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.docker.impl.DockerServiceImpl;
 
 
 
-public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugin {
+public class DcaeDockerService extends DockerServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeDockerService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeDockerServiceProvider controller;
 	ISiriusServer server;
 
@@ -68,8 +78,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.deploy);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -78,7 +88,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.undeploy);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -103,7 +116,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_test,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -128,7 +144,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -153,7 +172,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_resume,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -178,7 +200,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -193,8 +218,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.pushManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -203,7 +228,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -218,8 +246,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.pollManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -228,7 +256,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -243,8 +274,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.managerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -253,7 +284,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -268,8 +302,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.managerOperation);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -278,7 +312,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -293,8 +330,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.updateConfigurationFromPolicy);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -303,7 +340,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -318,8 +358,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.runHealthTests);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerServiceOperationEnum.DockerService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -328,7 +368,10 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(DockerServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -342,6 +385,8 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -350,7 +395,7 @@ public class DcaeDockerService extends DockerServiceImpl implements ISiriusPlugi
 	public static void ecoreSetup() {
 		DcaeDockerServiceProvider.ecoreSetup();
 	}
-	public DcaeDockerServiceProvider getSomfProvider() {
+	public DcaeDockerServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceClient.java
index 3e23682..023d957 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 		DcaeDockerService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeDockerServiceClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeDockerServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_deploy);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed:  deploy", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_undeploy);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed:  undeploy", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_test);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -122,16 +130,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_suspend);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -139,16 +148,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_resume);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pushManagerConfiguration", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pollManagerConfiguration", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  managerConfiguration", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -207,16 +220,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed:  managerOperation", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed:  updateConfigurationFromPolicy", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeDockerServiceClient extends DockerServiceImpl {
 
 	@Override
 	public void runHealthTests() {
-		EClass c = DockerPackage.eINSTANCE.getDockerService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = DockerPackage.eINSTANCE.getDockerService(); 
+		ecomplogger.recordMetricEventStart(DockerServiceOperationEnum.DockerService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed:  runHealthTests", e);
+			ecomplogger.warn(DockerServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(DockerServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceServer.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceServer.java
index 628a90f..c9c422b 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceServer.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/DcaeDockerServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.servers.docker;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.docker.DockerService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.docker.DockerService;
 
 
 
-public class DcaeDockerServiceServer implements ISiriusServer {
+public class DcaeDockerServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeDockerServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeDockerServiceServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "DockerService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
         server.addRuntimeFactories(this);
@@ -73,6 +73,7 @@ public class DcaeDockerServiceServer implements ISiriusServer {
         controller = (DcaeDockerService) server.find("/").o;
         webServer = new Jetty8Server("docker.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -95,4 +96,17 @@ public class DcaeDockerServiceServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerService.properties b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerService.properties
index 13a57d6..f3a3955 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerService.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerService.properties
@@ -1,138 +1,138 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerServiceMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerServiceMessageEnum.java
index 314b50c..fd3d6ba 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerServiceMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.docker.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,30 +7,30 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum DockerServiceMessageEnum implements EcompMessageEnum {
 
   dummy,
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.docker.logging.DockerService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/docker/logging/DockerService");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerServiceOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerServiceOperationEnum.java
index b72aabb..8747331 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerServiceOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/docker/logging/DockerServiceOperationEnum.java
@@ -1,51 +1,32 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.docker.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum DockerServiceOperationEnum implements EcompOperationEnum {
 
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests;
+  DockerService_deploy("DockerService@deploy"),
+  DockerService_undeploy("DockerService@undeploy"),
+  DockerService_test("DockerService@test"),
+  DockerService_suspend("DockerService@suspend"),
+  DockerService_resume("DockerService@resume"),
+  DockerService_pushManagerConfiguration("DockerService@pushManagerConfiguration"),
+  DockerService_pollManagerConfiguration("DockerService@pollManagerConfiguration"),
+  DockerService_managerConfiguration("DockerService@managerConfiguration"),
+  DockerService_managerOperation("DockerService@managerOperation"),
+  DockerService_updateConfigurationFromPolicy("DockerService@updateConfigurationFromPolicy"),
+  DockerService_runHealthTests("DockerService@runHealthTests") ; 
+
+
+	private String n;
+	
+	private DockerServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManager.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManager.java
index 44682ed..5fa0758 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManager.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManager.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.servers.dockermanager;
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.servers.dockermanager.logging.DockerManagerOperationEnum;
+import org.openecomp.dcae.controller.service.servers.dockermanager.logging.DockerManagerMessageEnum;
 
 
 
@@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.dockermanager.impl.DockerManagerImp
 
 
 
-public class DcaeDockerManager extends DockerManagerImpl {
+public class DcaeDockerManager extends DockerManagerImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeDockerManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeDockerManagerProvider controller;
 	ISiriusServer server;
 
@@ -68,8 +78,8 @@ public class DcaeDockerManager extends DockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerManagerOperationEnum.DockerManager_test,server,this);
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -78,7 +88,10 @@ public class DcaeDockerManager extends DockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(DockerManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class DcaeDockerManager extends DockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerManagerOperationEnum.DockerManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -103,7 +116,10 @@ public class DcaeDockerManager extends DockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(DockerManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class DcaeDockerManager extends DockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerManagerOperationEnum.DockerManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -128,7 +144,10 @@ public class DcaeDockerManager extends DockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(DockerManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class DcaeDockerManager extends DockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.publicKey);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerManagerOperationEnum.DockerManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -153,7 +172,10 @@ public class DcaeDockerManager extends DockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(DockerManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class DcaeDockerManager extends DockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.configurationChanged);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerManagerOperationEnum.DockerManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -178,7 +200,10 @@ public class DcaeDockerManager extends DockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(DockerManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -193,8 +218,8 @@ public class DcaeDockerManager extends DockerManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.updateStreams);
+		ecomplogger.recordAuditEventStartIfNeeded(DockerManagerOperationEnum.DockerManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -203,7 +228,10 @@ public class DcaeDockerManager extends DockerManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(DockerManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(DockerManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -217,10 +245,12 @@ public class DcaeDockerManager extends DockerManagerImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeDockerManagerProvider.ecoreSetup();
 	}
-	public DcaeDockerManagerProvider getSomfProvider() {
+	public DcaeDockerManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerClient.java
index ef7b4f6..c463b7f 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeDockerManagerClient extends DockerManagerImpl {
 		DcaeDockerManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeDockerManagerClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeDockerManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.REMOTE_test);
+		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); 
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(DockerManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -88,16 +94,17 @@ public class DcaeDockerManagerClient extends DockerManagerImpl {
 
 	@Override
 	public void suspend() {
-		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.REMOTE_suspend);
+		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); 
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(DockerManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeDockerManagerClient extends DockerManagerImpl {
 
 	@Override
 	public void resume() {
-		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.REMOTE_resume);
+		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); 
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(DockerManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeDockerManagerClient extends DockerManagerImpl {
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.REMOTE_publicKey);
+		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); 
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed:  publicKey", e);
+			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(DockerManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeDockerManagerClient extends DockerManagerImpl {
 
 	@Override
 	public void configurationChanged() {
-		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); 
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed:  configurationChanged", e);
+			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(DockerManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeDockerManagerClient extends DockerManagerImpl {
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = DockermanagerPackage.eINSTANCE.getDockerManager(); 
+		ecomplogger.recordMetricEventStart(DockerManagerOperationEnum.DockerManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed:  updateStreams", e);
+			ecomplogger.warn(DockerManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(DockerManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerServer.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerServer.java
index d121f93..bda0fa3 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerServer.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/DcaeDockerManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.servers.dockermanager;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.dockermanager.DockerManager;
@@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.servers.dockermanager.gui.DcaeModel
 
 
 
-public class DcaeDockerManagerServer implements ISiriusServer {
+public class DcaeDockerManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeDockerManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -69,6 +68,7 @@ public class DcaeDockerManagerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "DockerManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
     
 		server.addFactory(new org.openecomp.ncomp.servers.docker.DockerDockerFactory(this));
@@ -84,6 +84,7 @@ public class DcaeDockerManagerServer implements ISiriusServer {
         controller = (DcaeDockerManager) server.find("/").o;
         webServer = new Jetty8Server("dockermanager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -112,4 +113,17 @@ public class DcaeDockerManagerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/DcaeGuiClientApi.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/DcaeGuiClientApi.java
index 27b1d24..fbb3769 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/DcaeGuiClientApi.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/DcaeGuiClientApi.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.servers.dockermanager.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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.servers.dockermanager.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.dcae.controller.service.servers.dockermanager.gui.logging.GuiClientApiMessageEnum;
 
 
 
@@ -81,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -98,8 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getTree);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -108,7 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -123,8 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getObject);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -133,7 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -148,8 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -158,7 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -173,8 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -183,7 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -198,8 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -208,7 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -223,8 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -233,7 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -247,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/DcaeGuiClientApiClient.java
index 8ecfe4a..37816a0 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/DcaeGuiClientApiClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/DcaeGuiClientApiClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeDockerManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTree, e.toString());
-			throw new RuntimeException("remote call failed:  getTree", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getObject, e.toString());
-			throw new RuntimeException("remote call failed:  getObject", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTimeSerie, e.toString());
-			throw new RuntimeException("remote call failed:  getTimeSerie", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTable, e.toString());
-			throw new RuntimeException("remote call failed:  getTable", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getHtml, e.toString());
-			throw new RuntimeException("remote call failed:  getHtml", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res;
 		try {
 		  res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getGraph, e.toString());
-			throw new RuntimeException("remote call failed:  getGraph", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApi.properties b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApi.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApiMessageEnum.java
index 09155d6..a0b0926 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApiMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.dockermanager.gui.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.dockermanager.gui.logging.GuiClientApi");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApi");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApiOperationEnum.java
index 63edff6..f3df875 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApiOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.dockermanager.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;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager.properties b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager.properties
index ef19f9b..4580ed4 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2.properties b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2.properties
new file mode 100644
index 0000000..50c681f
--- /dev/null
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2.properties
@@ -0,0 +1,12 @@
+
+DOCKER_MANAGER_START_NEW_CRON=\
+  DOCKER-MANAGER-START-NEW-CRON-2001I|\
+  cmd={0} frequency={1}|\
+  null|\
+  Defining new cron job
+
+DOCKER_MANAGER_CRON_FAILURE=\
+  DOCKER-MANAGER-CRON-FAILURE-4001W|\
+  cmd={0} error={1}|\
+  null|\
+  Cron Operation Failed
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2MessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2MessageEnum.java
new file mode 100644
index 0000000..165a11a
--- /dev/null
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2MessageEnum.java
@@ -0,0 +1,15 @@
+
+package org.openecomp.dcae.controller.service.servers.dockermanager.logging;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.openecomp.logger.EcompMessageEnum;
+
+public enum DockerManager2MessageEnum implements EcompMessageEnum {
+
+  DOCKER_MANAGER_START_NEW_CRON,
+  DOCKER_MANAGER_CRON_FAILURE;
+
+	static {
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2");
+	}
+}
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2OperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2OperationEnum.java
new file mode 100644
index 0000000..8fc309a
--- /dev/null
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager2OperationEnum.java
@@ -0,0 +1,23 @@
+
+package org.openecomp.dcae.controller.service.servers.dockermanager.logging;
+
+import org.openecomp.entity.EcompOperationEnum;
+
+public enum DockerManager2OperationEnum implements EcompOperationEnum {
+
+  DOCKER_MANAGER_START_NEW_CRON("DOCKER-MANAGER-START-NEW-CRON"),
+  DOCKER_MANAGER_START_CRON_RUN("DOCKER-MANAGER-START-CRON-RUN") ; 
+
+
+	private String n;
+	
+	private DockerManager2OperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
+}
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManagerMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManagerMessageEnum.java
index cc1ee62..6001677 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManagerMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.dockermanager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum DockerManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.dockermanager.logging.DockerManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManager");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManagerOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManagerOperationEnum.java
index 835e2c6..bcb1120 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManagerOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/dockermanager/logging/DockerManagerOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.dockermanager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum DockerManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams;
+  DockerManager_test("DockerManager@test"),
+  DockerManager_suspend("DockerManager@suspend"),
+  DockerManager_resume("DockerManager@resume"),
+  DockerManager_publicKey("DockerManager@publicKey"),
+  DockerManager_configurationChanged("DockerManager@configurationChanged"),
+  DockerManager_updateStreams("DockerManager@updateStreams") ; 
+
+
+	private String n;
+	
+	private DockerManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/.classpath b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/.classpath
index d2d34b3..0d82fb7 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/.classpath
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="config"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -21,7 +20,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/META-INF/MANIFEST.MF b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/META-INF/MANIFEST.MF
index bc87351..df7681a 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/META-INF/MANIFEST.MF
@@ -6,11 +6,3 @@ Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.docker.host.manager.tools,
  org.openecomp.dcae.controller.service.docker.host.servers.manager,
  org.openecomp.dcae.controller.service.docker.host.servers.service
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-docker-host-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-docker-adaptor;bundle-version="0.1.0"
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/assembly/assemble_zip.xml b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/assembly/assemble_zip.xml
index 3d7bbc7..6501609 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/assembly/assemble_zip.xml
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/assembly/assemble_zip.xml
@@ -38,6 +38,7 @@
 			<directory>src/main/server-gen/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
@@ -45,16 +46,19 @@
 			<directory>src/main/server/bin</directory>
 			<outputDirectory>bin</outputDirectory>
 			<fileMode>0744</fileMode>
+			<lineEnding>unix</lineEnding>
 			<excludes>
 			</excludes>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server-gen/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/server/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
+			<lineEnding>unix</lineEnding>
 		</fileSet>
 	</fileSets>
 
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/manager/tools/Generator.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/manager/tools/Generator.java
index 2f5d097..3545006 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/manager/tools/Generator.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/manager/tools/Generator.java
@@ -53,12 +53,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceDockerHostManager");

 		m.setTitle("ControllerServiceDockerHostManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(false);

 		g.addFactory("org.openecomp.ncomp.servers.docker.DockerDockerFactory");

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

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceDockerHostService");

 		m.setTitle("ControllerServiceDockerHostService");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(true);

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

diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerProvider.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerProvider.java
index 560f0c8..59a07d3 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerProvider.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerProvider.java
@@ -39,8 +39,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import org.openecomp.dcae.controller.core.service.HealthTestResponse;
-import org.openecomp.dcae.controller.core.service.HealthTestStatus;
-import org.openecomp.dcae.controller.core.service.ServiceFactory;
 import org.openecomp.dcae.controller.core.stream.DcaeStream;
 import org.openecomp.dcae.controller.service.servers.vmmanager.DcaeVirtualMachineManagerProvider;
 import org.openecomp.dcae.controller.service.docker.host.manager.DockerHostManager;
@@ -118,16 +116,5 @@ public class DcaeDockerHostManagerProvider extends DcaeVirtualMachineManagerProv
 		}
 
 	}
-	
-	@Override
-	public HealthTestResponse test() {
-		HealthTestResponse res = ServiceFactory.eINSTANCE.createHealthTestResponse();
-		res.setStatus(HealthTestStatus.GREEN);
-		if (o.getDockerHost() == null || o.getDockerHost().getNetworks().size() == 0) {
-			res.setMessageCode("Docker Engine not working");
-			res.setStatus(HealthTestStatus.RED);
-		}
-		return res;
-	}
 
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/common.funcs b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/common.funcs
deleted file mode 100644
index 1386d92..0000000
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/common.funcs
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# common shell functions 
-#
-
-_die() {
-    printf "$(date):FATAL:$1\n"
-    exit 2;
-}
-
-_fail() {
-    _die $1;
-}
-
-_fail_with_rc() {
-    rc=$1
-    shift;
-    printf "$(date):ERROR:$@\n";
-    exit $rc;
-}
-
-_warn() {
-    printf "$(date):WARN:$1\n";
-}
-
-_info() {
-    printf "$(date):INFO:$1\n";
-}
-
-_print() {
-    _info $1;
-}
-
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/generate-certs.sh b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/generate-certs.sh
deleted file mode 100644
index 88cf23d..0000000
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/generate-certs.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash -x
-
-#
-# this was (mostly) shamelessly cribbed from the io.docker:docker 
-# install_postproc script. run as root
-#
-DOCKER_DIR=/opt/app/docker
-DOCKER_ETC_DIR=${DOCKER_DIR}/etc
-DOCKER_BIN_DIR=${DOCKER_DIR}/bin
-DOCKER_DATA_DIR=${DOCKER_DIR}/data
-DOCKER_LOG_DIR=${DOCKER_DIR}/logs
-
-DOCKER_CA_CERT=${DOCKER_ETC_DIR}/docker_ca_cert.pem
-DOCKER_CA_KEY=${DOCKER_ETC_DIR}/docker_ca_key.pem
-CLIENT_P12_PWD=f22723cffdbd2fff1cb3c558677a7684
-
-HOSTNAME=$(hostname -f)
-
-# Generate certificates for SSL encryption
-# Generate a private key for the docker engine
-
-openssl genrsa -out ${DOCKER_ETC_DIR}/server_key.pem 2048 || 
-	_fail_with_rc 20 "Server private key generation failed"
-
-# Generate a certificate signing request for the server using the private key.
-openssl req -new -key ${DOCKER_ETC_DIR}/server_key.pem -out ${DOCKER_ETC_DIR}/server.csr -batch -subj "/countryName=US/stateOrProvinceName=Michigan/localityName=Southfield/organizationName=AT&T Services, Inc./commonName=${HOSTNAME}" || 
-	_fail_with_rc 21 "Server certificate signing request generation failed."
-
-# Generate a certificate for the server and sign it with the CA certificate.
-openssl x509 -req -days 3650 -in ${DOCKER_ETC_DIR}/server.csr -CA ${DOCKER_CA_CERT} -CAkey ${DOCKER_CA_KEY} -CAcreateserial -out ${DOCKER_ETC_DIR}/server_cert.pem || 
-	_fail_with_rc 22 "Server certificate signing failed."
-
-# Generate a private key for client authentication
-openssl genrsa -out ${DOCKER_ETC_DIR}/client_key.pem 2048 || 
-	_fail_with_rc 20 "Client private key generation failed."
-
-# Generate a certificate signing request for the client using the private key.
-openssl req -new -key ${DOCKER_ETC_DIR}/client_key.pem -out ${DOCKER_ETC_DIR}/client.csr -batch -subj "/countryName=US/stateOrProvinceName=Michigan/localityName=Southfield/organizationName=AT&T Services, Inc./commonName=Client" || 
-	_fail_with_rc 21 "Clienterver certificate signing request generation failed."
-
-# To make the key suitable for client authentication, 
-# create an extensions config file
-echo extendedKeyUsage = clientAuth > ${DOCKER_ETC_DIR}/client_cert_extfile.cnf
-
-# Generate a certificate for the client and sign it with the CA certificate
-openssl x509 -req -days 3650 -in ${DOCKER_ETC_DIR}/client.csr -CA ${DOCKER_CA_CERT} -CAkey ${DOCKER_CA_KEY} -CAcreateserial -out ${DOCKER_ETC_DIR}/client_cert.pem -extfile ${DOCKER_ETC_DIR}/client_cert_extfile.cnf || 
-	_fail_with_rc 22 "Client certificate signing failed."
-
-# Protect the keys
-chmod 0600 ${DOCKER_ETC_DIR}/server_key.pem ${DOCKER_ETC_DIR}/client_key.pem ${DOCKER_CA_KEY}
-
-# Make the client key readable by the docker group so people who can access the docker cli can also
-# access docker engine via the rest api
-chgrp docker ${DOCKER_ETC_DIR}/client_key.pem
-# But make the public keys readable
-chmod 0644 ${DOCKER_ETC_DIR}/server_cert.pem ${DOCKER_ETC_DIR}/client_cert.pem ${DOCKER_CA_CERT}
-
-# Remove the password from the client key
-openssl rsa -in ${DOCKER_ETC_DIR}/client_key.pem -out ${DOCKER_ETC_DIR}/client_key.pem
-
-# Convert the client key from pem to pksc12 format so we can add it to the keystore
-
-openssl pkcs12 -export -inkey ${DOCKER_ETC_DIR}/client_key.pem -in ${DOCKER_ETC_DIR}/client_cert.pem -out ${DOCKER_ETC_DIR}/client_cert.p12 -name client_p12 -CAfile ${DOCKER_CA_CERT} -caname root -chain -passout pass:${CLIENT_P12_PWD} || 
-	_fail_with_rc 6 "CA key not converted to pksc12 format"
-
-# update the docker opts in /etc/default/docker
-DOCKER_OPTS="--debug --graph /opt/app/docker/data --host tcp://0.0.0.0:4243 --host unix:///var/run/docker.sock --tls=true --tlscert=/opt/app/docker/etc/server_cert.pem --tlskey=/opt/app/docker/etc/server_key.pem --tlscacert=/opt/app/docker/etc/docker_ca_cert.pem"
-
-echo "DOCKER_OPTS=${DOCKER_OPTS}" >> /etc/default/docker
-
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/get-ecomp-nexus-cert.sh b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/get-ecomp-nexus-cert.sh
deleted file mode 100644
index dbf49e0..0000000
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/get-ecomp-nexus-cert.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# assumes 10.208.197.75 ecomp-nexus is in /etc/hosts and 
-# we have a route to it
-#
-# run as root
-
-_die() {
-	printf "$(date):FATAL:$1\n"
-	exit 2;
-}
-
-_print() {
-	printf "$(date):INFO:$1\n";
-}
-
-
-DOCKER_ETC_DIR="/opt/app/docker/etc"
-NEXUS_CERT=${DOCKER_ETC_DIR}/nexus.crt
-
-_print "Getting ecomp-nexus certificate ..."
-
-keytool -printcert -rfc -sslserver ecomp-nexus:8443 > ${NEXUS_CERT}
-
-grep "BEGIN CERTIFICATE" ${NEXUS_CERT} || 
-	_die "Could not retrieve certificated"
-
-_print "Adding certificate ..."
-cp -p ${NEXUS_CERT} /usr/local/share/ca-certificates || 
-	_die "Could not copy certficate into place"
-
-_print "Updating CA certificates ..."
-update-ca-certficates
-
-#
-# restart docker 
-#
-
-_print "Restarting docker ..."
-service docker restart
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/install-docker.sh b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/install-docker.sh
deleted file mode 100644
index 66ff6de..0000000
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/install-docker.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. common.funcs
-
-TRUSTY_REPO="deb https://apt.dockerproject.org/repo ubuntu-trusty main"
-
-#
-# install docker-engine on ubuntu 14.04 
-#
-REL=$(uname -r)
-
-sudo apt-get update 
-
-#
-# Add GPG key
-#
-sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-
-echo "${TRUSTY_REPO}" | sudo tee /etc/apt/sources.list.d/docker.list
-
-# update apt package index
-sudo apt-get update 
-
-
-#
-# install apparmor
-#
-sudo app-get install -q -y apparmor || 
-	_fail "apparmor installation failed"
-
-#
-# get certificates
-#
-sudo apt-get install -q -y apt-transport-http ca-certificates ||
-	_fail "apt-transport-http ca-certificates installation failed"
-
-#
-# makes the aufs storage driver available 
-#
-sudo apt-get install -q -y linux-image-extra-${REL} linux-image-extra-virtual ||
-	_fail "linux-image-extra-${REL} or linux-image-extra-virtual installation failed"
-
-sudo apt-get install -q -y docker-engine ||
-	_fail "docker-engine installation failed"
-
-#
-# Generate certifcates for TLS 
-#
-sudo -uroot generate-certs.sh 
-
-sudo service docker start 
-sudo usermod -aG docker ubuntu
-sudo usermod -aG docker dcae
-
-#
-# END
-#
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/manager.sh b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/manager.sh
index 671a029..99e8d07 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/manager.sh
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/manager.sh
@@ -19,10 +19,14 @@ VMTYPE=vm-docker-host
 
 case $CMD1 in 
   start) 
-    mkdir -p data/resources
+	mkdir -p data/resources/configuration
     if [ ! -e data/resources/dockerHost.json ]; then
     	echo '{}' > data/resources/dockerHost.json
     fi
+	if [ -e config/version.json ]; then
+		rm -rf data/resources/configuration/version*
+		cp config/version.json data/resources/configuration/
+	fi
     sed -i s/FQDN/$(hostname -f)/ config/docker.properties
     find /opt/app/dcae-controller-service-*/lib -name \*.jar | grep -v docker-host-manager | xargs -I X cp X lib/
     JVMARGS=$(cat config/manager.properties | grep JVMARGS | sed 's/[^=]*=//')
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostManager.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostManager.yaml
index dfaced2..0e78115 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostManager.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostManager.yaml
@@ -1,234 +1,192 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  logs: {}
-  metrics: {}
-  properties: {}
-  uploadInfo: {}
-  getValues: {}
-  getValuesAll: {}
-  getMessages: {}
-  getRequestLogger: {}
-  evaluate: {}
-  update: {}
-  updateContainerConfiguration: {}
-  suspendContainer: {}
-  resumeContainer: {}
-  testContainer: {}
-  setupConfiguration: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
-  REMOTE_logs:
-    decription: Remote call logs
-  REMOTE_metrics:
-    decription: Remote call metrics
-  REMOTE_properties:
-    decription: Remote call properties
-  REMOTE_uploadInfo:
-    decription: Remote call uploadInfo
-  REMOTE_getValues:
-    decription: Remote call getValues
-  REMOTE_getValuesAll:
-    decription: Remote call getValuesAll
-  REMOTE_getMessages:
-    decription: Remote call getMessages
-  REMOTE_getRequestLogger:
-    decription: Remote call getRequestLogger
-  REMOTE_evaluate:
-    decription: Remote call evaluate
-  REMOTE_update:
-    decription: Remote call update
-  REMOTE_updateContainerConfiguration:
-    decription: Remote call updateContainerConfiguration
-  REMOTE_suspendContainer:
-    decription: Remote call suspendContainer
-  REMOTE_resumeContainer:
-    decription: Remote call resumeContainer
-  REMOTE_testContainer:
-    decription: Remote call testContainer
-  REMOTE_setupConfiguration:
-    decription: Remote call setupConfiguration
+  DockerHostManager@test: {}
+  DockerHostManager@suspend: {}
+  DockerHostManager@resume: {}
+  DockerHostManager@publicKey: {}
+  DockerHostManager@configurationChanged: {}
+  DockerHostManager@updateStreams: {}
+  DockerHostManager@logs: {}
+  DockerHostManager@metrics: {}
+  DockerHostManager@properties: {}
+  DockerHostManager@uploadInfo: {}
+  DockerHostManager@getValues: {}
+  DockerHostManager@getValuesAll: {}
+  DockerHostManager@getMessages: {}
+  DockerHostManager@getRequestLogger: {}
+  DockerHostManager@evaluate: {}
+  DockerHostManager@update: {}
+  DockerHostManager@updateContainerConfiguration: {}
+  DockerHostManager@suspendContainer: {}
+  DockerHostManager@resumeContainer: {}
+  DockerHostManager@testContainer: {}
+  DockerHostManager@setupConfiguration: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  logs:
-    errorCode: logs-FAILED-5001W
+  REQUEST-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  metrics:
-    errorCode: metrics-FAILED-5001W
+  REQUEST-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  properties:
-    errorCode: properties-FAILED-5001W
+  REQUEST-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  uploadInfo:
-    errorCode: uploadInfo-FAILED-5001W
+  REQUEST-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValues:
-    errorCode: getValues-FAILED-5001W
+  REQUEST-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValuesAll:
-    errorCode: getValuesAll-FAILED-5001W
+  REQUEST-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getMessages:
-    errorCode: getMessages-FAILED-5001W
+  REQUEST-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getRequestLogger:
-    errorCode: getRequestLogger-FAILED-5001W
+  REQUEST-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  evaluate:
-    errorCode: evaluate-FAILED-5001W
+  REQUEST-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  update:
-    errorCode: update-FAILED-5001W
+  REQUEST-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateContainerConfiguration:
-    errorCode: updateContainerConfiguration-FAILED-5001W
+  REQUEST-FAILED-updateContainerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspendContainer:
-    errorCode: suspendContainer-FAILED-5001W
+  REQUEST-FAILED-suspendContainer:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resumeContainer:
-    errorCode: resumeContainer-FAILED-5001W
+  REQUEST-FAILED-resumeContainer:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  testContainer:
-    errorCode: testContainer-FAILED-5001W
+  REQUEST-FAILED-testContainer:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  setupConfiguration:
-    errorCode: setupConfiguration-FAILED-5001W
+  REQUEST-FAILED-setupConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_logs:
-    errorCode: REMOTE-logs-FAILED-5001W
+  REMOTE-CALL-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_metrics:
-    errorCode: REMOTE-metrics-FAILED-5001W
+  REMOTE-CALL-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_properties:
-    errorCode: REMOTE-properties-FAILED-5001W
+  REMOTE-CALL-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_uploadInfo:
-    errorCode: REMOTE-uploadInfo-FAILED-5001W
+  REMOTE-CALL-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValues:
-    errorCode: REMOTE-getValues-FAILED-5001W
+  REMOTE-CALL-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValuesAll:
-    errorCode: REMOTE-getValuesAll-FAILED-5001W
+  REMOTE-CALL-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getMessages:
-    errorCode: REMOTE-getMessages-FAILED-5001W
+  REMOTE-CALL-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getRequestLogger:
-    errorCode: REMOTE-getRequestLogger-FAILED-5001W
+  REMOTE-CALL-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_evaluate:
-    errorCode: REMOTE-evaluate-FAILED-5001W
+  REMOTE-CALL-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_update:
-    errorCode: REMOTE-update-FAILED-5001W
+  REMOTE-CALL-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateContainerConfiguration:
-    errorCode: REMOTE-updateContainerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-updateContainerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspendContainer:
-    errorCode: REMOTE-suspendContainer-FAILED-5001W
+  REMOTE-CALL-FAILED-suspendContainer:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resumeContainer:
-    errorCode: REMOTE-resumeContainer-FAILED-5001W
+  REMOTE-CALL-FAILED-resumeContainer:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_testContainer:
-    errorCode: REMOTE-testContainer-FAILED-5001W
+  REMOTE-CALL-FAILED-testContainer:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_setupConfiguration:
-    errorCode: REMOTE-setupConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-setupConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostService.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostService.yaml
index 6ac8c34..7722813 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostService.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostService.yaml
@@ -1,135 +1,111 @@
 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
+  DockerHostService@deploy: {}
+  DockerHostService@undeploy: {}
+  DockerHostService@test: {}
+  DockerHostService@suspend: {}
+  DockerHostService@resume: {}
+  DockerHostService@pushManagerConfiguration: {}
+  DockerHostService@pollManagerConfiguration: {}
+  DockerHostService@managerConfiguration: {}
+  DockerHostService@managerOperation: {}
+  DockerHostService@updateConfigurationFromPolicy: {}
+  DockerHostService@runHealthTests: {}
+  DockerHostService@updateDeploymentStatus: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateDeploymentStatus:
-    errorCode: updateDeploymentStatus-FAILED-5001W
+  REQUEST-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateDeploymentStatus:
-    errorCode: REMOTE-updateDeploymentStatus-FAILED-5001W
+  REMOTE-CALL-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/GuiClientApi.yaml
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManager.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManager.java
index 3bdb693..e76ee79 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManager.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManager.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.docker.host.servers.manager;
 
 
 
+
 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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -72,9 +79,9 @@ import org.openecomp.dcae.controller.service.docker.host.manager.impl.DockerHost
 
 
 
-public class DcaeDockerHostManager extends DockerHostManagerImpl {
+public class DcaeDockerHostManager extends DockerHostManagerImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeDockerHostManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeDockerHostManagerProvider controller;
 	ISiriusServer server;
 
@@ -89,9 +96,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateContainerConfiguration", ApiRequestStatus.START, duration_,name,o,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.updateContainerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_updateContainerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_updateContainerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateContainerConfiguration(name,o,inputStreams,outputStreams);
 		}
@@ -100,8 +106,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateContainerConfiguration", ApiRequestStatus.ERROR, duration_,name,o,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.updateContainerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_updateContainerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_updateContainerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_updateContainerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -116,9 +124,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspendContainer", ApiRequestStatus.START, duration_,name);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.suspendContainer);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_suspendContainer,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_suspendContainer,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspendContainer(name);
 		}
@@ -127,8 +134,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspendContainer", ApiRequestStatus.ERROR, duration_,name);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.suspendContainer, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_suspendContainer, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_suspendContainer,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_suspendContainer, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,9 +152,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resumeContainer", ApiRequestStatus.START, duration_,name);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.resumeContainer);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_resumeContainer,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_resumeContainer,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resumeContainer(name);
 		}
@@ -154,8 +162,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resumeContainer", ApiRequestStatus.ERROR, duration_,name);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.resumeContainer, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_resumeContainer, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_resumeContainer,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_resumeContainer, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -170,9 +180,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "testContainer", ApiRequestStatus.START, duration_,name);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.testContainer);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_testContainer,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_testContainer,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.testContainer(name);
 		}
@@ -181,8 +190,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "testContainer", ApiRequestStatus.ERROR, duration_,name);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.testContainer, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_testContainer, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_testContainer,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_testContainer, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -197,9 +208,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "setupConfiguration", ApiRequestStatus.START, duration_,service,instance);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.setupConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_setupConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_setupConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.setupConfiguration(service,instance);
 		}
@@ -208,8 +218,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "setupConfiguration", ApiRequestStatus.ERROR, duration_,service,instance);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.setupConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_setupConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_setupConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_setupConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -224,9 +236,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.test);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_test,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -235,8 +246,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.test, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -251,9 +264,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.suspend);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -262,8 +274,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.suspend, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -278,9 +292,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.resume);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -289,8 +302,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.resume, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -305,9 +320,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.publicKey);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -316,8 +330,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.publicKey, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -332,9 +348,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.configurationChanged);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -343,8 +358,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.configurationChanged, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -359,9 +376,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.updateStreams);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -370,8 +386,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.updateStreams, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -386,9 +404,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.logs);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_logs,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_logs,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.logs(cx,logs);
 		}
@@ -397,8 +414,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.logs, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_logs, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_logs, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -413,9 +432,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.metrics);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_metrics,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_metrics,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.metrics(cx,metrics);
 		}
@@ -424,8 +442,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.metrics, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_metrics, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_metrics, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -440,9 +460,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.properties);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_properties,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_properties,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.properties(cx,l);
 		}
@@ -451,8 +470,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.properties, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_properties, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_properties, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -467,9 +488,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.uploadInfo);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_uploadInfo,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_uploadInfo,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.uploadInfo(cx,info);
 		}
@@ -478,8 +498,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.uploadInfo, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -494,9 +516,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		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(DockerHostManagerOperationEnum.getValues);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_getValues,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getValues,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValues(cx,path,start,end,option,relativeInterval);
 		}
@@ -505,8 +526,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			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(DockerHostManagerMessageEnum.getValues, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_getValues, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_getValues, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -521,9 +544,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		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(DockerHostManagerOperationEnum.getValuesAll);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_getValuesAll,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getValuesAll,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval);
 		}
@@ -532,8 +554,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			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(DockerHostManagerMessageEnum.getValuesAll, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -548,9 +572,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.getMessages);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_getMessages,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getMessages,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getMessages(cx,path,start,end);
 		}
@@ -559,8 +582,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.getMessages, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_getMessages, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -575,9 +600,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.getRequestLogger);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_getRequestLogger,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getRequestLogger,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getRequestLogger(userName,action,resourcePath,context);
 		}
@@ -586,8 +610,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.getRequestLogger, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -602,9 +628,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.evaluate);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_evaluate,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_evaluate,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.evaluate(path,function);
 		}
@@ -613,8 +638,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.evaluate, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_evaluate, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -629,9 +656,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.update);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_update,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_update,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.update(path,function);
 		}
@@ -640,8 +666,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostManagerMessageEnum.update, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_update, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_update, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -655,10 +683,12 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeDockerHostManagerProvider.ecoreSetup();
 	}
-	public DcaeDockerHostManagerProvider getSomfProvider() {
+	public DcaeDockerHostManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerClient.java
index 34fd247..dddd49b 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 		DcaeDockerHostManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeDockerHostManagerClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeDockerHostManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void updateContainerConfiguration(java.lang.String name, org.eclipse.emf.ecore.EObject o, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_updateContainerConfiguration);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_updateContainerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateContainerConfiguration", null, name,o,inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_updateContainerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateContainerConfiguration: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateContainerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateContainerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateContainerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void suspendContainer(java.lang.String name) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_suspendContainer);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_suspendContainer,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspendContainer", null, name);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_suspendContainer, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspendContainer: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspendContainer, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspendContainer,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspendContainer,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void resumeContainer(java.lang.String name) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_resumeContainer);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_resumeContainer,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resumeContainer", null, name);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_resumeContainer, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resumeContainer: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resumeContainer, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resumeContainer,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resumeContainer,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse testContainer(java.lang.String name) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_testContainer);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_testContainer,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "testContainer", null, name);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_testContainer, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@testContainer: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_testContainer, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_testContainer,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_testContainer,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void setupConfiguration(java.lang.String service, java.lang.String instance) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_setupConfiguration);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_setupConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "setupConfiguration", null, service,instance);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_setupConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@setupConfiguration: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_setupConfiguration, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_setupConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_setupConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_test);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -173,16 +184,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void suspend() {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_suspend);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void resume() {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_resume);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -207,16 +220,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_publicKey);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@publicKey: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void configurationChanged() {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@configurationChanged: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateStreams: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -258,16 +274,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_logs);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_logs,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_logs, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@logs: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -275,16 +292,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_metrics);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_metrics,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_metrics, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@metrics: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -292,16 +310,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_properties);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_properties,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_properties, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@properties: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -309,16 +328,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_uploadInfo);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_uploadInfo,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_uploadInfo, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@uploadInfo: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -326,16 +346,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_getValues);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getValues,client.getRemote());
 		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(DockerHostManagerMessageEnum.REMOTE_getValues, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getValues: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -343,16 +364,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_getValuesAll);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getValuesAll,client.getRemote());
 		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(DockerHostManagerMessageEnum.REMOTE_getValuesAll, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getValuesAll: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -360,16 +382,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_getMessages);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getMessages,client.getRemote());
 		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(DockerHostManagerMessageEnum.REMOTE_getMessages, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getMessages: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -377,16 +400,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_getRequestLogger);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getRequestLogger,client.getRemote());
 		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(DockerHostManagerMessageEnum.REMOTE_getRequestLogger, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getRequestLogger: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -394,16 +418,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_evaluate);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_evaluate,client.getRemote());
 		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(DockerHostManagerMessageEnum.REMOTE_evaluate, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@evaluate: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -411,16 +436,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl {
 
 	@Override
 	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_update);
+		EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); 
+		ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_update,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "update", null, path,function);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_update, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@update: " + e);
+			ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_update, e.toString());
+			EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerServer.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerServer.java
index 8bd963b..dc19ac8 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerServer.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.docker.host.servers.manager;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.docker.host.manager.DockerHostManager;
@@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.docker.host.servers.manager.gui.Dca
 
 
 
-public class DcaeDockerHostManagerServer implements ISiriusServer {
+public class DcaeDockerHostManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeDockerHostManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -69,6 +68,7 @@ public class DcaeDockerHostManagerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "DockerHostManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
     
 		server.addFactory(new org.openecomp.ncomp.servers.docker.DockerDockerFactory(this));
@@ -84,6 +84,7 @@ public class DcaeDockerHostManagerServer implements ISiriusServer {
         controller = (DcaeDockerHostManager) server.find("/").o;
         webServer = new Jetty8Server("manager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -112,4 +113,17 @@ public class DcaeDockerHostManagerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApi.java
index 9b99753..dd18103 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApi.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApi.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.docker.host.servers.manager.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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -84,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -101,9 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -112,8 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -128,9 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -139,8 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -155,9 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -166,8 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -182,9 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -193,8 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -209,9 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -220,8 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -236,9 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -247,8 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -262,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApiClient.java
index 0ce3ec5..46eaebe 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApiClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApiClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeDockerHostManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiMessageEnum.java
index 64b8fa9..dd60420 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.docker.host.servers.manager.gui.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.docker.host.servers.manager.gui.logging.GuiClientApi");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiOperationEnum.java
index 6bf7447..0813615 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.docker.host.servers.manager.gui.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum GuiClientApiOperationEnum implements EcompOperationEnum {
 
-  getTree,
-  getObject,
-  getTimeSerie,
-  getTable,
-  getHtml,
-  getGraph,
-  REMOTE_getTree,
-  REMOTE_getObject,
-  REMOTE_getTimeSerie,
-  REMOTE_getTable,
-  REMOTE_getHtml,
-  REMOTE_getGraph;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager.properties b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager.properties
index 8c5a5fa..e2ab9a1 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager.properties
@@ -1,258 +1,258 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-logs=\
-  logs-FAILED-5001W|\
+REQUEST_FAILED_logs=\
+  REQUEST-FAILED-logs-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-metrics=\
-  metrics-FAILED-5001W|\
+REQUEST_FAILED_metrics=\
+  REQUEST-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-properties=\
-  properties-FAILED-5001W|\
+REQUEST_FAILED_properties=\
+  REQUEST-FAILED-properties-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-uploadInfo=\
-  uploadInfo-FAILED-5001W|\
+REQUEST_FAILED_uploadInfo=\
+  REQUEST-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValues=\
-  getValues-FAILED-5001W|\
+REQUEST_FAILED_getValues=\
+  REQUEST-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValuesAll=\
-  getValuesAll-FAILED-5001W|\
+REQUEST_FAILED_getValuesAll=\
+  REQUEST-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getMessages=\
-  getMessages-FAILED-5001W|\
+REQUEST_FAILED_getMessages=\
+  REQUEST-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getRequestLogger=\
-  getRequestLogger-FAILED-5001W|\
+REQUEST_FAILED_getRequestLogger=\
+  REQUEST-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-evaluate=\
-  evaluate-FAILED-5001W|\
+REQUEST_FAILED_evaluate=\
+  REQUEST-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-update=\
-  update-FAILED-5001W|\
+REQUEST_FAILED_update=\
+  REQUEST-FAILED-update-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateContainerConfiguration=\
-  updateContainerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_updateContainerConfiguration=\
+  REQUEST-FAILED-updateContainerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspendContainer=\
-  suspendContainer-FAILED-5001W|\
+REQUEST_FAILED_suspendContainer=\
+  REQUEST-FAILED-suspendContainer-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resumeContainer=\
-  resumeContainer-FAILED-5001W|\
+REQUEST_FAILED_resumeContainer=\
+  REQUEST-FAILED-resumeContainer-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-testContainer=\
-  testContainer-FAILED-5001W|\
+REQUEST_FAILED_testContainer=\
+  REQUEST-FAILED-testContainer-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-setupConfiguration=\
-  setupConfiguration-FAILED-5001W|\
+REQUEST_FAILED_setupConfiguration=\
+  REQUEST-FAILED-setupConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_logs=\
-  REMOTE-logs-FAILED-5001W|\
+REMOTE_CALL_FAILED_logs=\
+  REMOTE-CALL-FAILED-logs-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_metrics=\
-  REMOTE-metrics-FAILED-5001W|\
+REMOTE_CALL_FAILED_metrics=\
+  REMOTE-CALL-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_properties=\
-  REMOTE-properties-FAILED-5001W|\
+REMOTE_CALL_FAILED_properties=\
+  REMOTE-CALL-FAILED-properties-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_uploadInfo=\
-  REMOTE-uploadInfo-FAILED-5001W|\
+REMOTE_CALL_FAILED_uploadInfo=\
+  REMOTE-CALL-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValues=\
-  REMOTE-getValues-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValues=\
+  REMOTE-CALL-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValuesAll=\
-  REMOTE-getValuesAll-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValuesAll=\
+  REMOTE-CALL-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getMessages=\
-  REMOTE-getMessages-FAILED-5001W|\
+REMOTE_CALL_FAILED_getMessages=\
+  REMOTE-CALL-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getRequestLogger=\
-  REMOTE-getRequestLogger-FAILED-5001W|\
+REMOTE_CALL_FAILED_getRequestLogger=\
+  REMOTE-CALL-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_evaluate=\
-  REMOTE-evaluate-FAILED-5001W|\
+REMOTE_CALL_FAILED_evaluate=\
+  REMOTE-CALL-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_update=\
-  REMOTE-update-FAILED-5001W|\
+REMOTE_CALL_FAILED_update=\
+  REMOTE-CALL-FAILED-update-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateContainerConfiguration=\
-  REMOTE-updateContainerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateContainerConfiguration=\
+  REMOTE-CALL-FAILED-updateContainerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspendContainer=\
-  REMOTE-suspendContainer-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspendContainer=\
+  REMOTE-CALL-FAILED-suspendContainer-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resumeContainer=\
-  REMOTE-resumeContainer-FAILED-5001W|\
+REMOTE_CALL_FAILED_resumeContainer=\
+  REMOTE-CALL-FAILED-resumeContainer-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_testContainer=\
-  REMOTE-testContainer-FAILED-5001W|\
+REMOTE_CALL_FAILED_testContainer=\
+  REMOTE-CALL-FAILED-testContainer-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_setupConfiguration=\
-  REMOTE-setupConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_setupConfiguration=\
+  REMOTE-CALL-FAILED-setupConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerMessageEnum.java
index 3d6fd36..addc911 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.docker.host.servers.manager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,50 +7,50 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum DockerHostManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  updateContainerConfiguration,
-  suspendContainer,
-  resumeContainer,
-  testContainer,
-  setupConfiguration,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update,
-  REMOTE_updateContainerConfiguration,
-  REMOTE_suspendContainer,
-  REMOTE_resumeContainer,
-  REMOTE_testContainer,
-  REMOTE_setupConfiguration;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REQUEST_FAILED_logs,
+  REQUEST_FAILED_metrics,
+  REQUEST_FAILED_properties,
+  REQUEST_FAILED_uploadInfo,
+  REQUEST_FAILED_getValues,
+  REQUEST_FAILED_getValuesAll,
+  REQUEST_FAILED_getMessages,
+  REQUEST_FAILED_getRequestLogger,
+  REQUEST_FAILED_evaluate,
+  REQUEST_FAILED_update,
+  REQUEST_FAILED_updateContainerConfiguration,
+  REQUEST_FAILED_suspendContainer,
+  REQUEST_FAILED_resumeContainer,
+  REQUEST_FAILED_testContainer,
+  REQUEST_FAILED_setupConfiguration,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_logs,
+  REMOTE_CALL_FAILED_metrics,
+  REMOTE_CALL_FAILED_properties,
+  REMOTE_CALL_FAILED_uploadInfo,
+  REMOTE_CALL_FAILED_getValues,
+  REMOTE_CALL_FAILED_getValuesAll,
+  REMOTE_CALL_FAILED_getMessages,
+  REMOTE_CALL_FAILED_getRequestLogger,
+  REMOTE_CALL_FAILED_evaluate,
+  REMOTE_CALL_FAILED_update,
+  REMOTE_CALL_FAILED_updateContainerConfiguration,
+  REMOTE_CALL_FAILED_suspendContainer,
+  REMOTE_CALL_FAILED_resumeContainer,
+  REMOTE_CALL_FAILED_testContainer,
+  REMOTE_CALL_FAILED_setupConfiguration;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.docker.host.servers.manager.logging.DockerHostManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerOperationEnum.java
index 5f78870..8413539 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerOperationEnum.java
@@ -1,71 +1,42 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.docker.host.servers.manager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum DockerHostManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  updateContainerConfiguration,
-  suspendContainer,
-  resumeContainer,
-  testContainer,
-  setupConfiguration,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update,
-  REMOTE_updateContainerConfiguration,
-  REMOTE_suspendContainer,
-  REMOTE_resumeContainer,
-  REMOTE_testContainer,
-  REMOTE_setupConfiguration;
+  DockerHostManager_test("DockerHostManager@test"),
+  DockerHostManager_suspend("DockerHostManager@suspend"),
+  DockerHostManager_resume("DockerHostManager@resume"),
+  DockerHostManager_publicKey("DockerHostManager@publicKey"),
+  DockerHostManager_configurationChanged("DockerHostManager@configurationChanged"),
+  DockerHostManager_updateStreams("DockerHostManager@updateStreams"),
+  DockerHostManager_logs("DockerHostManager@logs"),
+  DockerHostManager_metrics("DockerHostManager@metrics"),
+  DockerHostManager_properties("DockerHostManager@properties"),
+  DockerHostManager_uploadInfo("DockerHostManager@uploadInfo"),
+  DockerHostManager_getValues("DockerHostManager@getValues"),
+  DockerHostManager_getValuesAll("DockerHostManager@getValuesAll"),
+  DockerHostManager_getMessages("DockerHostManager@getMessages"),
+  DockerHostManager_getRequestLogger("DockerHostManager@getRequestLogger"),
+  DockerHostManager_evaluate("DockerHostManager@evaluate"),
+  DockerHostManager_update("DockerHostManager@update"),
+  DockerHostManager_updateContainerConfiguration("DockerHostManager@updateContainerConfiguration"),
+  DockerHostManager_suspendContainer("DockerHostManager@suspendContainer"),
+  DockerHostManager_resumeContainer("DockerHostManager@resumeContainer"),
+  DockerHostManager_testContainer("DockerHostManager@testContainer"),
+  DockerHostManager_setupConfiguration("DockerHostManager@setupConfiguration") ; 
+
+
+	private String n;
+	
+	private DockerHostManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostService.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostService.java
index f1faaf4..7de0097 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostService.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostService.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.docker.host.servers.service;
 
 
 
+
 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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -54,9 +61,9 @@ import org.openecomp.dcae.controller.service.docker.host.service.impl.DockerHost
 
 
 
-public class DcaeDockerHostService extends DockerHostServiceImpl implements ISiriusPlugin {
+public class DcaeDockerHostService extends DockerHostServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeDockerHostService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeDockerHostServiceProvider controller;
 	ISiriusServer server;
 
@@ -71,9 +78,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.deploy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -82,8 +88,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.deploy, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -98,9 +106,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.undeploy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -109,8 +116,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.undeploy, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -125,9 +134,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.test);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_test,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -136,8 +144,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.test, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -152,9 +162,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.suspend);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -163,8 +172,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.suspend, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -179,9 +190,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.resume);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_resume,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -190,8 +200,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.resume, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -206,9 +218,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.pushManagerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -217,8 +228,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.pushManagerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -233,9 +246,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.pollManagerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -244,8 +256,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.pollManagerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -260,9 +274,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.managerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -271,8 +284,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.managerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -287,9 +302,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.managerOperation);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -298,8 +312,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.managerOperation, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -314,9 +330,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.updateConfigurationFromPolicy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -325,8 +340,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.updateConfigurationFromPolicy, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -341,9 +358,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.runHealthTests);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -352,8 +368,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.runHealthTests, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -368,9 +386,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.updateDeploymentStatus);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_updateDeploymentStatus,server,this);
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_updateDeploymentStatus,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateDeploymentStatus();
 		}
@@ -379,8 +396,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(DockerHostServiceMessageEnum.updateDeploymentStatus, e.toString());
-			throw e;
+			ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 =  EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -394,6 +413,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -402,7 +423,7 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir
 	public static void ecoreSetup() {
 		DcaeDockerHostServiceProvider.ecoreSetup();
 	}
-	public DcaeDockerHostServiceProvider getSomfProvider() {
+	public DcaeDockerHostServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceClient.java
index 74caf0f..a8684e9 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceClient.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 		DcaeDockerHostService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeDockerHostServiceClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeDockerHostServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_deploy);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@deploy: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_undeploy);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeploy: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_test);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -122,16 +130,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_suspend);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -139,16 +148,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_resume);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pushManagerConfiguration: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pollManagerConfiguration: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerConfiguration: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -207,16 +220,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerOperation: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateConfigurationFromPolicy: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public void runHealthTests() {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@runHealthTests: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -258,16 +274,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl {
 
 	@Override
 	public void updateDeploymentStatus() {
-		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_updateDeploymentStatus);
+		EClass c = ServicePackage.eINSTANCE.getDockerHostService(); 
+		ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_updateDeploymentStatus,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateDeploymentStatus", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_updateDeploymentStatus, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateDeploymentStatus: " + e);
+			ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceServer.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceServer.java
index 74e8d0d..d62ca44 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceServer.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.docker.host.servers.service;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.docker.host.service.DockerHostService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.docker.host.service.DockerHostServi
 
 
 
-public class DcaeDockerHostServiceServer implements ISiriusServer {
+public class DcaeDockerHostServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeDockerHostServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeDockerHostServiceServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "DockerHostService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
         server.addRuntimeFactories(this);
@@ -73,6 +73,7 @@ public class DcaeDockerHostServiceServer implements ISiriusServer {
         controller = (DcaeDockerHostService) server.find("/").o;
         webServer = new Jetty8Server("service.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -95,4 +96,17 @@ public class DcaeDockerHostServiceServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService.properties b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService.properties
index d32cf07..1218d2a 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService.properties
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService.properties
@@ -1,150 +1,150 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateDeploymentStatus=\
-  updateDeploymentStatus-FAILED-5001W|\
+REQUEST_FAILED_updateDeploymentStatus=\
+  REQUEST-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateDeploymentStatus=\
-  REMOTE-updateDeploymentStatus-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateDeploymentStatus=\
+  REMOTE-CALL-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceMessageEnum.java
index 1987966..f75f4db 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceMessageEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.docker.host.servers.service.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,32 +7,32 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum DockerHostServiceMessageEnum 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;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REQUEST_FAILED_updateDeploymentStatus,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_updateDeploymentStatus;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.docker.host.servers.service.logging.DockerHostService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService");
 	}
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceOperationEnum.java
index 1efe437..b3c4d7f 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceOperationEnum.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceOperationEnum.java
@@ -1,53 +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.service.docker.host.servers.service.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum DockerHostServiceOperationEnum 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;
+  DockerHostService_deploy("DockerHostService@deploy"),
+  DockerHostService_undeploy("DockerHostService@undeploy"),
+  DockerHostService_test("DockerHostService@test"),
+  DockerHostService_suspend("DockerHostService@suspend"),
+  DockerHostService_resume("DockerHostService@resume"),
+  DockerHostService_pushManagerConfiguration("DockerHostService@pushManagerConfiguration"),
+  DockerHostService_pollManagerConfiguration("DockerHostService@pollManagerConfiguration"),
+  DockerHostService_managerConfiguration("DockerHostService@managerConfiguration"),
+  DockerHostService_managerOperation("DockerHostService@managerOperation"),
+  DockerHostService_updateConfigurationFromPolicy("DockerHostService@updateConfigurationFromPolicy"),
+  DockerHostService_runHealthTests("DockerHostService@runHealthTests"),
+  DockerHostService_updateDeploymentStatus("DockerHostService@updateDeploymentStatus") ; 
+
+
+	private String n;
+	
+	private DockerHostServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.classpath b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.classpath
index 69b19c6..94452b8 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.classpath
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.classpath
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/xcore">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/xcore-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/xcore-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.project b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.project
index e7bb1ca..e91fd88 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.project
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.settings/org.eclipse.core.resources.prefs b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..447ff97
--- /dev/null
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/xcore=UTF-8
+encoding//src/main/xcore-gen=UTF-8
+encoding/<project>=UTF-8
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..ec4300d 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.settings/org.eclipse.jdt.core.prefs
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/META-INF/MANIFEST.MF b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/META-INF/MANIFEST.MF
index 53dbb83..959a247 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/META-INF/MANIFEST.MF
@@ -16,15 +16,5 @@ Export-Package: org.openecomp.dcae.controller.service.docker.host.manager,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.ecore.xcore.lib,
- dcae-controller-core-model;visibility:=reexport,
- dcae-controller-service-docker-host-model;visibility:=reexport,
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-openstack-model;visibility:=reexport,
- ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- dcae-controller-service-vm-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-sirius-manager-agent-model;visibility:=reexport,
- ncomp-docker-model;bundle-version="0.1.0";visibility:=reexport
+ org.eclipse.emf.ecore.xcore.lib
 Bundle-ActivationPolicy: lazy
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/ManagerPackage.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/ManagerPackage.java
index 0c86891..9c41075 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/ManagerPackage.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/ManagerPackage.java
@@ -40,6 +40,24 @@ import org.eclipse.emf.ecore.EPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.docker.host.manager.ManagerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-docker-host-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.docker.host'"
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/impl/DockerHostManagerImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/impl/DockerHostManagerImpl.java
index 1d2bb16..fe5c2b1 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/impl/DockerHostManagerImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/impl/DockerHostManagerImpl.java
@@ -46,10 +46,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.host.manager.impl.DockerHostManagerImpl#getDockerHost <em>Docker Host</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/util/ManagerSwitch.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/util/ManagerSwitch.java
index ecd7d03..315f615 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/util/ManagerSwitch.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/manager/util/ManagerSwitch.java
@@ -76,7 +76,7 @@ public class ManagerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/DockerConfiguration.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/DockerConfiguration.java
index 34098d8..8d18f2d 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/DockerConfiguration.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/DockerConfiguration.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.host.service.DockerConfiguration#getDockerHost <em>Docker Host</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.docker.host.service.ServicePackage#getDockerConfiguration()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/ServicePackage.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/ServicePackage.java
index aa3729d..841143a 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/ServicePackage.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/ServicePackage.java
@@ -40,6 +40,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.docker.host.service.ServiceFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-docker-host-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.docker.host'"
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerConfigurationImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerConfigurationImpl.java
index fea3eb2..13d931c 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerConfigurationImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerConfigurationImpl.java
@@ -43,10 +43,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.host.service.impl.DockerConfigurationImpl#getDockerHost <em>Docker Host</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerHostServiceImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerHostServiceImpl.java
index 0b42225..5c94793 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerHostServiceImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerHostServiceImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Docker Host Service</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerHostServiceInstanceImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerHostServiceInstanceImpl.java
index c3d0853..b24a780 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerHostServiceInstanceImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/DockerHostServiceInstanceImpl.java
@@ -45,10 +45,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.host.service.impl.DockerHostServiceInstanceImpl#getDockerHost <em>Docker Host</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/ServicePackageImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/ServicePackageImpl.java
index 20c8469..5966373 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/ServicePackageImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/impl/ServicePackageImpl.java
@@ -251,7 +251,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 		// http://www.eclipse.org/emf/2011/Xcore
 		createXcoreAnnotations();
 		// http://openecomp.org
-		createEcompAnnotations();
+		createOpenecompAnnotations();
 	}
 
 	/**
@@ -276,7 +276,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void createEcompAnnotations() {
+	protected void createOpenecompAnnotations() {
 		String source = "http://openecomp.org";	
 		addAnnotation
 		  (getDockerConfiguration_DockerHost(), 
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/util/ServiceSwitch.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/util/ServiceSwitch.java
index 8788e0e..74b7692 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/util/ServiceSwitch.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/host/service/util/ServiceSwitch.java
@@ -77,7 +77,7 @@ public class ServiceSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/.classpath b/dcae-controller-service-docker/dcae-controller-service-docker-model/.classpath
index 69b19c6..ed6d9f7 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/.classpath
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/.classpath
@@ -1,17 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/xcore">
+	<classpathentry kind="src" output="target/classes" path="src/main/xcore-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/xcore-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/.project b/dcae-controller-service-docker/dcae-controller-service-docker-model/.project
index d0956da..34d8760 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/.project
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/.settings/org.eclipse.core.resources.prefs b/dcae-controller-service-docker/dcae-controller-service-docker-model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..447ff97
--- /dev/null
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/xcore=UTF-8
+encoding//src/main/xcore-gen=UTF-8
+encoding/<project>=UTF-8
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-service-docker/dcae-controller-service-docker-model/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..ec4300d 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/.settings/org.eclipse.jdt.core.prefs
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,5 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/META-INF/MANIFEST.MF b/dcae-controller-service-docker/dcae-controller-service-docker-model/META-INF/MANIFEST.MF
index b7ce9fb..710045b 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/META-INF/MANIFEST.MF
@@ -16,16 +16,5 @@ Export-Package: org.openecomp.dcae.controller.service.dockermanager,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.ecore.xcore.lib,
- dcae-controller-core-model;visibility:=reexport,
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-openstack-model;visibility:=reexport,
- ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- ncomp-sirius-manager-agent-model;visibility:=reexport,
- ncomp-docker-model;bundle-version="0.1.0";visibility:=reexport,
- dcae-controller-service-vm-model;bundle-version="0.1.0";visibility:=reexport,
- dcae-controller-service-docker-model;visibility:=reexport,
- dcae-controller-service-docker-host-model;visibility:=reexport
+ org.eclipse.emf.ecore.xcore.lib
 Bundle-ActivationPolicy: lazy
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerConfiguration.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerConfiguration.java
index bbf2a17..3588385 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerConfiguration.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerConfiguration.java
@@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerConfiguration#getConfiguration <em>Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.docker.DockerPackage#getDockerConfiguration()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerPackage.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerPackage.java
index cf53fe1..0768d7f 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerPackage.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerPackage.java
@@ -41,6 +41,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.docker.DockerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-docker-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service'"
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerService.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerService.java
index fd57ae7..f1f5c27 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerService.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerService.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerService#getInstances <em>Instances</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.docker.DockerPackage#getDockerService()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerServiceDescriptor.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerServiceDescriptor.java
index fc114e2..7a34fbb 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerServiceDescriptor.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerServiceDescriptor.java
@@ -32,6 +32,7 @@ import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerServiceDescriptor#getServicePackage <em>Service Package</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerServiceDescriptor#getServiceClass <em>Service Class</em>}</li>
@@ -41,7 +42,6 @@ import org.openecomp.dcae.controller.core.service.DcaeServiceDescriptor;
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerServiceDescriptor#getManagerUser <em>Manager User</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerServiceDescriptor#getEncryptedPassword <em>Encrypted Password</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.docker.DockerPackage#getDockerServiceDescriptor()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerServiceInstance.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerServiceInstance.java
index 0d9ecb9..3ef48d3 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerServiceInstance.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/DockerServiceInstance.java
@@ -36,6 +36,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerServiceInstance#getDockerHost <em>Docker Host</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerServiceInstance#getHostService <em>Host Service</em>}</li>
@@ -48,7 +49,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerServiceInstance#getPortBindings <em>Port Bindings</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.DockerServiceInstance#getManagerPortNumber <em>Manager Port Number</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.docker.DockerPackage#getDockerServiceInstance()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerConfigurationImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerConfigurationImpl.java
index dc9797b..14491b6 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerConfigurationImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerConfigurationImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerConfigurationImpl#getConfiguration <em>Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerPackageImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerPackageImpl.java
index 0d4f93e..d1dce12 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerPackageImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerPackageImpl.java
@@ -472,7 +472,7 @@ public class DockerPackageImpl extends EPackageImpl implements DockerPackage {
 		// http://www.eclipse.org/emf/2011/Xcore
 		createXcoreAnnotations();
 		// http://openecomp.org
-		createEcompAnnotations();
+		createOpenecompAnnotations();
 	}
 
 	/**
@@ -497,7 +497,7 @@ public class DockerPackageImpl extends EPackageImpl implements DockerPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void createEcompAnnotations() {
+	protected void createOpenecompAnnotations() {
 		String source = "http://openecomp.org";	
 		addAnnotation
 		  (getDockerServiceInstance_DockerHost(), 
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceDescriptorImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceDescriptorImpl.java
index ef3d9b3..694fa6a 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceDescriptorImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceDescriptorImpl.java
@@ -40,6 +40,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceDescriptorImpl#getServicePackage <em>Service Package</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceDescriptorImpl#getServiceClass <em>Service Class</em>}</li>
@@ -49,7 +50,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceDescriptorImpl#getManagerUser <em>Manager User</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceDescriptorImpl#getEncryptedPassword <em>Encrypted Password</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceImpl.java
index fb663d7..8f1a7d0 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceImpl.java
@@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceImpl#getInstances <em>Instances</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceInstanceImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceInstanceImpl.java
index ddf7377..791e66d 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceInstanceImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/impl/DockerServiceInstanceImpl.java
@@ -47,6 +47,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceInstanceImpl#getDockerHost <em>Docker Host</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceInstanceImpl#getHostService <em>Host Service</em>}</li>
@@ -59,7 +60,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceInstanceImpl#getPortBindings <em>Port Bindings</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.docker.impl.DockerServiceInstanceImpl#getManagerPortNumber <em>Manager Port Number</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/util/DockerSwitch.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/util/DockerSwitch.java
index d712bfc..148a347 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/util/DockerSwitch.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/docker/util/DockerSwitch.java
@@ -74,7 +74,7 @@ public class DockerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/DockerManager.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/DockerManager.java
index 99ba892..84cd75c 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/DockerManager.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/DockerManager.java
@@ -33,10 +33,10 @@ import org.openecomp.dcae.controller.service.docker.DockerConfiguration;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.dockermanager.DockerManager#getConfiguration <em>Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.dockermanager.DockermanagerPackage#getDockerManager()
  * @model
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/DockermanagerPackage.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/DockermanagerPackage.java
index a2292a8..4613cf3 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/DockermanagerPackage.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/DockermanagerPackage.java
@@ -41,6 +41,24 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.dockermanager.DockermanagerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-docker-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service'"
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/impl/DockerManagerImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/impl/DockerManagerImpl.java
index 281b7a5..d381b98 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/impl/DockerManagerImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/impl/DockerManagerImpl.java
@@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.dockermanager.impl.DockerManagerImpl#getConfiguration <em>Configuration</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/impl/DockermanagerPackageImpl.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/impl/DockermanagerPackageImpl.java
index 462f627..c3ea51b 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/impl/DockermanagerPackageImpl.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/impl/DockermanagerPackageImpl.java
@@ -94,8 +94,8 @@ public class DockermanagerPackageImpl extends EPackageImpl implements Dockermana
 		isInited = true;
 
 		// Initialize simple dependencies
-		DockerPackage.eINSTANCE.eClass();
 		ManagerPackage.eINSTANCE.eClass();
+		DockerPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theDockermanagerPackage.createPackageContents();
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/util/DockermanagerSwitch.java b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/util/DockermanagerSwitch.java
index f87a202..b03375b 100644
--- a/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/util/DockermanagerSwitch.java
+++ b/dcae-controller-service-docker/dcae-controller-service-docker-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dockermanager/util/DockermanagerSwitch.java
@@ -70,7 +70,7 @@ public class DockermanagerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/.classpath b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/.classpath
index d2d34b3..89273c0 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/.classpath
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/.classpath
@@ -21,7 +21,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/META-INF/MANIFEST.MF b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/META-INF/MANIFEST.MF
index 95af390..b973652 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/META-INF/MANIFEST.MF
@@ -5,10 +5,4 @@ Bundle-SymbolicName: dcae-controller-service-common-vm-manager
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.common.vm.manager.tools,
   org.openecomp.dcae.controller.service.common.vm.servers.manager
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-common-vm-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0"
+
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/assembly/assemble_zip.xml b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/assembly/assemble_zip.xml
index a6503d1..98d4d5a 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/assembly/assemble_zip.xml
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/assembly/assemble_zip.xml
@@ -56,6 +56,10 @@
 			<directory>src/main/server/scripts</directory>
 			<outputDirectory>scripts</outputDirectory>
 		</fileSet>
+		<fileSet>
+			<directory>src/assembly/swm</directory>
+			<outputDirectory>swm</outputDirectory>
+		</fileSet>
 	</fileSets>
 
 </assembly>
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/manager/tools/Generator.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/manager/tools/Generator.java
index 770d847..cc42234 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/manager/tools/Generator.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/manager/tools/Generator.java
@@ -53,12 +53,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCommonVmManager");

 		m.setTitle("ControllerServiceCommonVmManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(false);

 		g.addFactory(ServiceFactory.eINSTANCE);

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

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceCommonVmService");

 		m.setTitle("ControllerServiceCommonVmService");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(true);

 		g.addFactory(ServiceFactory.eINSTANCE);

diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerProvider.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerProvider.java
index 66aca85..173e1de 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerProvider.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerProvider.java
@@ -76,16 +76,15 @@ public class DcaeCommonVmManagerProvider extends DcaeVirtualMachineManagerProvid
 		String s = run(o.getScript() + " test", o.getTestTimeout());
 		String a[] = s.split(":");
 		int index = s.indexOf(":");
-		String msg = index < 0 ? null : s.substring(index).trim();
-		String status = a[0].trim();
+		String msg = index < 0 ? null : s.substring(index);
 		HealthTestResponse res = ServiceFactory.eINSTANCE.createHealthTestResponse();
-		if ("GREEN".equalsIgnoreCase(status)) {
+		if ("GREEN".equalsIgnoreCase(a[0])) {
 			res.setStatus(HealthTestStatus.GREEN);
 			res.setMessageCode(msg);
-		} else if ("YELLOW".equalsIgnoreCase(status)) {
+		} else if ("YELLOW".equalsIgnoreCase(a[0])) {
 			res.setStatus(HealthTestStatus.YELLOW);
 			res.setMessageCode(msg);
-		} else if ("RED".equalsIgnoreCase(status)) {
+		} else if ("RED".equalsIgnoreCase(a[0])) {
 			res.setStatus(HealthTestStatus.RED);
 			res.setMessageCode(msg);
 		} else {
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceProvider.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceProvider.java
index 3d02bfd..99d207d 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceProvider.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/java/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceProvider.java
@@ -53,7 +53,7 @@ public class DcaeCommonVmServiceProvider extends DcaeVirtualMachineServiceProvid
 	}
 
 	@Override
-	protected EObject convertToManagerConfiguration(VirtualMachineServiceInstance i) {
+	public EObject convertToManagerConfiguration(VirtualMachineServiceInstance i) {
 		CommonVmServiceInstance i1 = (CommonVmServiceInstance) i;
 		CommonVmServiceInstance c = ServiceFactory.eINSTANCE.createCommonVmServiceInstance();
 		c.setScript(i1.getScript());
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/CommonVmManager.yaml b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/CommonVmManager.yaml
index 63cb773..55b451f 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/CommonVmManager.yaml
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/CommonVmManager.yaml
@@ -1,179 +1,147 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  logs: {}
-  metrics: {}
-  properties: {}
-  uploadInfo: {}
-  getValues: {}
-  getValuesAll: {}
-  getMessages: {}
-  getRequestLogger: {}
-  evaluate: {}
-  update: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
-  REMOTE_logs:
-    decription: Remote call logs
-  REMOTE_metrics:
-    decription: Remote call metrics
-  REMOTE_properties:
-    decription: Remote call properties
-  REMOTE_uploadInfo:
-    decription: Remote call uploadInfo
-  REMOTE_getValues:
-    decription: Remote call getValues
-  REMOTE_getValuesAll:
-    decription: Remote call getValuesAll
-  REMOTE_getMessages:
-    decription: Remote call getMessages
-  REMOTE_getRequestLogger:
-    decription: Remote call getRequestLogger
-  REMOTE_evaluate:
-    decription: Remote call evaluate
-  REMOTE_update:
-    decription: Remote call update
+  CommonVmManager@test: {}
+  CommonVmManager@suspend: {}
+  CommonVmManager@resume: {}
+  CommonVmManager@publicKey: {}
+  CommonVmManager@configurationChanged: {}
+  CommonVmManager@updateStreams: {}
+  CommonVmManager@logs: {}
+  CommonVmManager@metrics: {}
+  CommonVmManager@properties: {}
+  CommonVmManager@uploadInfo: {}
+  CommonVmManager@getValues: {}
+  CommonVmManager@getValuesAll: {}
+  CommonVmManager@getMessages: {}
+  CommonVmManager@getRequestLogger: {}
+  CommonVmManager@evaluate: {}
+  CommonVmManager@update: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  logs:
-    errorCode: logs-FAILED-5001W
+  REQUEST-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  metrics:
-    errorCode: metrics-FAILED-5001W
+  REQUEST-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  properties:
-    errorCode: properties-FAILED-5001W
+  REQUEST-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  uploadInfo:
-    errorCode: uploadInfo-FAILED-5001W
+  REQUEST-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValues:
-    errorCode: getValues-FAILED-5001W
+  REQUEST-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValuesAll:
-    errorCode: getValuesAll-FAILED-5001W
+  REQUEST-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getMessages:
-    errorCode: getMessages-FAILED-5001W
+  REQUEST-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getRequestLogger:
-    errorCode: getRequestLogger-FAILED-5001W
+  REQUEST-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  evaluate:
-    errorCode: evaluate-FAILED-5001W
+  REQUEST-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  update:
-    errorCode: update-FAILED-5001W
+  REQUEST-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_logs:
-    errorCode: REMOTE-logs-FAILED-5001W
+  REMOTE-CALL-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_metrics:
-    errorCode: REMOTE-metrics-FAILED-5001W
+  REMOTE-CALL-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_properties:
-    errorCode: REMOTE-properties-FAILED-5001W
+  REMOTE-CALL-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_uploadInfo:
-    errorCode: REMOTE-uploadInfo-FAILED-5001W
+  REMOTE-CALL-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValues:
-    errorCode: REMOTE-getValues-FAILED-5001W
+  REMOTE-CALL-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValuesAll:
-    errorCode: REMOTE-getValuesAll-FAILED-5001W
+  REMOTE-CALL-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getMessages:
-    errorCode: REMOTE-getMessages-FAILED-5001W
+  REMOTE-CALL-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getRequestLogger:
-    errorCode: REMOTE-getRequestLogger-FAILED-5001W
+  REMOTE-CALL-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_evaluate:
-    errorCode: REMOTE-evaluate-FAILED-5001W
+  REMOTE-CALL-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_update:
-    errorCode: REMOTE-update-FAILED-5001W
+  REMOTE-CALL-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/CommonVmService.yaml b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/CommonVmService.yaml
index 6ac8c34..80efba1 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/CommonVmService.yaml
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/CommonVmService.yaml
@@ -1,135 +1,111 @@
 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
+  CommonVmService@deploy: {}
+  CommonVmService@undeploy: {}
+  CommonVmService@test: {}
+  CommonVmService@suspend: {}
+  CommonVmService@resume: {}
+  CommonVmService@pushManagerConfiguration: {}
+  CommonVmService@pollManagerConfiguration: {}
+  CommonVmService@managerConfiguration: {}
+  CommonVmService@managerOperation: {}
+  CommonVmService@updateConfigurationFromPolicy: {}
+  CommonVmService@runHealthTests: {}
+  CommonVmService@updateDeploymentStatus: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateDeploymentStatus:
-    errorCode: updateDeploymentStatus-FAILED-5001W
+  REQUEST-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateDeploymentStatus:
-    errorCode: REMOTE-updateDeploymentStatus-FAILED-5001W
+  REMOTE-CALL-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/GuiClientApi.yaml
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManager.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManager.java
index dabe74e..81f80b5 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManager.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManager.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.common.vm.servers.manager;
 
 
 
+
 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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -72,9 +79,9 @@ import org.openecomp.dcae.controller.service.common.vm.manager.impl.CommonVmMana
 
 
 
-public class DcaeCommonVmManager extends CommonVmManagerImpl {
+public class DcaeCommonVmManager extends CommonVmManagerImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeCommonVmManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeCommonVmManagerProvider controller;
 	ISiriusServer server;
 
@@ -89,9 +96,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.test);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_test,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -100,8 +106,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.test, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -116,9 +124,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.suspend);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -127,8 +134,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.suspend, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,9 +152,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.resume);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -154,8 +162,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.resume, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -170,9 +180,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.publicKey);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -181,8 +190,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.publicKey, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -197,9 +208,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.configurationChanged);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -208,8 +218,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.configurationChanged, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -224,9 +236,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.updateStreams);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -235,8 +246,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.updateStreams, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -251,9 +264,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.logs);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_logs,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_logs,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.logs(cx,logs);
 		}
@@ -262,8 +274,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.logs, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_logs, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_logs, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -278,9 +292,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.metrics);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_metrics,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_metrics,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.metrics(cx,metrics);
 		}
@@ -289,8 +302,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.metrics, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_metrics, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_metrics, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -305,9 +320,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.properties);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_properties,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_properties,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.properties(cx,l);
 		}
@@ -316,8 +330,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.properties, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_properties, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_properties, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -332,9 +348,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.uploadInfo);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_uploadInfo,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_uploadInfo,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.uploadInfo(cx,info);
 		}
@@ -343,8 +358,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.uploadInfo, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -359,9 +376,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		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(CommonVmManagerOperationEnum.getValues);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_getValues,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_getValues,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValues(cx,path,start,end,option,relativeInterval);
 		}
@@ -370,8 +386,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			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(CommonVmManagerMessageEnum.getValues, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_getValues, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_getValues, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -386,9 +404,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		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(CommonVmManagerOperationEnum.getValuesAll);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_getValuesAll,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_getValuesAll,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval);
 		}
@@ -397,8 +414,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			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(CommonVmManagerMessageEnum.getValuesAll, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -413,9 +432,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.getMessages);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_getMessages,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_getMessages,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getMessages(cx,path,start,end);
 		}
@@ -424,8 +442,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.getMessages, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_getMessages, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -440,9 +460,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.getRequestLogger);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_getRequestLogger,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_getRequestLogger,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getRequestLogger(userName,action,resourcePath,context);
 		}
@@ -451,8 +470,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.getRequestLogger, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -467,9 +488,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.evaluate);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_evaluate,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_evaluate,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.evaluate(path,function);
 		}
@@ -478,8 +498,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.evaluate, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_evaluate, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -494,9 +516,8 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.update);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmManagerOperationEnum.CommonVmManager_update,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_update,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.update(path,function);
 		}
@@ -505,8 +526,10 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmManagerMessageEnum.update, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmManagerMessageEnum.REQUEST_FAILED_update, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmManagerMessageEnum.REQUEST_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmManagerMessageEnum.REQUEST_FAILED_update, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -520,10 +543,12 @@ public class DcaeCommonVmManager extends CommonVmManagerImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeCommonVmManagerProvider.ecoreSetup();
 	}
-	public DcaeCommonVmManagerProvider getSomfProvider() {
+	public DcaeCommonVmManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerClient.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerClient.java
index 57a8525..750b6aa 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerClient.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 		DcaeCommonVmManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeCommonVmManagerClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeCommonVmManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_test);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -88,16 +94,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void suspend() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_suspend);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void resume() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_resume);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_publicKey);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@publicKey: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void configurationChanged() {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@configurationChanged: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateStreams: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_logs);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_logs,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_logs, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@logs: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_metrics);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_metrics,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_metrics, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@metrics: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -207,16 +220,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_properties);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_properties,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_properties, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@properties: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -224,16 +238,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_uploadInfo);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_uploadInfo,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_uploadInfo, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@uploadInfo: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_getValues);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_getValues,client.getRemote());
 		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(CommonVmManagerMessageEnum.REMOTE_getValues, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getValues: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -258,16 +274,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_getValuesAll);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_getValuesAll,client.getRemote());
 		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(CommonVmManagerMessageEnum.REMOTE_getValuesAll, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getValuesAll: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -275,16 +292,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_getMessages);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_getMessages,client.getRemote());
 		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(CommonVmManagerMessageEnum.REMOTE_getMessages, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getMessages: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -292,16 +310,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_getRequestLogger);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_getRequestLogger,client.getRemote());
 		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(CommonVmManagerMessageEnum.REMOTE_getRequestLogger, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getRequestLogger: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -309,16 +328,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_evaluate);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_evaluate,client.getRemote());
 		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(CommonVmManagerMessageEnum.REMOTE_evaluate, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@evaluate: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -326,16 +346,17 @@ public class DcaeCommonVmManagerClient extends CommonVmManagerImpl {
 
 	@Override
 	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmManagerOperationEnum.REMOTE_update);
+		EClass c = ManagerPackage.eINSTANCE.getCommonVmManager(); 
+		ecomplogger.recordMetricEventStart(CommonVmManagerOperationEnum.CommonVmManager_update,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "update", null, path,function);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_update, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@update: " + e);
+			ecomplogger.warn(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_update, e.toString());
+			EcompException e1 = EcompException.create(CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmManagerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerServer.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerServer.java
index 639b301..08545d1 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerServer.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/DcaeCommonVmManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.common.vm.servers.manager;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.common.vm.manager.CommonVmManager;
@@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.common.vm.servers.manager.gui.DcaeM
 
 
 
-public class DcaeCommonVmManagerServer implements ISiriusServer {
+public class DcaeCommonVmManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeCommonVmManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -69,6 +68,7 @@ public class DcaeCommonVmManagerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "CommonVmManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
 		server.addFactory(org.openecomp.dcae.controller.service.common.vm.service.ServiceFactory.eINSTANCE);
@@ -81,6 +81,7 @@ public class DcaeCommonVmManagerServer implements ISiriusServer {
         controller = (DcaeCommonVmManager) server.find("/").o;
         webServer = new Jetty8Server("manager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -109,4 +110,17 @@ public class DcaeCommonVmManagerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/DcaeGuiClientApi.java
index d9da84b..27d606c 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/DcaeGuiClientApi.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/DcaeGuiClientApi.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.common.vm.servers.manager.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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -84,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -101,9 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -112,8 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -128,9 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -139,8 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -155,9 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -166,8 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -182,9 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -193,8 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -209,9 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -220,8 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -236,9 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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));
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -247,8 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			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.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -262,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/DcaeGuiClientApiClient.java
index 05d15d1..d3a8724 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/DcaeGuiClientApiClient.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/DcaeGuiClientApiClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeCommonVmManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		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.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApi.properties
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApiMessageEnum.java
index 26a6f5c..527ed2d 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApiMessageEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.vm.servers.manager.gui.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.common.vm.servers.manager.gui.logging.GuiClientApi");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApi");
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApiOperationEnum.java
index d42fa0c..95d4d1e 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApiOperationEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.vm.servers.manager.gui.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum GuiClientApiOperationEnum implements EcompOperationEnum {
 
-  getTree,
-  getObject,
-  getTimeSerie,
-  getTable,
-  getHtml,
-  getGraph,
-  REMOTE_getTree,
-  REMOTE_getObject,
-  REMOTE_getTimeSerie,
-  REMOTE_getTable,
-  REMOTE_getHtml,
-  REMOTE_getGraph;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManager.properties b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManager.properties
index 9eb6331..ec788c2 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManager.properties
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManager.properties
@@ -1,198 +1,198 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-logs=\
-  logs-FAILED-5001W|\
+REQUEST_FAILED_logs=\
+  REQUEST-FAILED-logs-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-metrics=\
-  metrics-FAILED-5001W|\
+REQUEST_FAILED_metrics=\
+  REQUEST-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-properties=\
-  properties-FAILED-5001W|\
+REQUEST_FAILED_properties=\
+  REQUEST-FAILED-properties-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-uploadInfo=\
-  uploadInfo-FAILED-5001W|\
+REQUEST_FAILED_uploadInfo=\
+  REQUEST-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValues=\
-  getValues-FAILED-5001W|\
+REQUEST_FAILED_getValues=\
+  REQUEST-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValuesAll=\
-  getValuesAll-FAILED-5001W|\
+REQUEST_FAILED_getValuesAll=\
+  REQUEST-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getMessages=\
-  getMessages-FAILED-5001W|\
+REQUEST_FAILED_getMessages=\
+  REQUEST-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getRequestLogger=\
-  getRequestLogger-FAILED-5001W|\
+REQUEST_FAILED_getRequestLogger=\
+  REQUEST-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-evaluate=\
-  evaluate-FAILED-5001W|\
+REQUEST_FAILED_evaluate=\
+  REQUEST-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-update=\
-  update-FAILED-5001W|\
+REQUEST_FAILED_update=\
+  REQUEST-FAILED-update-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_logs=\
-  REMOTE-logs-FAILED-5001W|\
+REMOTE_CALL_FAILED_logs=\
+  REMOTE-CALL-FAILED-logs-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_metrics=\
-  REMOTE-metrics-FAILED-5001W|\
+REMOTE_CALL_FAILED_metrics=\
+  REMOTE-CALL-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_properties=\
-  REMOTE-properties-FAILED-5001W|\
+REMOTE_CALL_FAILED_properties=\
+  REMOTE-CALL-FAILED-properties-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_uploadInfo=\
-  REMOTE-uploadInfo-FAILED-5001W|\
+REMOTE_CALL_FAILED_uploadInfo=\
+  REMOTE-CALL-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValues=\
-  REMOTE-getValues-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValues=\
+  REMOTE-CALL-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValuesAll=\
-  REMOTE-getValuesAll-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValuesAll=\
+  REMOTE-CALL-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getMessages=\
-  REMOTE-getMessages-FAILED-5001W|\
+REMOTE_CALL_FAILED_getMessages=\
+  REMOTE-CALL-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getRequestLogger=\
-  REMOTE-getRequestLogger-FAILED-5001W|\
+REMOTE_CALL_FAILED_getRequestLogger=\
+  REMOTE-CALL-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_evaluate=\
-  REMOTE-evaluate-FAILED-5001W|\
+REMOTE_CALL_FAILED_evaluate=\
+  REMOTE-CALL-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_update=\
-  REMOTE-update-FAILED-5001W|\
+REMOTE_CALL_FAILED_update=\
+  REMOTE-CALL-FAILED-update-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManagerMessageEnum.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManagerMessageEnum.java
index 4c3dd1d..29bf1ad 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManagerMessageEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.vm.servers.manager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,40 +7,40 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum CommonVmManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REQUEST_FAILED_logs,
+  REQUEST_FAILED_metrics,
+  REQUEST_FAILED_properties,
+  REQUEST_FAILED_uploadInfo,
+  REQUEST_FAILED_getValues,
+  REQUEST_FAILED_getValuesAll,
+  REQUEST_FAILED_getMessages,
+  REQUEST_FAILED_getRequestLogger,
+  REQUEST_FAILED_evaluate,
+  REQUEST_FAILED_update,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_logs,
+  REMOTE_CALL_FAILED_metrics,
+  REMOTE_CALL_FAILED_properties,
+  REMOTE_CALL_FAILED_uploadInfo,
+  REMOTE_CALL_FAILED_getValues,
+  REMOTE_CALL_FAILED_getValuesAll,
+  REMOTE_CALL_FAILED_getMessages,
+  REMOTE_CALL_FAILED_getRequestLogger,
+  REMOTE_CALL_FAILED_evaluate,
+  REMOTE_CALL_FAILED_update;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.common.vm.servers.manager.logging.CommonVmManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManager");
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManagerOperationEnum.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManagerOperationEnum.java
index 0b6ccd7..c8ec04a 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManagerOperationEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/manager/logging/CommonVmManagerOperationEnum.java
@@ -1,61 +1,37 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.vm.servers.manager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum CommonVmManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update;
+  CommonVmManager_test("CommonVmManager@test"),
+  CommonVmManager_suspend("CommonVmManager@suspend"),
+  CommonVmManager_resume("CommonVmManager@resume"),
+  CommonVmManager_publicKey("CommonVmManager@publicKey"),
+  CommonVmManager_configurationChanged("CommonVmManager@configurationChanged"),
+  CommonVmManager_updateStreams("CommonVmManager@updateStreams"),
+  CommonVmManager_logs("CommonVmManager@logs"),
+  CommonVmManager_metrics("CommonVmManager@metrics"),
+  CommonVmManager_properties("CommonVmManager@properties"),
+  CommonVmManager_uploadInfo("CommonVmManager@uploadInfo"),
+  CommonVmManager_getValues("CommonVmManager@getValues"),
+  CommonVmManager_getValuesAll("CommonVmManager@getValuesAll"),
+  CommonVmManager_getMessages("CommonVmManager@getMessages"),
+  CommonVmManager_getRequestLogger("CommonVmManager@getRequestLogger"),
+  CommonVmManager_evaluate("CommonVmManager@evaluate"),
+  CommonVmManager_update("CommonVmManager@update") ; 
+
+
+	private String n;
+	
+	private CommonVmManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmService.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmService.java
index df84442..017ff50 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmService.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmService.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.common.vm.servers.service;
 
 
 
+
 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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -54,9 +61,9 @@ import org.openecomp.dcae.controller.service.common.vm.service.impl.CommonVmServ
 
 
 
-public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusPlugin {
+public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeCommonVmService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeCommonVmServiceProvider controller;
 	ISiriusServer server;
 
@@ -71,9 +78,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.deploy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -82,8 +88,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.deploy, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -98,9 +106,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.undeploy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -109,8 +116,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.undeploy, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -125,9 +134,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.test);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_test,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -136,8 +144,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.test, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -152,9 +162,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.suspend);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -163,8 +172,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.suspend, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -179,9 +190,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.resume);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_resume,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -190,8 +200,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.resume, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -206,9 +218,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.pushManagerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -217,8 +228,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.pushManagerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -233,9 +246,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.pollManagerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -244,8 +256,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.pollManagerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -260,9 +274,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.managerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -271,8 +284,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.managerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -287,9 +302,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.managerOperation);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -298,8 +312,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.managerOperation, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -314,9 +330,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.updateConfigurationFromPolicy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -325,8 +340,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.updateConfigurationFromPolicy, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -341,9 +358,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.runHealthTests);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -352,8 +368,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.runHealthTests, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -368,9 +386,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.updateDeploymentStatus);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(CommonVmServiceOperationEnum.CommonVmService_updateDeploymentStatus,server,this);
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_updateDeploymentStatus,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateDeploymentStatus();
 		}
@@ -379,8 +396,10 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(CommonVmServiceMessageEnum.updateDeploymentStatus, e.toString());
-			throw e;
+			ecomplogger.warn(CommonVmServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 =  EcompException.create(CommonVmServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CommonVmServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -394,6 +413,8 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -402,7 +423,7 @@ public class DcaeCommonVmService extends CommonVmServiceImpl implements ISiriusP
 	public static void ecoreSetup() {
 		DcaeCommonVmServiceProvider.ecoreSetup();
 	}
-	public DcaeCommonVmServiceProvider getSomfProvider() {
+	public DcaeCommonVmServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceClient.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceClient.java
index 19ffd2d..568a2cd 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceClient.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 		DcaeCommonVmService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeCommonVmServiceClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeCommonVmServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_deploy);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@deploy: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_undeploy);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeploy: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_test);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -122,16 +130,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_suspend);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -139,16 +148,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_resume);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pushManagerConfiguration: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pollManagerConfiguration: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerConfiguration: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -207,16 +220,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerOperation: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateConfigurationFromPolicy: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public void runHealthTests() {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@runHealthTests: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -258,16 +274,17 @@ public class DcaeCommonVmServiceClient extends CommonVmServiceImpl {
 
 	@Override
 	public void updateDeploymentStatus() {
-		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(CommonVmServiceOperationEnum.REMOTE_updateDeploymentStatus);
+		EClass c = ServicePackage.eINSTANCE.getCommonVmService(); 
+		ecomplogger.recordMetricEventStart(CommonVmServiceOperationEnum.CommonVmService_updateDeploymentStatus,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateDeploymentStatus", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_updateDeploymentStatus, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateDeploymentStatus: " + e);
+			ecomplogger.warn(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 = EcompException.create(CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CommonVmServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceServer.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceServer.java
index 67e4088..baea8dc 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceServer.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/DcaeCommonVmServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.common.vm.servers.service;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.common.vm.service.CommonVmService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.common.vm.service.CommonVmService;
 
 
 
-public class DcaeCommonVmServiceServer implements ISiriusServer {
+public class DcaeCommonVmServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeCommonVmServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeCommonVmServiceServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "CommonVmService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
 		server.addFactory(org.openecomp.dcae.controller.service.common.vm.service.ServiceFactory.eINSTANCE);
@@ -76,6 +76,7 @@ public class DcaeCommonVmServiceServer implements ISiriusServer {
         controller = (DcaeCommonVmService) server.find("/").o;
         webServer = new Jetty8Server("service.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -98,4 +99,17 @@ public class DcaeCommonVmServiceServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmService.properties b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmService.properties
index d32cf07..1218d2a 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmService.properties
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmService.properties
@@ -1,150 +1,150 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateDeploymentStatus=\
-  updateDeploymentStatus-FAILED-5001W|\
+REQUEST_FAILED_updateDeploymentStatus=\
+  REQUEST-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateDeploymentStatus=\
-  REMOTE-updateDeploymentStatus-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateDeploymentStatus=\
+  REMOTE-CALL-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmServiceMessageEnum.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmServiceMessageEnum.java
index b46423a..197e4ae 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmServiceMessageEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.common.vm.servers.service.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,32 +7,32 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum CommonVmServiceMessageEnum 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;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REQUEST_FAILED_updateDeploymentStatus,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_updateDeploymentStatus;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.common.vm.servers.service.logging.CommonVmService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmService");
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmServiceOperationEnum.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmServiceOperationEnum.java
index f0f2971..8073443 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmServiceOperationEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/common/vm/servers/service/logging/CommonVmServiceOperationEnum.java
@@ -1,53 +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.service.common.vm.servers.service.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum CommonVmServiceOperationEnum 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;
+  CommonVmService_deploy("CommonVmService@deploy"),
+  CommonVmService_undeploy("CommonVmService@undeploy"),
+  CommonVmService_test("CommonVmService@test"),
+  CommonVmService_suspend("CommonVmService@suspend"),
+  CommonVmService_resume("CommonVmService@resume"),
+  CommonVmService_pushManagerConfiguration("CommonVmService@pushManagerConfiguration"),
+  CommonVmService_pollManagerConfiguration("CommonVmService@pollManagerConfiguration"),
+  CommonVmService_managerConfiguration("CommonVmService@managerConfiguration"),
+  CommonVmService_managerOperation("CommonVmService@managerOperation"),
+  CommonVmService_updateConfigurationFromPolicy("CommonVmService@updateConfigurationFromPolicy"),
+  CommonVmService_runHealthTests("CommonVmService@runHealthTests"),
+  CommonVmService_updateDeploymentStatus("CommonVmService@updateDeploymentStatus") ; 
+
+
+	private String n;
+	
+	private CommonVmServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/vm/manager/impl/ManagerPackageImpl.java b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/vm/manager/impl/ManagerPackageImpl.java
index 64be77d..11012ee 100644
--- a/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/vm/manager/impl/ManagerPackageImpl.java
+++ b/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/common/vm/manager/impl/ManagerPackageImpl.java
@@ -26,12 +26,16 @@ package org.openecomp.dcae.controller.service.common.vm.manager.impl;
 import org.openecomp.dcae.controller.service.common.vm.manager.CommonVmManager;
 import org.openecomp.dcae.controller.service.common.vm.manager.ManagerFactory;
 import org.openecomp.dcae.controller.service.common.vm.manager.ManagerPackage;
+
 import org.openecomp.dcae.controller.service.common.vm.service.ServicePackage;
+
 import org.openecomp.dcae.controller.service.vmmanager.VmmanagerPackage;
+
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
+
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.classpath b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.classpath
index 04e20b5..ce6cccd 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.classpath
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.classpath
@@ -20,7 +20,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.project b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.project
index b3e3df1..3768501 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.project
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/.project
@@ -11,17 +11,17 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
+			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.pde.SchemaBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/META-INF/MANIFEST.MF b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/META-INF/MANIFEST.MF
index 35ec7f2..a882665 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/META-INF/MANIFEST.MF
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/META-INF/MANIFEST.MF
@@ -5,10 +5,4 @@ Bundle-SymbolicName: dcae-controller-service-vm-adaptor
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.vm.adaptor.tools,
   org.openecomp.dcae.controller.service.servers.vm
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-vm-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0"
+
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceProvider.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceProvider.java
index 9dee540..b5be627 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceProvider.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceProvider.java
@@ -48,6 +48,7 @@ import org.openecomp.dcae.controller.core.service.HealthTestResponse;
 import org.openecomp.dcae.controller.core.service.HealthTestStatus;
 import org.openecomp.dcae.controller.core.service.ServiceFactory;
 import org.openecomp.dcae.controller.core.stream.DcaeStream;
+import org.openecomp.dcae.controller.core.stream.DmaapStream;
 import org.openecomp.dcae.controller.service.servers.vmmanager.DcaeVirtualMachineManagerConsole;
 import org.openecomp.dcae.controller.service.vm.InstallationStep;
 import org.openecomp.dcae.controller.service.vm.PhysicalMachine;
@@ -175,6 +176,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 					continue;
 				} 
 			}
+			createServerHook(o,i,server);
 			boolean floatingIpDone = false;
 			String ip2 = server.getNetworks().get(0).getIp();
 			for (NeutronFloatingIp fip : location.getOpenstackProject().getFloatingips()) {
@@ -247,6 +249,10 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 		// return res;
 	}
 
+	protected void createServerHook(VirtualMachineService o, VirtualMachineServiceInstance i, DcaeBasicServer server) {
+		
+	}
+
 	// used for testing only
 	static String userdataStatic(VirtualMachineServiceInstance i, int j, HashMap<DcaeBasicServer, Port> portMap) {
 		DcaeVirtualMachineServiceProvider pp = new DcaeVirtualMachineServiceProvider(null, null);
@@ -279,8 +285,6 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 			buf.append(configMap.get("init-script")).append("\n");
 		buf.append(userdataHosts(s, portMap));
 		buf.append(userdataCertificate(s));
-//		buf.append(userdataUam(i, s)).append("\n");
-//		buf.append(userdataIeds(i, s)).append("\n");
 		buf.append(userdataFromFile("CLOUDINIT",i, s)).append("\n");
 		for (User u : i.getAdminUsers()) {
 			buf.append(userdataSshKey(i.getAdminId(), u.getPublicKey()));
@@ -323,7 +327,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 		return buf.toString();
 	}
 
-	private String userdataConfig(Object o, DcaeBasicServer s) {
+	protected String userdataConfig(Object o, DcaeBasicServer s) {
 		StringBuffer buf = new StringBuffer();
 		@SuppressWarnings("unchecked")
 		HashMap<String, HashMap<String, String>> m1 = (HashMap<String, HashMap<String, String>>) o;
@@ -427,14 +431,8 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 		StringBuffer buf = new StringBuffer();
 		buf.append("cat >> /etc/hosts << HOSTS_EOF").append("\n");
 		for (DcaeBasicServer s1 : portMap.keySet()) {
-			if (s1 == s) {
-				for (FixedIp x : portMap.get(s1).getFixed_ips()) {
-					buf.append(x.getIp_address() + " " + dnsName(s) + " " + s1.getName()).append("\n");
-				}
-			} else {
-				for (FixedIp x : portMap.get(s1).getFixed_ips()) {
-					buf.append(x.getIp_address() + " " + s1.getName()).append("\n");
-				}
+			for (FixedIp x : portMap.get(s1).getFixed_ips()) {
+				buf.append(x.getIp_address() + " " + dnsName(s1) + " " + s1.getName()).append("\n");
 			}
 		}
 		buf.append("HOSTS_EOF").append("\n");
@@ -449,7 +447,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 		return buf.toString();
 	}
 
-	static String getTemplate(String resource) throws IOException {
+	protected static String getTemplate(String resource) throws IOException {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		byte[] data = new byte[65536];
 		InputStream is = DcaeVirtualMachineServiceProvider.class.getClassLoader().getResourceAsStream(resource);
@@ -536,7 +534,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 		}
 	}
 
-	private String dnsName(DcaeBasicServer s) {
+	protected static String dnsName(DcaeBasicServer s) {
 		return s.getNetworks().get(0).getDnsName();
 	}
 
@@ -621,7 +619,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 				s1.setPrivateIp(privateip);
 				s1.setPublicIp(publicip);
 				s1.setServer(svr);
-				if (svr != null)
+				if (svr != null && svr.getOS_EXT_STS_vm_state().equals("active"))
 					numDeployed++;
 				if (publicip == null && needPubIp && project.getPublicNetwork() != null) {
 					incomplete = s1.getName() + " has not public IP";
@@ -648,7 +646,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 
 	};
 
-	private void setStatus(VirtualMachineServiceInstance instance, DeploymentStatus newStatus,String reason) {
+	protected void setStatus(VirtualMachineServiceInstance instance, DeploymentStatus newStatus,String reason) {
 		if (instance.getStatus() != newStatus) {
 			String msg = "deployment status changed: " + ManagementServer.object2ref(instance) +
 					" " + instance.getStatus() + " -> " + newStatus + " " + reason;
@@ -660,22 +658,31 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 
 	public HealthTestResponse test(String instance) {
 		VirtualMachineServiceInstance i = findInstance(instance);
-		if (i.getStatus() != DeploymentStatus.DEPLOYED) {
-			HealthTestResponse s = ServiceFactory.eINSTANCE.createHealthTestResponse();
-			s = ServiceFactory.eINSTANCE.createHealthTestResponse();
-			s.setMessageCode("Not deployed");
-			s.setStatus(HealthTestStatus.YELLOW);
-			return s;
-		}
-		if (i.getManagerPortNumber() < 0) {
-			HealthTestResponse s = ServiceFactory.eINSTANCE.createHealthTestResponse();
-			s.setMessageCode("Health Check undefined");
-			s.setStatus(HealthTestStatus.YELLOW);
-			return s;
-		} 
-		AbstractClient c = getClient(i);
-		DcaeVirtualMachineManagerConsole console = new DcaeVirtualMachineManagerConsole(c);
-		return console.test();
+		HealthTestResponse res  = ServiceFactory.eINSTANCE.createHealthTestResponse();
+		res.setStatus(HealthTestStatus.GREEN);
+		for (DcaeBasicServer s : i.getServers()) {
+			try {
+				AbstractClient c = getClient(i,s);
+				DcaeVirtualMachineManagerConsole console = new DcaeVirtualMachineManagerConsole(c);
+				HealthTestResponse h = console.test();
+				s.setHealthTestStatus(h.getStatus());
+				s.setHealthTestMessageCode(h.getMessageCode());
+				updateHealthResponse(res,h);
+			} catch (Exception e) {
+				res.setStatus(HealthTestStatus.RED);
+				res.setMessageCode("Health check failed to server: " + s.getName() + " " + e);
+			}
+		}
+		return res;
+	}
+
+	protected void updateHealthResponse(HealthTestResponse h, HealthTestResponse h1) {
+		if (h.getStatus() == HealthTestStatus.RED) return;
+		if (h.getStatus() == HealthTestStatus.YELLOW && h1.getStatus() != HealthTestStatus.RED) return;
+		if (h.getStatus() == HealthTestStatus.GREEN && h1.getStatus() == HealthTestStatus.GREEN) return;
+		// h1 should be used
+		h.setStatus(h1.getStatus());
+		h.setMessageCode(h1.getMessageCode());
 	}
 
 	public void suspend(String instance) {
@@ -707,11 +714,21 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 			l1.addAll(EcoreUtil.copyAll(i.getInputStreams()));
 			EList<DcaeStream> l2 = new BasicEList<DcaeStream>();
 			l2.addAll(EcoreUtil.copyAll(i.getOutputStreams()));
-			console.updateStreams(l1, l2);
+			console.updateStreams(decrypt(l1), decrypt(l2));
 			console.configurationChanged();
 		}
 	}
 
+	protected EList<DcaeStream> decrypt(EList<DcaeStream> l) {
+		for (DcaeStream s : l) {
+			if (s instanceof DmaapStream) {
+				DmaapStream s1 = (DmaapStream) s;
+				s1.setDmaapPassword(JavaHttpClient.decryptPassword(s1.getDmaapPassword()));
+			}
+		}
+		return l;
+	}
+
 	protected EList<DcaeBasicServer> getServers(VirtualMachineServiceInstance i) {
 		return i.getServers();
 	}
@@ -752,7 +769,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 	}
 
 	public AbstractClient getClient(VirtualMachineServiceInstance i, DcaeBasicServer s) {
-		Jetty8Client c = new Jetty8Client("managers.properties", i.eClass().getInstanceClassName());
+		JavaHttpClient c = new JavaHttpClient("managers.properties", i.eClass().getInstanceClassName());
 		if (c.getBaseAddress() == null) {
 			throw new RuntimeException("unable to determine baseaddress in managers.properties for: "
 					+ i.eClass().getInstanceClassName());
@@ -790,7 +807,7 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 		return getClient(i, i.getLeaderServer());
 	}
 
-	private String vmName(VirtualMachineServiceInstance i, int index) {
+	protected String vmName(VirtualMachineServiceInstance i, int index) {
 		return i.getServers().get(index).getName();
 		// return "dcae:" + o.getName() + ":" + i.getName() + ":" + index;
 	}
@@ -835,30 +852,30 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 		return json;
 	}
 
-	public void updateConfigurationFromPolicy(String instanceName) {
-		VirtualMachineServiceInstance i = findInstance(instanceName);
-		JavaHttpClient client = new JavaHttpClient("controller.properties", "policy");
-		HashMap<String, String> headers = new HashMap<String, String>();
-		JSONObject json = new JSONObject();
-		headers.put("ClientAuth", "xxx");
-		JSONObject json2 = new JSONObject();
-		json.put("configAttributes", json2);
-		json2.put("uuid", "xxx");
-		json2.put("service", "ControllerServiceCollectorSdnlService");
-		json2.put("location", "Edge");
-		json.put("configName", "xxxx.sdn-l");
-		json.put("ecompcomponentName", "DCAE");
-		client.httpJsonTransaction("/PyPDPServer/getConfig", "POST", headers, json);
-	}
-
 	public void runHealthTests() {
+		// TODO is this every called??
+		System.err.println("TTTTTTTTT vm runHealthTests");
 		for (VirtualMachineServiceInstance i : o.getInstances()) {
 			HealthTestResponse s = null;
 			try {
-				s = o.test(i.getName());
+				if (i.getStatus() == DeploymentStatus.DEPLOYED) {
+					if (i.getManagerPortNumber() < 0) {
+						s = ServiceFactory.eINSTANCE.createHealthTestResponse();
+						s.setMessageCode("Health Check undefined");
+						s.setStatus(HealthTestStatus.YELLOW);
+					} else {
+						AbstractClient c = getClient(i);
+						DcaeVirtualMachineManagerConsole console = new DcaeVirtualMachineManagerConsole(c);
+						s = console.test();
+					}
+				} else {
+					s = ServiceFactory.eINSTANCE.createHealthTestResponse();
+					s.setMessageCode("Not deployed");
+					s.setStatus(HealthTestStatus.YELLOW);
+				}
 			} catch (Exception e) {
 				s = ServiceFactory.eINSTANCE.createHealthTestResponse();
-				s.setMessageCode("Health check failed: " + e);
+				s.setMessageCode(e.toString());
 				s.setStatus(HealthTestStatus.RED);
 			}
 			i.setHealthTestStatus(s.getStatus());
@@ -869,4 +886,8 @@ public class DcaeVirtualMachineServiceProvider extends BasicAdaptorProvider {
 			store.addLongValue(path, now, now.getTime(), "DateMetricAttribute", false);
 		}
 	}
+
+	public void updateConfigurationFromPolicy(String instanceName) {
+		throw new UnsupportedOperationException("should not get called");
+	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/vm/adaptor/tools/Generator.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/vm/adaptor/tools/Generator.java
index 3d7c1c5..2dd6683 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/vm/adaptor/tools/Generator.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/java/org/openecomp/dcae/controller/service/vm/adaptor/tools/Generator.java
@@ -49,12 +49,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceVmManager");

 		m.setTitle("ControllerServiceVmManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(false);

 		//  TODO Unclear why this fails.

@@ -72,18 +73,19 @@ public class Generator {
 		String dir = p.getNsURI().replace(p.getNsPrefix(),"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceVm");

 		m.setTitle("ControllerServiceVm");

 		ControllerGenerator g = new ControllerGenerator(o,m); 

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

 		g.setEnableISiriusPlugin(true);

 		g.generate(dir);

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

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

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

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

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

 	}

 

diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/ControllerVirtualMachineServiceInstance.yaml b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/ControllerVirtualMachineServiceInstance.yaml
deleted file mode 100644
index d728705..0000000
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/ControllerVirtualMachineServiceInstance.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-operations: {}
-messages:
-  dummy: {}
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/VirtualMachineManager.yaml b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/VirtualMachineManager.yaml
index 63cb773..5d17d1a 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/VirtualMachineManager.yaml
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/VirtualMachineManager.yaml
@@ -1,179 +1,147 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  logs: {}
-  metrics: {}
-  properties: {}
-  uploadInfo: {}
-  getValues: {}
-  getValuesAll: {}
-  getMessages: {}
-  getRequestLogger: {}
-  evaluate: {}
-  update: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
-  REMOTE_logs:
-    decription: Remote call logs
-  REMOTE_metrics:
-    decription: Remote call metrics
-  REMOTE_properties:
-    decription: Remote call properties
-  REMOTE_uploadInfo:
-    decription: Remote call uploadInfo
-  REMOTE_getValues:
-    decription: Remote call getValues
-  REMOTE_getValuesAll:
-    decription: Remote call getValuesAll
-  REMOTE_getMessages:
-    decription: Remote call getMessages
-  REMOTE_getRequestLogger:
-    decription: Remote call getRequestLogger
-  REMOTE_evaluate:
-    decription: Remote call evaluate
-  REMOTE_update:
-    decription: Remote call update
+  VirtualMachineManager@test: {}
+  VirtualMachineManager@suspend: {}
+  VirtualMachineManager@resume: {}
+  VirtualMachineManager@publicKey: {}
+  VirtualMachineManager@configurationChanged: {}
+  VirtualMachineManager@updateStreams: {}
+  VirtualMachineManager@logs: {}
+  VirtualMachineManager@metrics: {}
+  VirtualMachineManager@properties: {}
+  VirtualMachineManager@uploadInfo: {}
+  VirtualMachineManager@getValues: {}
+  VirtualMachineManager@getValuesAll: {}
+  VirtualMachineManager@getMessages: {}
+  VirtualMachineManager@getRequestLogger: {}
+  VirtualMachineManager@evaluate: {}
+  VirtualMachineManager@update: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  logs:
-    errorCode: logs-FAILED-5001W
+  REQUEST-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  metrics:
-    errorCode: metrics-FAILED-5001W
+  REQUEST-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  properties:
-    errorCode: properties-FAILED-5001W
+  REQUEST-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  uploadInfo:
-    errorCode: uploadInfo-FAILED-5001W
+  REQUEST-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValues:
-    errorCode: getValues-FAILED-5001W
+  REQUEST-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValuesAll:
-    errorCode: getValuesAll-FAILED-5001W
+  REQUEST-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getMessages:
-    errorCode: getMessages-FAILED-5001W
+  REQUEST-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getRequestLogger:
-    errorCode: getRequestLogger-FAILED-5001W
+  REQUEST-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  evaluate:
-    errorCode: evaluate-FAILED-5001W
+  REQUEST-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  update:
-    errorCode: update-FAILED-5001W
+  REQUEST-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_logs:
-    errorCode: REMOTE-logs-FAILED-5001W
+  REMOTE-CALL-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_metrics:
-    errorCode: REMOTE-metrics-FAILED-5001W
+  REMOTE-CALL-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_properties:
-    errorCode: REMOTE-properties-FAILED-5001W
+  REMOTE-CALL-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_uploadInfo:
-    errorCode: REMOTE-uploadInfo-FAILED-5001W
+  REMOTE-CALL-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValues:
-    errorCode: REMOTE-getValues-FAILED-5001W
+  REMOTE-CALL-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValuesAll:
-    errorCode: REMOTE-getValuesAll-FAILED-5001W
+  REMOTE-CALL-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getMessages:
-    errorCode: REMOTE-getMessages-FAILED-5001W
+  REMOTE-CALL-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getRequestLogger:
-    errorCode: REMOTE-getRequestLogger-FAILED-5001W
+  REMOTE-CALL-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_evaluate:
-    errorCode: REMOTE-evaluate-FAILED-5001W
+  REMOTE-CALL-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_update:
-    errorCode: REMOTE-update-FAILED-5001W
+  REMOTE-CALL-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/VirtualMachineService.yaml b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/VirtualMachineService.yaml
index 6ac8c34..9b03a21 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/VirtualMachineService.yaml
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/VirtualMachineService.yaml
@@ -1,135 +1,111 @@
 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
+  VirtualMachineService@deploy: {}
+  VirtualMachineService@undeploy: {}
+  VirtualMachineService@test: {}
+  VirtualMachineService@suspend: {}
+  VirtualMachineService@resume: {}
+  VirtualMachineService@pushManagerConfiguration: {}
+  VirtualMachineService@pollManagerConfiguration: {}
+  VirtualMachineService@managerConfiguration: {}
+  VirtualMachineService@managerOperation: {}
+  VirtualMachineService@updateConfigurationFromPolicy: {}
+  VirtualMachineService@runHealthTests: {}
+  VirtualMachineService@updateDeploymentStatus: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateDeploymentStatus:
-    errorCode: updateDeploymentStatus-FAILED-5001W
+  REQUEST-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateDeploymentStatus:
-    errorCode: REMOTE-updateDeploymentStatus-FAILED-5001W
+  REMOTE-CALL-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineService.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineService.java
index 1d8d251..fd5b93d 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineService.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineService.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.servers.vm;
 
 
 
+
 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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -54,9 +61,9 @@ import org.openecomp.dcae.controller.service.vm.impl.VirtualMachineServiceImpl;
 
 
 
-public class DcaeVirtualMachineService extends VirtualMachineServiceImpl implements ISiriusPlugin {
+public class DcaeVirtualMachineService extends VirtualMachineServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeVirtualMachineService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeVirtualMachineServiceProvider controller;
 	ISiriusServer server;
 
@@ -71,9 +78,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.updateDeploymentStatus);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_updateDeploymentStatus,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_updateDeploymentStatus,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateDeploymentStatus();
 		}
@@ -82,8 +88,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.updateDeploymentStatus, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -98,9 +106,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.deploy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -109,8 +116,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.deploy, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -125,9 +134,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.undeploy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -136,8 +144,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.undeploy, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -152,9 +162,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.test);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_test,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -163,8 +172,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.test, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -179,9 +190,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.suspend);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -190,8 +200,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.suspend, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -206,9 +218,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.resume);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_resume,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -217,8 +228,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.resume, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -233,9 +246,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.pushManagerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -244,8 +256,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.pushManagerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -260,9 +274,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.pollManagerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -271,8 +284,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.pollManagerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -287,9 +302,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.managerConfiguration);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -298,8 +312,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.managerConfiguration, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -314,9 +330,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.managerOperation);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -325,8 +340,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.managerOperation, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -341,9 +358,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.updateConfigurationFromPolicy);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -352,8 +368,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.updateConfigurationFromPolicy, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -368,9 +386,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.runHealthTests);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineServiceOperationEnum.VirtualMachineService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -379,8 +396,10 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.runHealthTests, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -394,6 +413,8 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -402,7 +423,7 @@ public class DcaeVirtualMachineService extends VirtualMachineServiceImpl impleme
 	public static void ecoreSetup() {
 		DcaeVirtualMachineServiceProvider.ecoreSetup();
 	}
-	public DcaeVirtualMachineServiceProvider getSomfProvider() {
+	public DcaeVirtualMachineServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceClient.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceClient.java
index 65cdc1b..61cbeb4 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceClient.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 		DcaeVirtualMachineService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeVirtualMachineServiceClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeVirtualMachineServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void updateDeploymentStatus() {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_updateDeploymentStatus);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_updateDeploymentStatus,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateDeploymentStatus", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_updateDeploymentStatus, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateDeploymentStatus: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_deploy);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@deploy: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_undeploy);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeploy: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_test);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_suspend);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_resume);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pushManagerConfiguration: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@pollManagerConfiguration: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -207,16 +220,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerConfiguration: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerOperation: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -241,16 +256,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateConfigurationFromPolicy: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -258,16 +274,17 @@ public class DcaeVirtualMachineServiceClient extends VirtualMachineServiceImpl {
 
 	@Override
 	public void runHealthTests() {
-		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = VmPackage.eINSTANCE.getVirtualMachineService(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineServiceOperationEnum.VirtualMachineService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@runHealthTests: " + e);
+			ecomplogger.warn(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceServer.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceServer.java
index 56173b7..50a9c13 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceServer.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/DcaeVirtualMachineServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.servers.vm;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.vm.VirtualMachineService;
 
 
 
-public class DcaeVirtualMachineServiceServer implements ISiriusServer {
+public class DcaeVirtualMachineServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeVirtualMachineServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeVirtualMachineServiceServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "VirtualMachineService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
         server.addRuntimeFactories(this);
@@ -73,6 +73,7 @@ public class DcaeVirtualMachineServiceServer implements ISiriusServer {
         controller = (DcaeVirtualMachineService) server.find("/").o;
         webServer = new Jetty8Server("vm.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -95,4 +96,17 @@ public class DcaeVirtualMachineServiceServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineService.properties b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineService.properties
index d32cf07..1218d2a 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineService.properties
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineService.properties
@@ -1,150 +1,150 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateDeploymentStatus=\
-  updateDeploymentStatus-FAILED-5001W|\
+REQUEST_FAILED_updateDeploymentStatus=\
+  REQUEST-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateDeploymentStatus=\
-  REMOTE-updateDeploymentStatus-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateDeploymentStatus=\
+  REMOTE-CALL-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineServiceMessageEnum.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineServiceMessageEnum.java
index d0f7bf2..9973d3c 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineServiceMessageEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.vm.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,32 +7,32 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum VirtualMachineServiceMessageEnum 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;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REQUEST_FAILED_updateDeploymentStatus,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_updateDeploymentStatus;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.vm.logging.VirtualMachineService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineService");
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineServiceOperationEnum.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineServiceOperationEnum.java
index 52d420c..d63d19c 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineServiceOperationEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vm/logging/VirtualMachineServiceOperationEnum.java
@@ -1,53 +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.service.servers.vm.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum VirtualMachineServiceOperationEnum 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;
+  VirtualMachineService_deploy("VirtualMachineService@deploy"),
+  VirtualMachineService_undeploy("VirtualMachineService@undeploy"),
+  VirtualMachineService_test("VirtualMachineService@test"),
+  VirtualMachineService_suspend("VirtualMachineService@suspend"),
+  VirtualMachineService_resume("VirtualMachineService@resume"),
+  VirtualMachineService_pushManagerConfiguration("VirtualMachineService@pushManagerConfiguration"),
+  VirtualMachineService_pollManagerConfiguration("VirtualMachineService@pollManagerConfiguration"),
+  VirtualMachineService_managerConfiguration("VirtualMachineService@managerConfiguration"),
+  VirtualMachineService_managerOperation("VirtualMachineService@managerOperation"),
+  VirtualMachineService_updateConfigurationFromPolicy("VirtualMachineService@updateConfigurationFromPolicy"),
+  VirtualMachineService_runHealthTests("VirtualMachineService@runHealthTests"),
+  VirtualMachineService_updateDeploymentStatus("VirtualMachineService@updateDeploymentStatus") ; 
+
+
+	private String n;
+	
+	private VirtualMachineServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManager.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManager.java
index 889b01c..0f6c576 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManager.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManager.java
@@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.servers.vmmanager;
 
 
 
+
 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.ISiriusProvider;
 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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
 import org.json.JSONObject;
 
 import java.util.Date;
@@ -72,9 +79,9 @@ import org.openecomp.dcae.controller.service.vmmanager.impl.VirtualMachineManage
 
 
 
-public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
+public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeVirtualMachineManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeVirtualMachineManagerProvider controller;
 	ISiriusServer server;
 
@@ -89,9 +96,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.test);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_test,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -100,8 +106,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.test, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -116,9 +124,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.suspend);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -127,8 +134,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.suspend, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,9 +152,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.resume);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -154,8 +162,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.resume, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -170,9 +180,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.publicKey);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -181,8 +190,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.publicKey, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -197,9 +208,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.configurationChanged);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -208,8 +218,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.configurationChanged, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -224,9 +236,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.updateStreams);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -235,8 +246,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.updateStreams, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -251,9 +264,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.logs);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_logs,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_logs,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.logs(cx,logs);
 		}
@@ -262,8 +274,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.logs, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_logs, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_logs, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -278,9 +292,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.metrics);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_metrics,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_metrics,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.metrics(cx,metrics);
 		}
@@ -289,8 +302,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.metrics, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_metrics, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_metrics, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -305,9 +320,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.properties);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_properties,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_properties,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.properties(cx,l);
 		}
@@ -316,8 +330,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.properties, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_properties, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_properties, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -332,9 +348,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.uploadInfo);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_uploadInfo,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_uploadInfo,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.uploadInfo(cx,info);
 		}
@@ -343,8 +358,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.uploadInfo, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -359,9 +376,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		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(VirtualMachineManagerOperationEnum.getValues);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_getValues,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_getValues,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValues(cx,path,start,end,option,relativeInterval);
 		}
@@ -370,8 +386,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			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(VirtualMachineManagerMessageEnum.getValues, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_getValues, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_getValues, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -386,9 +404,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		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(VirtualMachineManagerOperationEnum.getValuesAll);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_getValuesAll,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_getValuesAll,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval);
 		}
@@ -397,8 +414,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			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(VirtualMachineManagerMessageEnum.getValuesAll, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -413,9 +432,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.getMessages);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_getMessages,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_getMessages,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getMessages(cx,path,start,end);
 		}
@@ -424,8 +442,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.getMessages, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_getMessages, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -440,9 +460,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.getRequestLogger);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_getRequestLogger,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_getRequestLogger,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getRequestLogger(userName,action,resourcePath,context);
 		}
@@ -451,8 +470,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.getRequestLogger, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -467,9 +488,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.evaluate);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_evaluate,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_evaluate,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.evaluate(path,function);
 		}
@@ -478,8 +498,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.evaluate, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_evaluate, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -494,9 +516,8 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.update);
-		ecomplogger.setInstanceId(ManagementServer.object2ref(this));
+		ecomplogger.recordAuditEventStartIfNeeded(VirtualMachineManagerOperationEnum.VirtualMachineManager_update,server,this);
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_update,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.update(path,function);
 		}
@@ -505,8 +526,10 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.update, e.toString());
-			throw e;
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REQUEST_FAILED_update, e.toString());
+			EcompException e1 =  EcompException.create(VirtualMachineManagerMessageEnum.REQUEST_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, VirtualMachineManagerMessageEnum.REQUEST_FAILED_update, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -520,10 +543,12 @@ public class DcaeVirtualMachineManager extends VirtualMachineManagerImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeVirtualMachineManagerProvider.ecoreSetup();
 	}
-	public DcaeVirtualMachineManagerProvider getSomfProvider() {
+	public DcaeVirtualMachineManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManagerClient.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManagerClient.java
index 1030b1c..e175e49 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManagerClient.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 		DcaeVirtualMachineManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeVirtualMachineManagerClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeVirtualMachineManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_test);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -88,16 +94,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void suspend() {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_suspend);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void resume() {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_resume);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_publicKey);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@publicKey: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void configurationChanged() {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@configurationChanged: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateStreams: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_logs);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_logs,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_logs, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@logs: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_metrics);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_metrics,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_metrics, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@metrics: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -207,16 +220,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_properties);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_properties,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_properties, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@properties: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -224,16 +238,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_uploadInfo);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_uploadInfo,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_uploadInfo, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@uploadInfo: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@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 = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_getValues);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_getValues,client.getRemote());
 		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(VirtualMachineManagerMessageEnum.REMOTE_getValues, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getValues: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -258,16 +274,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@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 = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_getValuesAll);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_getValuesAll,client.getRemote());
 		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(VirtualMachineManagerMessageEnum.REMOTE_getValuesAll, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getValuesAll: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -275,16 +292,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@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 = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_getMessages);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_getMessages,client.getRemote());
 		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(VirtualMachineManagerMessageEnum.REMOTE_getMessages, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getMessages: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -292,16 +310,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@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 = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_getRequestLogger);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_getRequestLogger,client.getRemote());
 		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(VirtualMachineManagerMessageEnum.REMOTE_getRequestLogger, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@getRequestLogger: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -309,16 +328,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_evaluate);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_evaluate,client.getRemote());
 		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(VirtualMachineManagerMessageEnum.REMOTE_evaluate, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@evaluate: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -326,16 +346,17 @@ public class DcaeVirtualMachineManagerClient extends VirtualMachineManagerImpl {
 
 	@Override
 	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(VirtualMachineManagerOperationEnum.REMOTE_update);
+		EClass c = VmmanagerPackage.eINSTANCE.getVirtualMachineManager(); 
+		ecomplogger.recordMetricEventStart(VirtualMachineManagerOperationEnum.VirtualMachineManager_update,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "update", null, path,function);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_update, e.toString());
-			throw new RuntimeException("remote call failed: " + client.getRemote() + "@update: " + e);
+			ecomplogger.warn(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_update, e.toString());
+			EcompException e1 = EcompException.create(VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,VirtualMachineManagerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManagerServer.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManagerServer.java
index b769ee8..b30fc6d 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManagerServer.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/DcaeVirtualMachineManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.servers.vmmanager;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.vmmanager.VirtualMachineManager;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.vmmanager.VirtualMachineManager;
 
 
 
-public class DcaeVirtualMachineManagerServer implements ISiriusServer {
+public class DcaeVirtualMachineManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeVirtualMachineManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeVirtualMachineManagerServer implements ISiriusServer {
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "VirtualMachineManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
         server.addRuntimeFactories(this);
@@ -73,6 +73,7 @@ public class DcaeVirtualMachineManagerServer implements ISiriusServer {
         controller = (DcaeVirtualMachineManager) server.find("/").o;
         webServer = new Jetty8Server("vmmanager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -95,4 +96,17 @@ public class DcaeVirtualMachineManagerServer implements ISiriusServer {
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManager.properties b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManager.properties
index 9eb6331..ec788c2 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManager.properties
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManager.properties
@@ -1,198 +1,198 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-logs=\
-  logs-FAILED-5001W|\
+REQUEST_FAILED_logs=\
+  REQUEST-FAILED-logs-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-metrics=\
-  metrics-FAILED-5001W|\
+REQUEST_FAILED_metrics=\
+  REQUEST-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-properties=\
-  properties-FAILED-5001W|\
+REQUEST_FAILED_properties=\
+  REQUEST-FAILED-properties-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-uploadInfo=\
-  uploadInfo-FAILED-5001W|\
+REQUEST_FAILED_uploadInfo=\
+  REQUEST-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValues=\
-  getValues-FAILED-5001W|\
+REQUEST_FAILED_getValues=\
+  REQUEST-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValuesAll=\
-  getValuesAll-FAILED-5001W|\
+REQUEST_FAILED_getValuesAll=\
+  REQUEST-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getMessages=\
-  getMessages-FAILED-5001W|\
+REQUEST_FAILED_getMessages=\
+  REQUEST-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getRequestLogger=\
-  getRequestLogger-FAILED-5001W|\
+REQUEST_FAILED_getRequestLogger=\
+  REQUEST-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-evaluate=\
-  evaluate-FAILED-5001W|\
+REQUEST_FAILED_evaluate=\
+  REQUEST-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-update=\
-  update-FAILED-5001W|\
+REQUEST_FAILED_update=\
+  REQUEST-FAILED-update-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_logs=\
-  REMOTE-logs-FAILED-5001W|\
+REMOTE_CALL_FAILED_logs=\
+  REMOTE-CALL-FAILED-logs-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_metrics=\
-  REMOTE-metrics-FAILED-5001W|\
+REMOTE_CALL_FAILED_metrics=\
+  REMOTE-CALL-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_properties=\
-  REMOTE-properties-FAILED-5001W|\
+REMOTE_CALL_FAILED_properties=\
+  REMOTE-CALL-FAILED-properties-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_uploadInfo=\
-  REMOTE-uploadInfo-FAILED-5001W|\
+REMOTE_CALL_FAILED_uploadInfo=\
+  REMOTE-CALL-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValues=\
-  REMOTE-getValues-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValues=\
+  REMOTE-CALL-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValuesAll=\
-  REMOTE-getValuesAll-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValuesAll=\
+  REMOTE-CALL-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getMessages=\
-  REMOTE-getMessages-FAILED-5001W|\
+REMOTE_CALL_FAILED_getMessages=\
+  REMOTE-CALL-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getRequestLogger=\
-  REMOTE-getRequestLogger-FAILED-5001W|\
+REMOTE_CALL_FAILED_getRequestLogger=\
+  REMOTE-CALL-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_evaluate=\
-  REMOTE-evaluate-FAILED-5001W|\
+REMOTE_CALL_FAILED_evaluate=\
+  REMOTE-CALL-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_update=\
-  REMOTE-update-FAILED-5001W|\
+REMOTE_CALL_FAILED_update=\
+  REMOTE-CALL-FAILED-update-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManagerMessageEnum.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManagerMessageEnum.java
index f8087ef..4566a70 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManagerMessageEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.vmmanager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,40 +7,40 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum VirtualMachineManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REQUEST_FAILED_logs,
+  REQUEST_FAILED_metrics,
+  REQUEST_FAILED_properties,
+  REQUEST_FAILED_uploadInfo,
+  REQUEST_FAILED_getValues,
+  REQUEST_FAILED_getValuesAll,
+  REQUEST_FAILED_getMessages,
+  REQUEST_FAILED_getRequestLogger,
+  REQUEST_FAILED_evaluate,
+  REQUEST_FAILED_update,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_logs,
+  REMOTE_CALL_FAILED_metrics,
+  REMOTE_CALL_FAILED_properties,
+  REMOTE_CALL_FAILED_uploadInfo,
+  REMOTE_CALL_FAILED_getValues,
+  REMOTE_CALL_FAILED_getValuesAll,
+  REMOTE_CALL_FAILED_getMessages,
+  REMOTE_CALL_FAILED_getRequestLogger,
+  REMOTE_CALL_FAILED_evaluate,
+  REMOTE_CALL_FAILED_update;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.vmmanager.logging.VirtualMachineManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManager");
 	}
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManagerOperationEnum.java b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManagerOperationEnum.java
index 71aeeda..3d59dc3 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManagerOperationEnum.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/vmmanager/logging/VirtualMachineManagerOperationEnum.java
@@ -1,61 +1,37 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.servers.vmmanager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum VirtualMachineManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update;
+  VirtualMachineManager_test("VirtualMachineManager@test"),
+  VirtualMachineManager_suspend("VirtualMachineManager@suspend"),
+  VirtualMachineManager_resume("VirtualMachineManager@resume"),
+  VirtualMachineManager_publicKey("VirtualMachineManager@publicKey"),
+  VirtualMachineManager_configurationChanged("VirtualMachineManager@configurationChanged"),
+  VirtualMachineManager_updateStreams("VirtualMachineManager@updateStreams"),
+  VirtualMachineManager_logs("VirtualMachineManager@logs"),
+  VirtualMachineManager_metrics("VirtualMachineManager@metrics"),
+  VirtualMachineManager_properties("VirtualMachineManager@properties"),
+  VirtualMachineManager_uploadInfo("VirtualMachineManager@uploadInfo"),
+  VirtualMachineManager_getValues("VirtualMachineManager@getValues"),
+  VirtualMachineManager_getValuesAll("VirtualMachineManager@getValuesAll"),
+  VirtualMachineManager_getMessages("VirtualMachineManager@getMessages"),
+  VirtualMachineManager_getRequestLogger("VirtualMachineManager@getRequestLogger"),
+  VirtualMachineManager_evaluate("VirtualMachineManager@evaluate"),
+  VirtualMachineManager_update("VirtualMachineManager@update") ; 
+
+
+	private String n;
+	
+	private VirtualMachineManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/ControllerVirtualMachineService.java b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/ControllerVirtualMachineService.java
deleted file mode 100644
index 8763179..0000000
--- a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/ControllerVirtualMachineService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-/**
- */
-package org.openecomp.dcae.controller.service.vm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Controller Virtual Machine Service</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.openecomp.dcae.controller.service.vm.VmPackage#getControllerVirtualMachineService()
- * @model
- * @generated
- */
-public interface ControllerVirtualMachineService extends VirtualMachineService {
-} // ControllerVirtualMachineService
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/ControllerVirtualMachineServiceInstance.java b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/ControllerVirtualMachineServiceInstance.java
deleted file mode 100644
index 7535c5d..0000000
--- a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/ControllerVirtualMachineServiceInstance.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-/**
- */
-package org.openecomp.dcae.controller.service.vm;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Controller Virtual Machine Service Instance</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.openecomp.dcae.controller.service.vm.VmPackage#getControllerVirtualMachineServiceInstance()
- * @model
- * @generated
- */
-public interface ControllerVirtualMachineServiceInstance extends VirtualMachineServiceInstance {
-} // ControllerVirtualMachineServiceInstance
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/InstallationStep.java b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/InstallationStep.java
index 7af4aad..dd8ef8d 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/InstallationStep.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/InstallationStep.java
@@ -42,7 +42,6 @@ import org.openecomp.ncomp.core.NamedEntity;
  * @generated
  */
 public interface InstallationStep extends NamedEntity {
-
 	/**
 	 * Returns the value of the '<em><b>Application Id</b></em>' attribute.
 	 * The default value is <code>"dcae"</code>.
@@ -69,4 +68,5 @@ public interface InstallationStep extends NamedEntity {
 	 * @generated
 	 */
 	void setApplicationId(String value);
+
 } // InstallationStep
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/VmPackage.java b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/VmPackage.java
index cd04405..acb2df0 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/VmPackage.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/VmPackage.java
@@ -980,6 +980,33 @@ public interface VmPackage extends EPackage {
 	int PHYSICAL_MACHINE__CERTIFICATE_PASSWORD = ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD;
 
 	/**
+	 * The feature id for the '<em><b>Last Health Test</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_MACHINE__LAST_HEALTH_TEST = ServerPackage.DCAE_BASIC_SERVER__LAST_HEALTH_TEST;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_MACHINE__HEALTH_TEST_STATUS = ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_STATUS;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PHYSICAL_MACHINE__HEALTH_TEST_MESSAGE_CODE = ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE;
+
+	/**
 	 * The feature id for the '<em><b>Manager Port Number</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1188,6 +1215,33 @@ public interface VmPackage extends EPackage {
 	int VIRTUAL_MACHINE__CERTIFICATE_PASSWORD = ServerPackage.DCAE_BASIC_SERVER__CERTIFICATE_PASSWORD;
 
 	/**
+	 * The feature id for the '<em><b>Last Health Test</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VIRTUAL_MACHINE__LAST_HEALTH_TEST = ServerPackage.DCAE_BASIC_SERVER__LAST_HEALTH_TEST;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Status</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VIRTUAL_MACHINE__HEALTH_TEST_STATUS = ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_STATUS;
+
+	/**
+	 * The feature id for the '<em><b>Health Test Message Code</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int VIRTUAL_MACHINE__HEALTH_TEST_MESSAGE_CODE = ServerPackage.DCAE_BASIC_SERVER__HEALTH_TEST_MESSAGE_CODE;
+
+	/**
 	 * The feature id for the '<em><b>Function Index</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1397,7 +1451,6 @@ public interface VmPackage extends EPackage {
 	 */
 	int SHELL_INSTALLATION_STEP_OPERATION_COUNT = INSTALLATION_STEP_OPERATION_COUNT + 0;
 
-
 	/**
 	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.vm.impl.MavenArtifactInstallationStepImpl <em>Maven Artifact Installation Step</em>}' class.
 	 * <!-- begin-user-doc -->
@@ -1516,7 +1569,6 @@ public interface VmPackage extends EPackage {
 	 */
 	int MAVEN_ARTIFACT_INSTALLATION_STEP_OPERATION_COUNT = INSTALLATION_STEP_OPERATION_COUNT + 0;
 
-
 	/**
 	 * The meta object id for the '{@link org.openecomp.dcae.controller.service.vm.impl.HttpInstallationStepImpl <em>Http Installation Step</em>}' class.
 	 * <!-- begin-user-doc -->
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/impl/InstallationStepImpl.java b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/impl/InstallationStepImpl.java
index f7d6ea8..b37d901 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/impl/InstallationStepImpl.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/impl/InstallationStepImpl.java
@@ -29,7 +29,9 @@ import org.openecomp.dcae.controller.service.vm.VmPackage;
 import org.openecomp.ncomp.core.impl.NamedEntityImpl;
 
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.ecore.EClass;
+
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
 /**
@@ -55,6 +57,7 @@ public abstract class InstallationStepImpl extends NamedEntityImpl implements In
 	 * @ordered
 	 */
 	protected static final String APPLICATION_ID_EDEFAULT = "dcae";
+
 	/**
 	 * The cached value of the '{@link #getApplicationId() <em>Application Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/impl/VmPackageImpl.java b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/impl/VmPackageImpl.java
index 2161eac..cf150b8 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/impl/VmPackageImpl.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vm/impl/VmPackageImpl.java
@@ -170,7 +170,6 @@ public class VmPackageImpl extends EPackageImpl implements VmPackage {
 		isInited = true;
 
 		// Initialize simple dependencies
-		ServicePackage.eINSTANCE.eClass();
 		ServerPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
diff --git a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vmmanager/impl/VmmanagerPackageImpl.java b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vmmanager/impl/VmmanagerPackageImpl.java
index 3c01a4e..81906fa 100644
--- a/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vmmanager/impl/VmmanagerPackageImpl.java
+++ b/dcae-controller-service-vm/dcae-controller-service-vm-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/vmmanager/impl/VmmanagerPackageImpl.java
@@ -96,8 +96,8 @@ public class VmmanagerPackageImpl extends EPackageImpl implements VmmanagerPacka
 		isInited = true;
 
 		// Initialize simple dependencies
-		ServerPackage.eINSTANCE.eClass();
 		ManagerPackage.eINSTANCE.eClass();
+		ServerPackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theVmmanagerPackage.createPackageContents();
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/.classpath b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/.classpath
index d2d34b3..0d82fb7 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/.classpath
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="config"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -21,7 +20,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/META-INF/MANIFEST.MF b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/META-INF/MANIFEST.MF
index 0256ddd..823b21c 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/META-INF/MANIFEST.MF
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/META-INF/MANIFEST.MF
@@ -5,11 +5,4 @@ Bundle-SymbolicName: dcae-controller-service-dmaap-drsub-manager
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.dmaap.drsub.manager.tools,
   org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-dmaap-drsub-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- operation-utils;bundle-version="0.1.0"
+
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/manager/tools/Generator.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/manager/tools/Generator.java
index c05b8eb..7707b6b 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/manager/tools/Generator.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/manager/tools/Generator.java
@@ -53,12 +53,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceDmaapDrsubManager");

 		m.setTitle("ControllerServiceDmaapDrsubManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(false);

 		g.addFactory(ServiceFactory.eINSTANCE);

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

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceDmaapDrsubService");

 		m.setTitle("ControllerServiceDmaapDrsubService");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(true);

 		g.addFactory(ServiceFactory.eINSTANCE);

diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProvider.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProvider.java
index 79401dd..bae905d 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProvider.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerProvider.java
@@ -65,6 +65,7 @@ public class DcaeControllerServiceDmaapDrsubManagerProvider extends DcaeVirtualM
 	private static final String APP_HOME_ENV = System.getenv("APP_DRSUB_HOME");
 	private static final String APP_HOME = "/opt/app/dcae-analytics-dmaap-drsub";
 	private static final String CTL_SCRIPT = "dmaapAfSub.sh";	// Subscriber control script 
+	private static final String HDFS_SCRIPT = "create_hdfs_dirs.sh";	// HDFS directories creation script
 	private static final int JSON_INDENT_FACTOR = 0;
 	
 	public DcaeControllerServiceDmaapDrsubManagerProvider(ISiriusServer controller, ControllerServiceDmaapDrsubManager o) {
@@ -127,6 +128,9 @@ public class DcaeControllerServiceDmaapDrsubManagerProvider extends DcaeVirtualM
     	   }
        }
 
+       // call script to create HDFS directories based on updated configuration
+       createHdfsDirs();
+       
        // restart controlled process for config changes to take effect
        resume();
     }
@@ -150,9 +154,17 @@ public class DcaeControllerServiceDmaapDrsubManagerProvider extends DcaeVirtualM
 		logger.info("(re)starting");
 		command.add(CTL_SCRIPT);
 		command.add("restart");
-		runScript(command);	}
+		runScript(command);	
+	}
 
-	private void runScript(List<String> command) {
+	private void createHdfsDirs() {
+    	List<String> command = new ArrayList<String>();
+		logger.info("creating HDFS directories");
+		command.add(HDFS_SCRIPT);
+		runScript(command);
+	}
+	
+    private void runScript(List<String> command) {
 		String appBin = APP_HOME_ENV;
 			    
 		if (appBin == null || appBin.equals("")) {
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProvider.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProvider.java
index 5e0588a..1a62b0a 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProvider.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/java/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceProvider.java
@@ -73,6 +73,7 @@ public class DcaeControllerServiceDmaapDrsubServiceProvider extends DcaeVirtualM
 			if (s != null && s.o != null 
 					&& ((CdapClusterServiceInstance) s.o).getStatus() == DeploymentStatus.DEPLOYED) {
 				i.setCdapClusterInstance((CdapClusterServiceInstance) s.o);
+				i.setLocation(i.getCdapClusterInstance().getLocation());
 				switch (cmd) {
 				case "pushManagerConfiguration":
 					o.pushManagerConfiguration(instanceName);
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubManager.yaml b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubManager.yaml
index 63cb773..e9c2223 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubManager.yaml
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubManager.yaml
@@ -1,179 +1,147 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  logs: {}
-  metrics: {}
-  properties: {}
-  uploadInfo: {}
-  getValues: {}
-  getValuesAll: {}
-  getMessages: {}
-  getRequestLogger: {}
-  evaluate: {}
-  update: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
-  REMOTE_logs:
-    decription: Remote call logs
-  REMOTE_metrics:
-    decription: Remote call metrics
-  REMOTE_properties:
-    decription: Remote call properties
-  REMOTE_uploadInfo:
-    decription: Remote call uploadInfo
-  REMOTE_getValues:
-    decription: Remote call getValues
-  REMOTE_getValuesAll:
-    decription: Remote call getValuesAll
-  REMOTE_getMessages:
-    decription: Remote call getMessages
-  REMOTE_getRequestLogger:
-    decription: Remote call getRequestLogger
-  REMOTE_evaluate:
-    decription: Remote call evaluate
-  REMOTE_update:
-    decription: Remote call update
+  ControllerServiceDmaapDrsubManager@test: {}
+  ControllerServiceDmaapDrsubManager@suspend: {}
+  ControllerServiceDmaapDrsubManager@resume: {}
+  ControllerServiceDmaapDrsubManager@publicKey: {}
+  ControllerServiceDmaapDrsubManager@configurationChanged: {}
+  ControllerServiceDmaapDrsubManager@updateStreams: {}
+  ControllerServiceDmaapDrsubManager@logs: {}
+  ControllerServiceDmaapDrsubManager@metrics: {}
+  ControllerServiceDmaapDrsubManager@properties: {}
+  ControllerServiceDmaapDrsubManager@uploadInfo: {}
+  ControllerServiceDmaapDrsubManager@getValues: {}
+  ControllerServiceDmaapDrsubManager@getValuesAll: {}
+  ControllerServiceDmaapDrsubManager@getMessages: {}
+  ControllerServiceDmaapDrsubManager@getRequestLogger: {}
+  ControllerServiceDmaapDrsubManager@evaluate: {}
+  ControllerServiceDmaapDrsubManager@update: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  logs:
-    errorCode: logs-FAILED-5001W
+  REQUEST-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  metrics:
-    errorCode: metrics-FAILED-5001W
+  REQUEST-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  properties:
-    errorCode: properties-FAILED-5001W
+  REQUEST-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  uploadInfo:
-    errorCode: uploadInfo-FAILED-5001W
+  REQUEST-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValues:
-    errorCode: getValues-FAILED-5001W
+  REQUEST-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getValuesAll:
-    errorCode: getValuesAll-FAILED-5001W
+  REQUEST-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getMessages:
-    errorCode: getMessages-FAILED-5001W
+  REQUEST-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getRequestLogger:
-    errorCode: getRequestLogger-FAILED-5001W
+  REQUEST-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  evaluate:
-    errorCode: evaluate-FAILED-5001W
+  REQUEST-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  update:
-    errorCode: update-FAILED-5001W
+  REQUEST-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_logs:
-    errorCode: REMOTE-logs-FAILED-5001W
+  REMOTE-CALL-FAILED-logs:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_metrics:
-    errorCode: REMOTE-metrics-FAILED-5001W
+  REMOTE-CALL-FAILED-metrics:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_properties:
-    errorCode: REMOTE-properties-FAILED-5001W
+  REMOTE-CALL-FAILED-properties:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_uploadInfo:
-    errorCode: REMOTE-uploadInfo-FAILED-5001W
+  REMOTE-CALL-FAILED-uploadInfo:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValues:
-    errorCode: REMOTE-getValues-FAILED-5001W
+  REMOTE-CALL-FAILED-getValues:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getValuesAll:
-    errorCode: REMOTE-getValuesAll-FAILED-5001W
+  REMOTE-CALL-FAILED-getValuesAll:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getMessages:
-    errorCode: REMOTE-getMessages-FAILED-5001W
+  REMOTE-CALL-FAILED-getMessages:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getRequestLogger:
-    errorCode: REMOTE-getRequestLogger-FAILED-5001W
+  REMOTE-CALL-FAILED-getRequestLogger:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_evaluate:
-    errorCode: REMOTE-evaluate-FAILED-5001W
+  REMOTE-CALL-FAILED-evaluate:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_update:
-    errorCode: REMOTE-update-FAILED-5001W
+  REMOTE-CALL-FAILED-update:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubService.yaml b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubService.yaml
index 6ac8c34..de5214a 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubService.yaml
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/ControllerServiceDmaapDrsubService.yaml
@@ -1,135 +1,111 @@
 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
+  ControllerServiceDmaapDrsubService@deploy: {}
+  ControllerServiceDmaapDrsubService@undeploy: {}
+  ControllerServiceDmaapDrsubService@test: {}
+  ControllerServiceDmaapDrsubService@suspend: {}
+  ControllerServiceDmaapDrsubService@resume: {}
+  ControllerServiceDmaapDrsubService@pushManagerConfiguration: {}
+  ControllerServiceDmaapDrsubService@pollManagerConfiguration: {}
+  ControllerServiceDmaapDrsubService@managerConfiguration: {}
+  ControllerServiceDmaapDrsubService@managerOperation: {}
+  ControllerServiceDmaapDrsubService@updateConfigurationFromPolicy: {}
+  ControllerServiceDmaapDrsubService@runHealthTests: {}
+  ControllerServiceDmaapDrsubService@updateDeploymentStatus: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateDeploymentStatus:
-    errorCode: updateDeploymentStatus-FAILED-5001W
+  REQUEST-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateDeploymentStatus:
-    errorCode: REMOTE-updateDeploymentStatus-FAILED-5001W
+  REMOTE-CALL-FAILED-updateDeploymentStatus:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/GuiClientApi.yaml
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManager.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManager.java
index bdf2fe4..ce6ee3d 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManager.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManager.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager;
 
 
 
+
+
 import java.io.InputStream;
 
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.dmaap.drsub.servers.manager.logging.ControllerServiceDmaapDrsubManagerOperationEnum;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.logging.ControllerServiceDmaapDrsubManagerMessageEnum;
 
 
 
@@ -69,9 +79,9 @@ import org.openecomp.dcae.controller.service.dmaap.drsub.manager.impl.Controller
 
 
 
-public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDmaapDrsubManagerImpl {
+public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDmaapDrsubManagerImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeControllerServiceDmaapDrsubManagerProvider controller;
 	ISiriusServer server;
 
@@ -86,8 +96,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_test,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -96,7 +106,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -111,8 +124,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -121,7 +134,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -136,8 +152,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -146,7 +162,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -161,8 +180,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.publicKey);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -171,7 +190,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -186,8 +208,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.configurationChanged);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -196,7 +218,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -211,8 +236,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.updateStreams);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -221,7 +246,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -236,8 +264,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.logs);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_logs,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_logs,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.logs(cx,logs);
 		}
@@ -246,7 +274,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_logs, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_logs, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -261,8 +292,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.metrics);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_metrics,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_metrics,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.metrics(cx,metrics);
 		}
@@ -271,7 +302,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_metrics, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_metrics, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -286,8 +320,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.properties);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_properties,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_properties,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.properties(cx,l);
 		}
@@ -296,7 +330,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_properties, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_properties, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -311,8 +348,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.uploadInfo);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_uploadInfo,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_uploadInfo,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.uploadInfo(cx,info);
 		}
@@ -321,7 +358,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -336,8 +376,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.START, duration_,cx,path,start,end,option,relativeInterval);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.getValues);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getValues,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getValues,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValues(cx,path,start,end,option,relativeInterval);
 		}
@@ -346,7 +386,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.ERROR, duration_,cx,path,start,end,option,relativeInterval);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getValues, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getValues, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -361,8 +404,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.START, duration_,cx,path,metrics,start,end,option,relativeInterval);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.getValuesAll);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getValuesAll,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getValuesAll,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval);
 		}
@@ -371,7 +414,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.ERROR, duration_,cx,path,metrics,start,end,option,relativeInterval);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -386,8 +432,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.getMessages);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getMessages,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getMessages,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getMessages(cx,path,start,end);
 		}
@@ -396,7 +442,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getMessages, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -411,8 +460,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.getRequestLogger);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getRequestLogger,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getRequestLogger,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getRequestLogger(userName,action,resourcePath,context);
 		}
@@ -421,7 +470,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -436,8 +488,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.evaluate);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_evaluate,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_evaluate,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.evaluate(path,function);
 		}
@@ -446,7 +498,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_evaluate, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -461,8 +516,8 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.update);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_update,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_update,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.update(path,function);
 		}
@@ -471,7 +526,10 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_update, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubManagerMessageEnum.REQUEST_FAILED_update, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -485,10 +543,12 @@ public class DcaeControllerServiceDmaapDrsubManager extends ControllerServiceDma
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeControllerServiceDmaapDrsubManagerProvider.ecoreSetup();
 	}
-	public DcaeControllerServiceDmaapDrsubManagerProvider getSomfProvider() {
+	public DcaeControllerServiceDmaapDrsubManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerClient.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerClient.java
index 4b1cefa..fff7786 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerClient.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 		DcaeControllerServiceDmaapDrsubManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeControllerServiceDmaapDrsubManagerClient(String file, String name1, String name2) {
 		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
 		client = client1.all; // requests should be forwarded to all.
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeControllerServiceDmaapDrsubManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_test);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -88,16 +94,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void suspend() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_suspend);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void resume() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_resume);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_publicKey);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed:  publicKey", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void configurationChanged() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed:  configurationChanged", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed:  updateStreams", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_logs);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_logs,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_logs, e.toString());
-			throw new RuntimeException("remote call failed:  logs", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_metrics);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_metrics,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_metrics, e.toString());
-			throw new RuntimeException("remote call failed:  metrics", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -207,16 +220,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_properties);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_properties,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_properties, e.toString());
-			throw new RuntimeException("remote call failed:  properties", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -224,16 +238,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_uploadInfo);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_uploadInfo,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_uploadInfo, e.toString());
-			throw new RuntimeException("remote call failed:  uploadInfo", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_getValues);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getValues,client.getRemote());
 		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res;
 		try {
 		  res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValues", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end,option,relativeInterval);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_getValues, e.toString());
-			throw new RuntimeException("remote call failed:  getValues", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -258,16 +274,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_getValuesAll);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getValuesAll,client.getRemote());
 		EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res;
 		try {
 		  res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValuesAll", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,metrics,start,end,option,relativeInterval);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_getValuesAll, e.toString());
-			throw new RuntimeException("remote call failed:  getValuesAll", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -275,16 +292,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_getMessages);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getMessages,client.getRemote());
 		EList<org.openecomp.ncomp.core.logs.LogMessage> res;
 		try {
 		  res = (EList<org.openecomp.ncomp.core.logs.LogMessage>) client.operationPath("/resources", c, "getMessages", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_getMessages, e.toString());
-			throw new RuntimeException("remote call failed:  getMessages", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -292,16 +310,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_getRequestLogger);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_getRequestLogger,client.getRemote());
 		org.openecomp.ncomp.sirius.manager.server.LoggerInfo res;
 		try {
 		  res = (org.openecomp.ncomp.sirius.manager.server.LoggerInfo) client.operationPath("/resources", c, "getRequestLogger", null, userName,action,resourcePath,context);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_getRequestLogger, e.toString());
-			throw new RuntimeException("remote call failed:  getRequestLogger", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -309,16 +328,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_evaluate);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_evaluate,client.getRemote());
 		EList<org.openecomp.ncomp.core.function.ValuePair> res;
 		try {
 		  res = (EList<org.openecomp.ncomp.core.function.ValuePair>) client.operationPath("/resources", c, "evaluate", null, path,function);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_evaluate, e.toString());
-			throw new RuntimeException("remote call failed:  evaluate", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -326,16 +346,17 @@ public class DcaeControllerServiceDmaapDrsubManagerClient extends ControllerServ
 
 	@Override
 	public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubManagerOperationEnum.REMOTE_update);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceDmaapDrsubManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubManagerOperationEnum.ControllerServiceDmaapDrsubManager_update,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "update", null, path,function);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_update, e.toString());
-			throw new RuntimeException("remote call failed:  update", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_update, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubManagerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerServer.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerServer.java
index 01b7df1..9c451e1 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerServer.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/DcaeControllerServiceDmaapDrsubManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.dmaap.drsub.manager.ControllerServiceDmaapDrsubManager;
@@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.Dca
 
 
 
-public class DcaeControllerServiceDmaapDrsubManagerServer implements ISiriusServer {
+public class DcaeControllerServiceDmaapDrsubManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -69,6 +68,7 @@ public class DcaeControllerServiceDmaapDrsubManagerServer implements ISiriusServ
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "ControllerServiceDmaapDrsubManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
 		server.addFactory(org.openecomp.dcae.controller.service.dmaap.drsub.service.ServiceFactory.eINSTANCE);
@@ -81,6 +81,7 @@ public class DcaeControllerServiceDmaapDrsubManagerServer implements ISiriusServ
         controller = (DcaeControllerServiceDmaapDrsubManager) server.find("/").o;
         webServer = new Jetty8Server("manager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -109,4 +110,17 @@ public class DcaeControllerServiceDmaapDrsubManagerServer implements ISiriusServ
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApi.java
index 99b9703..6646d4c 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApi.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApi.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui;
 
 
 
+
+
 import java.io.InputStream;
 
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.dmaap.drsub.servers.manager.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.logging.GuiClientApiMessageEnum;
 
 
 
@@ -81,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -98,8 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getTree);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -108,7 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -123,8 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getObject);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -133,7 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -148,8 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -158,7 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -173,8 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -183,7 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -198,8 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -208,7 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -223,8 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -233,7 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -247,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiClient.java
index 3d5c489..198ea68 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiClient.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/DcaeGuiClientApiClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeControllerServiceDmaapDrsubManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTree, e.toString());
-			throw new RuntimeException("remote call failed:  getTree", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getObject, e.toString());
-			throw new RuntimeException("remote call failed:  getObject", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTimeSerie, e.toString());
-			throw new RuntimeException("remote call failed:  getTimeSerie", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTable, e.toString());
-			throw new RuntimeException("remote call failed:  getTable", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getHtml, e.toString());
-			throw new RuntimeException("remote call failed:  getHtml", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res;
 		try {
 		  res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getGraph, e.toString());
-			throw new RuntimeException("remote call failed:  getGraph", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApi.properties
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiMessageEnum.java
index 56c6b9f..b2d42fe 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiMessageEnum.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.logging.GuiClientApi");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApi");
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiOperationEnum.java
index 0b177b6..1ae23b1 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiOperationEnum.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.gui.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum GuiClientApiOperationEnum implements EcompOperationEnum {
 
-  getTree,
-  getObject,
-  getTimeSerie,
-  getTable,
-  getHtml,
-  getGraph,
-  REMOTE_getTree,
-  REMOTE_getObject,
-  REMOTE_getTimeSerie,
-  REMOTE_getTable,
-  REMOTE_getHtml,
-  REMOTE_getGraph;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManager.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManager.properties
index 9eb6331..ec788c2 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManager.properties
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManager.properties
@@ -1,198 +1,198 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-logs=\
-  logs-FAILED-5001W|\
+REQUEST_FAILED_logs=\
+  REQUEST-FAILED-logs-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-metrics=\
-  metrics-FAILED-5001W|\
+REQUEST_FAILED_metrics=\
+  REQUEST-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-properties=\
-  properties-FAILED-5001W|\
+REQUEST_FAILED_properties=\
+  REQUEST-FAILED-properties-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-uploadInfo=\
-  uploadInfo-FAILED-5001W|\
+REQUEST_FAILED_uploadInfo=\
+  REQUEST-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValues=\
-  getValues-FAILED-5001W|\
+REQUEST_FAILED_getValues=\
+  REQUEST-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getValuesAll=\
-  getValuesAll-FAILED-5001W|\
+REQUEST_FAILED_getValuesAll=\
+  REQUEST-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getMessages=\
-  getMessages-FAILED-5001W|\
+REQUEST_FAILED_getMessages=\
+  REQUEST-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getRequestLogger=\
-  getRequestLogger-FAILED-5001W|\
+REQUEST_FAILED_getRequestLogger=\
+  REQUEST-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-evaluate=\
-  evaluate-FAILED-5001W|\
+REQUEST_FAILED_evaluate=\
+  REQUEST-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-update=\
-  update-FAILED-5001W|\
+REQUEST_FAILED_update=\
+  REQUEST-FAILED-update-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_logs=\
-  REMOTE-logs-FAILED-5001W|\
+REMOTE_CALL_FAILED_logs=\
+  REMOTE-CALL-FAILED-logs-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_metrics=\
-  REMOTE-metrics-FAILED-5001W|\
+REMOTE_CALL_FAILED_metrics=\
+  REMOTE-CALL-FAILED-metrics-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_properties=\
-  REMOTE-properties-FAILED-5001W|\
+REMOTE_CALL_FAILED_properties=\
+  REMOTE-CALL-FAILED-properties-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_uploadInfo=\
-  REMOTE-uploadInfo-FAILED-5001W|\
+REMOTE_CALL_FAILED_uploadInfo=\
+  REMOTE-CALL-FAILED-uploadInfo-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValues=\
-  REMOTE-getValues-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValues=\
+  REMOTE-CALL-FAILED-getValues-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getValuesAll=\
-  REMOTE-getValuesAll-FAILED-5001W|\
+REMOTE_CALL_FAILED_getValuesAll=\
+  REMOTE-CALL-FAILED-getValuesAll-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getMessages=\
-  REMOTE-getMessages-FAILED-5001W|\
+REMOTE_CALL_FAILED_getMessages=\
+  REMOTE-CALL-FAILED-getMessages-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getRequestLogger=\
-  REMOTE-getRequestLogger-FAILED-5001W|\
+REMOTE_CALL_FAILED_getRequestLogger=\
+  REMOTE-CALL-FAILED-getRequestLogger-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_evaluate=\
-  REMOTE-evaluate-FAILED-5001W|\
+REMOTE_CALL_FAILED_evaluate=\
+  REMOTE-CALL-FAILED-evaluate-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_update=\
-  REMOTE-update-FAILED-5001W|\
+REMOTE_CALL_FAILED_update=\
+  REMOTE-CALL-FAILED-update-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerMessageEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerMessageEnum.java
index 2f98bc9..dc37e4b 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerMessageEnum.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,40 +7,40 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum ControllerServiceDmaapDrsubManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REQUEST_FAILED_logs,
+  REQUEST_FAILED_metrics,
+  REQUEST_FAILED_properties,
+  REQUEST_FAILED_uploadInfo,
+  REQUEST_FAILED_getValues,
+  REQUEST_FAILED_getValuesAll,
+  REQUEST_FAILED_getMessages,
+  REQUEST_FAILED_getRequestLogger,
+  REQUEST_FAILED_evaluate,
+  REQUEST_FAILED_update,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_logs,
+  REMOTE_CALL_FAILED_metrics,
+  REMOTE_CALL_FAILED_properties,
+  REMOTE_CALL_FAILED_uploadInfo,
+  REMOTE_CALL_FAILED_getValues,
+  REMOTE_CALL_FAILED_getValuesAll,
+  REMOTE_CALL_FAILED_getMessages,
+  REMOTE_CALL_FAILED_getRequestLogger,
+  REMOTE_CALL_FAILED_evaluate,
+  REMOTE_CALL_FAILED_update;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.logging.ControllerServiceDmaapDrsubManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManager");
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerOperationEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerOperationEnum.java
index 6e9b169..e6be358 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerOperationEnum.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/manager/logging/ControllerServiceDmaapDrsubManagerOperationEnum.java
@@ -1,61 +1,37 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.dmaap.drsub.servers.manager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum ControllerServiceDmaapDrsubManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  logs,
-  metrics,
-  properties,
-  uploadInfo,
-  getValues,
-  getValuesAll,
-  getMessages,
-  getRequestLogger,
-  evaluate,
-  update,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams,
-  REMOTE_logs,
-  REMOTE_metrics,
-  REMOTE_properties,
-  REMOTE_uploadInfo,
-  REMOTE_getValues,
-  REMOTE_getValuesAll,
-  REMOTE_getMessages,
-  REMOTE_getRequestLogger,
-  REMOTE_evaluate,
-  REMOTE_update;
+  ControllerServiceDmaapDrsubManager_test("ControllerServiceDmaapDrsubManager@test"),
+  ControllerServiceDmaapDrsubManager_suspend("ControllerServiceDmaapDrsubManager@suspend"),
+  ControllerServiceDmaapDrsubManager_resume("ControllerServiceDmaapDrsubManager@resume"),
+  ControllerServiceDmaapDrsubManager_publicKey("ControllerServiceDmaapDrsubManager@publicKey"),
+  ControllerServiceDmaapDrsubManager_configurationChanged("ControllerServiceDmaapDrsubManager@configurationChanged"),
+  ControllerServiceDmaapDrsubManager_updateStreams("ControllerServiceDmaapDrsubManager@updateStreams"),
+  ControllerServiceDmaapDrsubManager_logs("ControllerServiceDmaapDrsubManager@logs"),
+  ControllerServiceDmaapDrsubManager_metrics("ControllerServiceDmaapDrsubManager@metrics"),
+  ControllerServiceDmaapDrsubManager_properties("ControllerServiceDmaapDrsubManager@properties"),
+  ControllerServiceDmaapDrsubManager_uploadInfo("ControllerServiceDmaapDrsubManager@uploadInfo"),
+  ControllerServiceDmaapDrsubManager_getValues("ControllerServiceDmaapDrsubManager@getValues"),
+  ControllerServiceDmaapDrsubManager_getValuesAll("ControllerServiceDmaapDrsubManager@getValuesAll"),
+  ControllerServiceDmaapDrsubManager_getMessages("ControllerServiceDmaapDrsubManager@getMessages"),
+  ControllerServiceDmaapDrsubManager_getRequestLogger("ControllerServiceDmaapDrsubManager@getRequestLogger"),
+  ControllerServiceDmaapDrsubManager_evaluate("ControllerServiceDmaapDrsubManager@evaluate"),
+  ControllerServiceDmaapDrsubManager_update("ControllerServiceDmaapDrsubManager@update") ; 
+
+
+	private String n;
+	
+	private ControllerServiceDmaapDrsubManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubService.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubService.java
index 5d8c902..8088aae 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubService.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubService.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.dmaap.drsub.servers.service;
 
 
 
+
+
 import java.io.InputStream;
 
 import org.openecomp.ncomp.sirius.manager.IRequestHandler;
+import org.openecomp.ncomp.sirius.manager.ISwaggerHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
+import org.openecomp.ncomp.sirius.manager.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.dmaap.drsub.servers.service.logging.ControllerServiceDmaapDrsubServiceOperationEnum;
+import org.openecomp.dcae.controller.service.dmaap.drsub.servers.service.logging.ControllerServiceDmaapDrsubServiceMessageEnum;
 
 
 
@@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.dmaap.drsub.service.impl.Controller
 
 
 
-public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDmaapDrsubServiceImpl implements ISiriusPlugin {
+public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDmaapDrsubServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeControllerServiceDmaapDrsubServiceProvider controller;
 	ISiriusServer server;
 
@@ -68,8 +78,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.deploy);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -78,7 +88,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.undeploy);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -103,7 +116,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_test,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -128,7 +144,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -153,7 +172,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_resume,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -178,7 +200,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -193,8 +218,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.pushManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -203,7 +228,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -218,8 +246,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.pollManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -228,7 +256,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -243,8 +274,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.managerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -253,7 +284,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -268,8 +302,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.managerOperation);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -278,7 +312,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -293,8 +330,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.updateConfigurationFromPolicy);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -303,7 +340,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -318,8 +358,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.runHealthTests);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -328,7 +368,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -343,8 +386,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.updateDeploymentStatus);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_updateDeploymentStatus,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_updateDeploymentStatus,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateDeploymentStatus();
 		}
@@ -353,7 +396,10 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceDmaapDrsubServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -367,6 +413,8 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -375,7 +423,7 @@ public class DcaeControllerServiceDmaapDrsubService extends ControllerServiceDma
 	public static void ecoreSetup() {
 		DcaeControllerServiceDmaapDrsubServiceProvider.ecoreSetup();
 	}
-	public DcaeControllerServiceDmaapDrsubServiceProvider getSomfProvider() {
+	public DcaeControllerServiceDmaapDrsubServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceClient.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceClient.java
index 61034f8..a79f1b7 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceClient.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 		DcaeControllerServiceDmaapDrsubService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeControllerServiceDmaapDrsubServiceClient(String file, String name1, String name2) {
 		HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
 		client = client1.all; // requests should be forwarded to all.
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeControllerServiceDmaapDrsubServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_deploy);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed:  deploy", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_undeploy);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed:  undeploy", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_test);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -122,16 +130,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_suspend);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -139,16 +148,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_resume);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pushManagerConfiguration", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pollManagerConfiguration", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  managerConfiguration", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -207,16 +220,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed:  managerOperation", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed:  updateConfigurationFromPolicy", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public void runHealthTests() {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed:  runHealthTests", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -258,16 +274,17 @@ public class DcaeControllerServiceDmaapDrsubServiceClient extends ControllerServ
 
 	@Override
 	public void updateDeploymentStatus() {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceDmaapDrsubServiceOperationEnum.REMOTE_updateDeploymentStatus);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceDmaapDrsubService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceDmaapDrsubServiceOperationEnum.ControllerServiceDmaapDrsubService_updateDeploymentStatus,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateDeploymentStatus", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_updateDeploymentStatus, e.toString());
-			throw new RuntimeException("remote call failed:  updateDeploymentStatus", e);
+			ecomplogger.warn(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceDmaapDrsubServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceServer.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceServer.java
index 3732195..822b491 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceServer.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/DcaeControllerServiceDmaapDrsubServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.dmaap.drsub.servers.service;
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServiceDmaapDrsubService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.dmaap.drsub.service.ControllerServi
 
 
 
-public class DcaeControllerServiceDmaapDrsubServiceServer implements ISiriusServer {
+public class DcaeControllerServiceDmaapDrsubServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeControllerServiceDmaapDrsubServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeControllerServiceDmaapDrsubServiceServer implements ISiriusServ
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "ControllerServiceDmaapDrsubService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
 		server.addFactory(org.openecomp.dcae.controller.service.dmaap.drsub.service.ServiceFactory.eINSTANCE);
@@ -76,6 +76,7 @@ public class DcaeControllerServiceDmaapDrsubServiceServer implements ISiriusServ
         controller = (DcaeControllerServiceDmaapDrsubService) server.find("/").o;
         webServer = new Jetty8Server("service.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -98,4 +99,17 @@ public class DcaeControllerServiceDmaapDrsubServiceServer implements ISiriusServ
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubService.properties b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubService.properties
index d32cf07..1218d2a 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubService.properties
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubService.properties
@@ -1,150 +1,150 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateDeploymentStatus=\
-  updateDeploymentStatus-FAILED-5001W|\
+REQUEST_FAILED_updateDeploymentStatus=\
+  REQUEST-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateDeploymentStatus=\
-  REMOTE-updateDeploymentStatus-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateDeploymentStatus=\
+  REMOTE-CALL-FAILED-updateDeploymentStatus-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceMessageEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceMessageEnum.java
index 0582cf0..065d0ea 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceMessageEnum.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.dmaap.drsub.servers.service.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,32 +7,32 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum ControllerServiceDmaapDrsubServiceMessageEnum implements EcompMessageEnum {
 
   dummy,
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  updateDeploymentStatus,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests,
-  REMOTE_updateDeploymentStatus;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REQUEST_FAILED_updateDeploymentStatus,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_updateDeploymentStatus;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.dmaap.drsub.servers.service.logging.ControllerServiceDmaapDrsubService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubService");
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceOperationEnum.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceOperationEnum.java
index d811721..27b61c9 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceOperationEnum.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/dmaap/drsub/servers/service/logging/ControllerServiceDmaapDrsubServiceOperationEnum.java
@@ -1,53 +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.service.dmaap.drsub.servers.service.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum ControllerServiceDmaapDrsubServiceOperationEnum implements EcompOperationEnum {
 
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  updateDeploymentStatus,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests,
-  REMOTE_updateDeploymentStatus;
+  ControllerServiceDmaapDrsubService_deploy("ControllerServiceDmaapDrsubService@deploy"),
+  ControllerServiceDmaapDrsubService_undeploy("ControllerServiceDmaapDrsubService@undeploy"),
+  ControllerServiceDmaapDrsubService_test("ControllerServiceDmaapDrsubService@test"),
+  ControllerServiceDmaapDrsubService_suspend("ControllerServiceDmaapDrsubService@suspend"),
+  ControllerServiceDmaapDrsubService_resume("ControllerServiceDmaapDrsubService@resume"),
+  ControllerServiceDmaapDrsubService_pushManagerConfiguration("ControllerServiceDmaapDrsubService@pushManagerConfiguration"),
+  ControllerServiceDmaapDrsubService_pollManagerConfiguration("ControllerServiceDmaapDrsubService@pollManagerConfiguration"),
+  ControllerServiceDmaapDrsubService_managerConfiguration("ControllerServiceDmaapDrsubService@managerConfiguration"),
+  ControllerServiceDmaapDrsubService_managerOperation("ControllerServiceDmaapDrsubService@managerOperation"),
+  ControllerServiceDmaapDrsubService_updateConfigurationFromPolicy("ControllerServiceDmaapDrsubService@updateConfigurationFromPolicy"),
+  ControllerServiceDmaapDrsubService_runHealthTests("ControllerServiceDmaapDrsubService@runHealthTests"),
+  ControllerServiceDmaapDrsubService_updateDeploymentStatus("ControllerServiceDmaapDrsubService@updateDeploymentStatus") ; 
+
+
+	private String n;
+	
+	private ControllerServiceDmaapDrsubServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerPackageImpl.java b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerPackageImpl.java
index b837457..c4bd27f 100644
--- a/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerPackageImpl.java
+++ b/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/dmaap/drsub/manager/impl/ManagerPackageImpl.java
@@ -93,8 +93,8 @@ public class ManagerPackageImpl extends EPackageImpl implements ManagerPackage {
 		isInited = true;
 
 		// Initialize simple dependencies
-		ServicePackage.eINSTANCE.eClass();
 		VmmanagerPackage.eINSTANCE.eClass();
+		ServicePackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theManagerPackage.createPackageContents();
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/.classpath b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/.classpath
index d2d34b3..0d82fb7 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/.classpath
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="config"/>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -21,7 +20,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/META-INF/MANIFEST.MF b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/META-INF/MANIFEST.MF
index 1424a21..9490d9c 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/META-INF/MANIFEST.MF
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/META-INF/MANIFEST.MF
@@ -5,11 +5,3 @@ Bundle-SymbolicName: dcae-controller-service-standardeventcollector-manager
 Bundle-Version: 0.1.0.qualifier
 Export-Package: org.openecomp.dcae.controller.service.standardeventcollector.manager.tools,
   org.openecomp.dcae.controller.service.standardeventcollector.servers.manager
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- dcae-controller-service-standardeventcollector-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- dcae-controller-core-model
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/manager/tools/Generator.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/manager/tools/Generator.java
index d34bb3c..ab6114d 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/manager/tools/Generator.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/manager/tools/Generator.java
@@ -55,12 +55,13 @@ public class Generator {
 		String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceStandardeventcollectorManager");

 		m.setTitle("ControllerServiceStandardeventcollectorManager");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(true);

 		g.addFactory(ServiceFactory.eINSTANCE);

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

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

 		ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();

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

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

 		m.setPrefix("Dcae");

 		m.setPluginName(p.getNsURI());

 		m.setName("ControllerServiceStandardeventcollectorService");

 		m.setTitle("ControllerServiceStandardeventcollectorService");

 		ControllerGenerator g = new ControllerGenerator(o, m);

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

 		g.setEnableISiriusPlugin(true);

 		g.setProvider(DockerFactory.eINSTANCE.createDockerService(), "Dcae");

diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java
index ea013e0..7922c0d 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerProvider.java
@@ -38,6 +38,7 @@ import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusPlugin;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 import org.openecomp.ncomp.sirius.function.FunctionUtils;
+import org.openecomp.ncomp.utils.ShellCmd;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
@@ -51,9 +52,17 @@ import java.util.List;
 
 
 
+
+
+
+import java.util.concurrent.TimeoutException;
+
 import org.openecomp.dcae.controller.service.servers.dockermanager.DcaeDockerManagerProvider;
 import org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl;
 import org.openecomp.dcae.controller.service.standardeventcollector.manager.ControllerServiceStandardeventcollectorManager;
+import org.openecomp.dcae.controller.core.service.HealthTestResponse;
+import org.openecomp.dcae.controller.core.service.HealthTestStatus;
+import org.openecomp.dcae.controller.core.service.impl.ServiceFactoryImpl;
 
 
 public class DcaeControllerServiceStandardeventcollectorManagerProvider extends DcaeDockerManagerProvider {
@@ -67,8 +76,9 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends
 	//private static final String HP_MAIN_CONFIG = "/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/HPProcessingConfig.json";
 	//private static final String HP_MAIN_CONFIG_COPY = "/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/HPProcessingConfig.json.copy";
 
-	private static final String HP_MAIN_CONFIG = "/opt/app/SEC/etc/HPProcessingConfig.json";
-	private static final String HP_MAIN_CONFIG_COPY = "/opt/app/SEC/etc/HPProcessingConfig.json";
+	private static final String HP_MAIN_CONFIG = "/opt/app/VESCollector/etc/DmaapConfig.json";
+	//private static final String HP_MAIN_CONFIG_COPY = "/opt/app/SEC/etc/DmaapConfig.json";
+	
 
 
 	public DcaeControllerServiceStandardeventcollectorManagerProvider(ISiriusServer controller, ControllerServiceStandardeventcollectorManager o) {
@@ -97,6 +107,46 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends
     }
 
 
+	/** **/
+	@Override
+	public HealthTestResponse test() {
+		super.start();
+		HealthTestResponse resp = new ServiceFactoryImpl().createHealthTestResponse();
+		String cmdOutput = "";
+		try {
+			ShellCmd c = new ShellCmd("/opt/app/VESCollector/bin/VESrestfulCollector_Status.sh");
+			String s = c.result(60000);
+			int i = s.indexOf("\n");
+			System.out.println("DEBUG:HealthTestResponse i:" + i + " String S:" + s);
+			cmdOutput = i > 0 ? s.substring(0,i + 1) : s;
+		} catch (IOException | InterruptedException | TimeoutException e) {
+			System.out.println("HealthCheck test execution FAILED");
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		System.out.println("test() VESCollecter check " + cmdOutput);
+		if (cmdOutput.startsWith("VESCollecter_Is_Running ")) {
+			resp.setStatus(HealthTestStatus.GREEN);
+			resp.setMessageCode("OK");
+			logger.error("HealthTest: VESCollecter_Is_Running");
+			System.out.println("INFO: HealthTest: VESCollecter_Is_Running");
+		} else if (cmdOutput.startsWith("VESCollecter_Is_HavingError")) {
+			resp.setStatus(HealthTestStatus.YELLOW);
+			resp.setMessageCode("ERROR: VESCollecter_Is_HavingError");
+			logger.error("HealthTest: VESCollecter_Is_HavingError");
+			System.out.println("ERROR: HealthTest: VESCollecter_Is_HavingError");
+		} else {
+			resp.setStatus(HealthTestStatus.RED);
+			resp.setMessageCode("ERROR: VESCollecter_Is_Not_Running");
+			logger.error("HealthTest: VESCollecter_Is_Not_Running");
+			System.out.println("ERROR: HealthTest: VESCollecter_Is_Not_Running");
+		}
+
+		return resp;
+	}
+
+
       @Override
       public void configurationChanged() {
 		  // important to call the super methods for handling DMaaP setup.
@@ -128,7 +178,7 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends
 		  String cport = o.getCport();
 		  if (cport !=null) {
 					String cmd="";
-			cmd = "bin/Cec_controller_update.sh " + "collector.service.port" +" "+ cport;
+			cmd = "bin/VES_controller_update.sh " + "collector.service.port" +" "+ cport;
 			executeCommand(cmd);
 		  }
 
@@ -136,7 +186,7 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends
 		  String csecport = o.getCsecport();
 		  if (csecport !=null) {
 					String cmd="";
-						cmd = "bin/Cec_controller_update.sh " + "collector.service.secure.port" +" "+ csecport;
+						cmd = "bin/VES_controller_update.sh " + "collector.service.secure.port" +" "+ csecport;
 			executeCommand(cmd);
 		  }
 
@@ -144,85 +194,73 @@ public class DcaeControllerServiceStandardeventcollectorManagerProvider extends
 		  String keystoreloc = o.getKeystoreloc();
 		  if (cport !=null) {
 					String cmd="";
-						cmd = "bin/Cec_controller_update.sh " + "collector.keystore.file.location" +" "+ keystoreloc;
+						cmd = "bin/VES_controller_update.sh " + "collector.keystore.file.location" +" "+ keystoreloc;
 			executeCommand(cmd);
 		  }
 
-		  //Collector keystorepwd
-		  String keystorepwd = o.getKeystorepwd();
+		  //Collector keystorepwdfile
+		  String keystorepwdfile = o.getKeystorepwdloc();
 		  if (cport !=null) {
 					String cmd="";
-						cmd = "bin/Cec_controller_update.sh " + "collector.keystore.password" +" "+ keystorepwd;
+						cmd = "bin/VES_controller_update.sh " + "collector.keystore.passwordfile" +" "+ keystorepwdfile;
 			executeCommand(cmd);
 		  }
 
+		  //Collector keystorealias
+		  String keystorealias = o.getKeystorealias();
+		  if (cport !=null) {
+					String cmd="";
+						cmd = "bin/VES_controller_update.sh " + "collector.keystore.alias" +" "+ keystorealias;
+			executeCommand(cmd);
+		  }
 		  //Collector maxinputqueue
 		  String maxinputqueue = o.getCport();
 		  if (cport !=null) {
 					String cmd="";
-			cmd = "bin/Cec_controller_update.sh " + "collector.inputQueue.maxPending" +" "+ maxinputqueue;
+			cmd = "bin/VES_controller_update.sh " + "collector.inputQueue.maxPending" +" "+ maxinputqueue;
 			executeCommand(cmd);
 		  }
 		
-		  //authid
-		  String authid = o.getAuthid();
-		  if (authid != null && !authid.equals("")) {
-				  String cmd="";
-				 cmd = "bin/Cec_controller_update.sh " + "header.authid" +" "+ authid;
-		         executeCommand(cmd);
-			} else {
-				System.out.println("Auth ID is null");
-		   }
-
-			//authpwd
-			String authpwd = o.getAuthpwd();
-			if (authpwd != null && !authpwd.equals("")) {
+			//checkschemaflag
+			String checkschemaflag = o.getCheckschemaflag();
+			if (checkschemaflag != null && !checkschemaflag.equals("")) {
 				  String cmd="";
-				  cmd = "bin/Cec_controller_update.sh " + "header.authpwd" +" "+ authpwd;
+				  cmd = "bin/VES_controller_update.sh " + "collector.schema.checkflag" +" "+ checkschemaflag;
 		          executeCommand(cmd);
 
 			} else {
-				System.out.println("Auth Password is null");
+				System.out.println("Schemaflag is null");
 			}
 
-			// Auth file
-			String authfile = o.getAuthfile();
-			if (authfile != null && !authfile.equals("")) {
+			//authlist - replaces authid/pwd
+			String authlist = o.getAuthlist();
+			if (authlist != null && !authlist.equals("")) {
 				  String cmd="";
-				  cmd = "bin/Cec_controller_update.sh " + "header.authstore" +" "+ authfile;
+				  cmd = "bin/VES_controller_update.sh " + "header.authlist" +" "+ authlist;
 		          executeCommand(cmd);
 
 			} else {
-				System.out.println("authfile is null");
+				System.out.println("authlist is null");
 			}
-			
-			// Auth Flag
-			String authflag = o.getAuthflag();
-			if (authflag != null && !authflag.equals("")) {
-				  String cmd="";
-				  cmd = "bin/Cec_controller_update.sh " + "header.authflag" +" "+ authflag;
-		          executeCommand(cmd);
 
-			} else {
-				System.out.println("authflag is null");
-			}
-
-			//checkschemaflag
-			String checkschemaflag = o.getCheckschemaflag();
-			if (checkschemaflag != null && !checkschemaflag.equals("")) {
+			//StreamID
+			String streamid = o.getStreamid();
+			if (streamid != null && !streamid.equals("")) {
 				  String cmd="";
-				  cmd = "bin/Cec_controller_update.sh " + "collector.schema.checkflag" +" "+ checkschemaflag;
+				  cmd = "bin/VES_controller_update.sh " + "collector.dmaap.streamid" +" "+ streamid;
 		          executeCommand(cmd);
 
 			} else {
-				System.out.println("Schemaflag is null");
+				System.out.println("streamid is null");
 			}
 
+
+			
 			// schemafile
 			String schemafile = o.getSchemafile();
 			if (schemafile != null && !schemafile.equals("")) {
 				  String cmd="";
-				  cmd = "bin/Cec_controller_update.sh " + "collector.schema.file" +" "+ schemafile;
+				  cmd = "bin/VES_controller_update.sh " + "collector.schema.file" +" "+ schemafile;
 		          executeCommand(cmd);
 
 			} else {
@@ -328,8 +366,8 @@ private  JSONObject buildHpChannel(JSONObject tmpObj) {
 		mrClass = "HpCambriaInputStream";// getDmaapClass();
 	}
 
-	//basicAuthUsername = tmpObj.getString("dmaapUserName");
-	//basicAuthPassword = tmpObj.getString("dmaapPassword");
+	basicAuthUsername = tmpObj.getString("dmaapUserName");
+	basicAuthPassword = tmpObj.getString("dmaapPassword");
 	String dataTypeTmp = tmpObj.getString("dmaapDataType");
 	if (!dmaapDataType.equals(dataTypeTmp)) {
 		System.out.println("Invalid DataType (non message) recieved" + dataTypeTmp );
@@ -337,15 +375,7 @@ private  JSONObject buildHpChannel(JSONObject tmpObj) {
 	}
 	if (null != urlParts) {
 		mrUrl = urlParts[2];
-		
-		if (urlParts[3].equals("events"))
-		{
-			mrTopic = urlParts[4];
-		}
-		else
-		{
-			mrTopic = urlParts[3];
-		}
+		mrTopic = urlParts[4];
 		if (mrType.equals("subscribe") || mrType.equals("in")) {
 			if (urlParts.length > 4) {
 				hpGroup = urlParts[5];
@@ -358,16 +388,14 @@ private  JSONObject buildHpChannel(JSONObject tmpObj) {
 
 	hpName = tmpObj.getString("dmaapStreamId");
 
-	String[] hostport = mrUrl.split(":");
 	hpC.put("name", hpName);
 	hpC.put("type", mrType);
 	hpC.put("class", mrClass);
-	//hpC.put("cambria.url", mrUrl);
-	hpC.put("cambria.hosts", hostport[0]);
+	hpC.put("cambria.url", mrUrl);
 	hpC.put("cambria.topic", mrTopic);
-	//hpC.put("cambria.connectionType", sType);
-	//hpC.put("basicAuthUsername", basicAuthUsername);
-	//hpC.put("basicAuthPassword", basicAuthPassword);
+	hpC.put("cambria.connectionType", sType);
+	hpC.put("basicAuthUsername", basicAuthUsername);
+	hpC.put("basicAuthPassword", basicAuthPassword);
 	if (mrType.equals("out")) {
 		hpC.put("stripHpId", "true");
 	} else {
@@ -433,7 +461,7 @@ private void updateJsonToHPConfig(String sourceName,String targetfile, JSONArray
 	@Override  
 	public void start() {
 		  String cmd="";
-		  cmd = "bin/Cec_controller_update.sh " + "ADMIN" +" "+ "start";
+		  cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "start";
           executeCommand(cmd);
 
 		// TODO IMPLEMENT
@@ -443,7 +471,7 @@ private void updateJsonToHPConfig(String sourceName,String targetfile, JSONArray
 	@Override
 	public void suspend() {
 		  String cmd="";
-		  cmd = "bin/Cec_controller_update.sh " + "ADMIN" +" "+ "stop";
+		  cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "stop";
 		  executeCommand(cmd);
 	}
 
@@ -451,11 +479,11 @@ private void updateJsonToHPConfig(String sourceName,String targetfile, JSONArray
 	public void resume() {
 		
 		String cmd="";
-		cmd = "bin/Cec_controller_update.sh " + "ADMIN" +" "+ "stop";
+		cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "stop";
 		executeCommand(cmd);
 		  
 		cmd="";
-    	cmd = "bin/Cec_controller_update.sh " + "ADMIN" +" "+ "start";
+    	cmd = "bin/VES_controller_update.sh " + "ADMIN" +" "+ "start";
         executeCommand(cmd);
 
         // TODO IMPLEMENT
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java
index 8026f06..1dd8b09 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/java/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceProvider.java
@@ -61,7 +61,7 @@ public class DcaeControllerServiceStandardeventcollectorServiceProvider extends
             //EObject o1 =  ManagerFactory.eINSTANCE.createControllerServiceStandardeventcollectorManager();
 			ControllerServiceStandardeventcollectorManager o1 =  ManagerFactory.eINSTANCE.createControllerServiceStandardeventcollectorManager();
             ManagementServer.copy(findInstance(instanceName),o1);
-            o1.setKeystorepwd(JavaHttpClient.decryptPassword(o1.getKeystorepwd()));
+            //o1.setKeystorepwd(JavaHttpClient.decryptPassword(o1.getKeystorepwd()));
             
             return o1;
     }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/Cec_controller_update.sh b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/Cec_controller_update.sh
deleted file mode 100644
index 6edfa0e..0000000
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/Cec_controller_update.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-paramName=$1
-paramValue=$2
-#localpropertyfile="/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/collector.properties"
-#localadminscript="/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/bin/SErestfulCollector.sh"
-#tmpfile="/home/dcae/SEC/SE-Collector-1.0.0-SNAPSHOT/etc/collector.properties.tmp"
-
-localpropertyfile="/opt/app/SEC/etc/collector.properties"
-localadminscript="/opt/app/SEC/bin/SErestfulCollector.sh"
-tmpfile="/opt/app/SEC/etc/collector.properties.tmp"
-
-
-echo $paramName
-echo $paramValue
-
- 
-
-case $1 in 
-	"ADMIN")
-		echo $localadminscript $2
- 		$localadminscript $2
- 		;;
- 	*)
- 		rm $tmpfile
-		sed "s~$paramName=.*~$paramName=$paramValue~g" $localpropertyfile > $tmpfile
-		echo `cat $tmpfile > $localpropertyfile`
-		rm $tmpfile
-		#$localadminscript stop
-		#$localadminscript start
-		;;
-esac
-## To be modified for supporting DMAAP
\ No newline at end of file
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/VES_controller_update.sh b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/VES_controller_update.sh
new file mode 100644
index 0000000..c69e734
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/server/bin/VES_controller_update.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+paramName=$1
+paramValue=$2
+
+localpropertyfile="/opt/app/VESCollector/etc/collector.properties"
+localadminscript="/opt/app/VESCollector/bin/VESrestfulCollector.sh"
+tmpfile="/opt/app/VESCollector/etc/collector.properties.tmp"
+keystore="/opt/app/dcae-certificate/keystore.jks"
+keypwdfile="/opt/app/dcae-certificate/.password"
+
+echo "paramName:" $paramName "paramValue:" $paramValue
+
+
+case $1 in
+        "ADMIN")
+                echo $localadminscript $2
+                $localadminscript $2
+                ;;
+        *)
+                #rm $tmpfile
+                if [ $1 = "collector.keystore.alias" ]; then
+                        tmpalias=`/usr/bin/keytool -list -keystore $keystore < $keypwdfile | grep "col" | cut -d"," -f1`
+                        echo "tmpalias:" $tmpalias
+                        alias=`echo $tmpalias | cut -d":" -f2`
+                        echo "alias:" $alias
+                        sed "s~$paramName=.*~$paramName=$alias~g" $localpropertyfile > $tmpfile
+                        echo `cat $tmpfile > $localpropertyfile`
+                        rm $tmpfile
+                else
+                       sed "s~$paramName=.*~$paramName=$paramValue~g" $localpropertyfile > $tmpfile
+                       echo `cat $tmpfile > $localpropertyfile`
+                       rm $tmpfile
+                fi
+                ;;
+esac
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorManager.yaml b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorManager.yaml
index 6ab6771..b969a3f 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorManager.yaml
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorManager.yaml
@@ -1,69 +1,57 @@
 operations:
-  test: {}
-  suspend: {}
-  resume: {}
-  publicKey: {}
-  configurationChanged: {}
-  updateStreams: {}
-  REMOTE_test:
-    decription: Remote call test
-  REMOTE_suspend:
-    decription: Remote call suspend
-  REMOTE_resume:
-    decription: Remote call resume
-  REMOTE_publicKey:
-    decription: Remote call publicKey
-  REMOTE_configurationChanged:
-    decription: Remote call configurationChanged
-  REMOTE_updateStreams:
-    decription: Remote call updateStreams
+  ControllerServiceStandardeventcollectorManager@test: {}
+  ControllerServiceStandardeventcollectorManager@suspend: {}
+  ControllerServiceStandardeventcollectorManager@resume: {}
+  ControllerServiceStandardeventcollectorManager@publicKey: {}
+  ControllerServiceStandardeventcollectorManager@configurationChanged: {}
+  ControllerServiceStandardeventcollectorManager@updateStreams: {}
 messages:
   dummy: {}
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  publicKey:
-    errorCode: publicKey-FAILED-5001W
+  REQUEST-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  configurationChanged:
-    errorCode: configurationChanged-FAILED-5001W
+  REQUEST-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateStreams:
-    errorCode: updateStreams-FAILED-5001W
+  REQUEST-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_publicKey:
-    errorCode: REMOTE-publicKey-FAILED-5001W
+  REMOTE-CALL-FAILED-publicKey:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_configurationChanged:
-    errorCode: REMOTE-configurationChanged-FAILED-5001W
+  REMOTE-CALL-FAILED-configurationChanged:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateStreams:
-    errorCode: REMOTE-updateStreams-FAILED-5001W
+  REMOTE-CALL-FAILED-updateStreams:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorService.yaml b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorService.yaml
index c449feb..2f032a1 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorService.yaml
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/ControllerServiceStandardeventcollectorService.yaml
@@ -1,124 +1,102 @@
 operations:
-  deploy: {}
-  undeploy: {}
-  test: {}
-  suspend: {}
-  resume: {}
-  pushManagerConfiguration: {}
-  pollManagerConfiguration: {}
-  managerConfiguration: {}
-  managerOperation: {}
-  updateConfigurationFromPolicy: {}
-  runHealthTests: {}
-  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
+  ControllerServiceStandardeventcollectorService@deploy: {}
+  ControllerServiceStandardeventcollectorService@undeploy: {}
+  ControllerServiceStandardeventcollectorService@test: {}
+  ControllerServiceStandardeventcollectorService@suspend: {}
+  ControllerServiceStandardeventcollectorService@resume: {}
+  ControllerServiceStandardeventcollectorService@pushManagerConfiguration: {}
+  ControllerServiceStandardeventcollectorService@pollManagerConfiguration: {}
+  ControllerServiceStandardeventcollectorService@managerConfiguration: {}
+  ControllerServiceStandardeventcollectorService@managerOperation: {}
+  ControllerServiceStandardeventcollectorService@updateConfigurationFromPolicy: {}
+  ControllerServiceStandardeventcollectorService@runHealthTests: {}
 messages:
   dummy: {}
-  deploy:
-    errorCode: deploy-FAILED-5001W
+  REQUEST-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  undeploy:
-    errorCode: undeploy-FAILED-5001W
+  REQUEST-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  test:
-    errorCode: test-FAILED-5001W
+  REQUEST-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  suspend:
-    errorCode: suspend-FAILED-5001W
+  REQUEST-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  resume:
-    errorCode: resume-FAILED-5001W
+  REQUEST-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pushManagerConfiguration:
-    errorCode: pushManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  pollManagerConfiguration:
-    errorCode: pollManagerConfiguration-FAILED-5001W
+  REQUEST-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerConfiguration:
-    errorCode: managerConfiguration-FAILED-5001W
+  REQUEST-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  managerOperation:
-    errorCode: managerOperation-FAILED-5001W
+  REQUEST-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  updateConfigurationFromPolicy:
-    errorCode: updateConfigurationFromPolicy-FAILED-5001W
+  REQUEST-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  runHealthTests:
-    errorCode: runHealthTests-FAILED-5001W
+  REQUEST-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_deploy:
-    errorCode: REMOTE-deploy-FAILED-5001W
+  REMOTE-CALL-FAILED-deploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_undeploy:
-    errorCode: REMOTE-undeploy-FAILED-5001W
+  REMOTE-CALL-FAILED-undeploy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_test:
-    errorCode: REMOTE-test-FAILED-5001W
+  REMOTE-CALL-FAILED-test:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_suspend:
-    errorCode: REMOTE-suspend-FAILED-5001W
+  REMOTE-CALL-FAILED-suspend:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_resume:
-    errorCode: REMOTE-resume-FAILED-5001W
+  REMOTE-CALL-FAILED-resume:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pushManagerConfiguration:
-    errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pushManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_pollManagerConfiguration:
-    errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-pollManagerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerConfiguration:
-    errorCode: REMOTE-managerConfiguration-FAILED-5001W
+  REMOTE-CALL-FAILED-managerConfiguration:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_managerOperation:
-    errorCode: REMOTE-managerOperation-FAILED-5001W
+  REMOTE-CALL-FAILED-managerOperation:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_updateConfigurationFromPolicy:
-    errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_runHealthTests:
-    errorCode: REMOTE-runHealthTests-FAILED-5001W
+  REMOTE-CALL-FAILED-runHealthTests:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/GuiClientApi.yaml
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
 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
+  GuiClientApi@getTree: {}
+  GuiClientApi@getObject: {}
+  GuiClientApi@getTimeSerie: {}
+  GuiClientApi@getTable: {}
+  GuiClientApi@getHtml: {}
+  GuiClientApi@getGraph: {}
 messages:
   dummy: {}
-  getTree:
-    errorCode: getTree-FAILED-5001W
+  REQUEST-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getObject:
-    errorCode: getObject-FAILED-5001W
+  REQUEST-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTimeSerie:
-    errorCode: getTimeSerie-FAILED-5001W
+  REQUEST-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getTable:
-    errorCode: getTable-FAILED-5001W
+  REQUEST-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getHtml:
-    errorCode: getHtml-FAILED-5001W
+  REQUEST-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  getGraph:
-    errorCode: getGraph-FAILED-5001W
+  REQUEST-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Operation Failed with Exception
-  REMOTE_getTree:
-    errorCode: REMOTE-getTree-FAILED-5001W
+  REMOTE-CALL-FAILED-getTree:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getObject:
-    errorCode: REMOTE-getObject-FAILED-5001W
+  REMOTE-CALL-FAILED-getObject:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTimeSerie:
-    errorCode: REMOTE-getTimeSerie-FAILED-5001W
+  REMOTE-CALL-FAILED-getTimeSerie:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getTable:
-    errorCode: REMOTE-getTable-FAILED-5001W
+  REMOTE-CALL-FAILED-getTable:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getHtml:
-    errorCode: REMOTE-getHtml-FAILED-5001W
+  REMOTE-CALL-FAILED-getHtml:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
-  REMOTE_getGraph:
-    errorCode: REMOTE-getGraph-FAILED-5001W
+  REMOTE-CALL-FAILED-getGraph:
+    errorCode: 4001W
     messageFormat: '{0}'
     description: Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManager.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManager.java
index 3014ce6..17fcd51 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManager.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManager.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.man
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.standardeventcollector.servers.manager.logging.ControllerServiceStandardeventcollectorManagerOperationEnum;
+import org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging.ControllerServiceStandardeventcollectorManagerMessageEnum;
 
 
 
@@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.standardeventcollector.manager.impl
 
 
 
-public class DcaeControllerServiceStandardeventcollectorManager extends ControllerServiceStandardeventcollectorManagerImpl implements ISiriusPlugin {
+public class DcaeControllerServiceStandardeventcollectorManager extends ControllerServiceStandardeventcollectorManagerImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorManager.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeControllerServiceStandardeventcollectorManagerProvider controller;
 	ISiriusServer server;
 
@@ -68,8 +78,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_test,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test();
 		}
@@ -78,7 +88,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_suspend,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend();
 		}
@@ -103,7 +116,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_resume,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume();
 		}
@@ -128,7 +144,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.publicKey);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_publicKey,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_publicKey,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.publicKey();
 		}
@@ -153,7 +172,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.configurationChanged);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_configurationChanged,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_configurationChanged,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.configurationChanged();
 		}
@@ -178,7 +200,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -193,8 +218,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.updateStreams);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_updateStreams,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_updateStreams,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateStreams(inputStreams,outputStreams);
 		}
@@ -203,7 +228,10 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -217,6 +245,8 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -225,7 +255,7 @@ public class DcaeControllerServiceStandardeventcollectorManager extends Controll
 	public static void ecoreSetup() {
 		DcaeControllerServiceStandardeventcollectorManagerProvider.ecoreSetup();
 	}
-	public DcaeControllerServiceStandardeventcollectorManagerProvider getSomfProvider() {
+	public DcaeControllerServiceStandardeventcollectorManagerProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerClient.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerClient.java
index 17c4ce0..6140d03 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerClient.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co
 		DcaeControllerServiceStandardeventcollectorManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeControllerServiceStandardeventcollectorManagerClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeControllerServiceStandardeventcollectorManagerClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_test);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -88,16 +94,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co
 
 	@Override
 	public void suspend() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_suspend);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co
 
 	@Override
 	public void resume() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_resume);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -122,16 +130,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co
 
 	@Override
 	public java.lang.String publicKey() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_publicKey);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_publicKey,client.getRemote());
 		java.lang.String res;
 		try {
 		  res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_publicKey, e.toString());
-			throw new RuntimeException("remote call failed:  publicKey", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -139,16 +148,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co
 
 	@Override
 	public void configurationChanged() {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_configurationChanged);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_configurationChanged,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "configurationChanged", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_configurationChanged, e.toString());
-			throw new RuntimeException("remote call failed:  configurationChanged", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerClient extends Co
 
 	@Override
 	public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) {
-		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorManagerOperationEnum.REMOTE_updateStreams);
+		EClass c = ManagerPackage.eINSTANCE.getControllerServiceStandardeventcollectorManager(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorManagerOperationEnum.ControllerServiceStandardeventcollectorManager_updateStreams,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_updateStreams, e.toString());
-			throw new RuntimeException("remote call failed:  updateStreams", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerServer.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerServer.java
index bab474a..faba4e1 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerServer.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/DcaeControllerServiceStandardeventcollectorManagerServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.man
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.standardeventcollector.manager.ControllerServiceStandardeventcollectorManager;
@@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.standardeventcollector.servers.mana
 
 
 
-public class DcaeControllerServiceStandardeventcollectorManagerServer implements ISiriusServer {
+public class DcaeControllerServiceStandardeventcollectorManagerServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorManagerServer.class);
     String serverPath;
     ManagementServer server;
@@ -69,6 +68,7 @@ public class DcaeControllerServiceStandardeventcollectorManagerServer implements
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "ControllerServiceStandardeventcollectorManager", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
 		server.addFactory(org.openecomp.dcae.controller.service.standardeventcollector.service.ServiceFactory.eINSTANCE);
@@ -81,6 +81,7 @@ public class DcaeControllerServiceStandardeventcollectorManagerServer implements
         controller = (DcaeControllerServiceStandardeventcollectorManager) server.find("/").o;
         webServer = new Jetty8Server("manager.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
     
@@ -109,4 +110,17 @@ public class DcaeControllerServiceStandardeventcollectorManagerServer implements
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApi.java
index 2f96918..4c07551 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApi.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApi.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.man
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.standardeventcollector.servers.manager.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging.GuiClientApiMessageEnum;
 
 
 
@@ -81,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
 
 
 
-public class DcaeGuiClientApi extends GuiClientApiImpl {
+public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
 	public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeGuiClientApiProvider controller;
 	ISiriusServer server;
 
@@ -98,8 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getTree);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTree();
 		}
@@ -108,7 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -123,8 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		if (server != null)
 			server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.getObject);
+		ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getObject(path);
 		}
@@ -133,7 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -148,8 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTimeSerie(path,start,end,duration);
 		}
@@ -158,7 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -173,8 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getTable(path,start,end);
 		}
@@ -183,7 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -198,8 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getHtml(path,start,end);
 		}
@@ -208,7 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -223,8 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 		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.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.getGraph(path,start,end);
 		}
@@ -233,7 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 			if (server != null)
 				server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString());
+			EcompException e1 =  EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -247,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl {
 
 
 
+
+
 	public static void ecoreSetup() {
 		DcaeGuiClientApiProvider.ecoreSetup();
 	}
-	public DcaeGuiClientApiProvider getSomfProvider() {
+	public DcaeGuiClientApiProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApiClient.java
index dbbdf22..e507b7c 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApiClient.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/DcaeGuiClientApiClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 		DcaeControllerServiceStandardeventcollectorManager.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/gui", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeGuiClientApiClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() {
-		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTree, e.toString());
-			throw new RuntimeException("remote call failed:  getTree", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getObject, e.toString());
-			throw new RuntimeException("remote call failed:  getObject", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTimeSerie, e.toString());
-			throw new RuntimeException("remote call failed:  getTimeSerie", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTable, e.toString());
-			throw new RuntimeException("remote call failed:  getTable", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote());
 		org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res;
 		try {
 		  res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getHtml, e.toString());
-			throw new RuntimeException("remote call failed:  getHtml", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl {
 
 	@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);
+		EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); 
+		ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote());
 		org.openecomp.ncomp.sirius.manager.graph.GuiGraph res;
 		try {
 		  res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getGraph, e.toString());
-			throw new RuntimeException("remote call failed:  getGraph", e);
+			ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString());
+			EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi.properties
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-getTree=\
-  getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+  REQUEST-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getObject=\
-  getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+  REQUEST-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTimeSerie=\
-  getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+  REQUEST-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getTable=\
-  getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+  REQUEST-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getHtml=\
-  getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+  REQUEST-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-getGraph=\
-  getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+  REQUEST-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_getTree=\
-  REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+  REMOTE-CALL-FAILED-getTree-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getObject=\
-  REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+  REMOTE-CALL-FAILED-getObject-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTimeSerie=\
-  REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+  REMOTE-CALL-FAILED-getTimeSerie-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getTable=\
-  REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+  REMOTE-CALL-FAILED-getTable-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getHtml=\
-  REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+  REMOTE-CALL-FAILED-getHtml-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_getGraph=\
-  REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+  REMOTE-CALL-FAILED-getGraph-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiMessageEnum.java
index 8cf3235..46f787f 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiMessageEnum.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ 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;
+  REQUEST_FAILED_getTree,
+  REQUEST_FAILED_getObject,
+  REQUEST_FAILED_getTimeSerie,
+  REQUEST_FAILED_getTable,
+  REQUEST_FAILED_getHtml,
+  REQUEST_FAILED_getGraph,
+  REMOTE_CALL_FAILED_getTree,
+  REMOTE_CALL_FAILED_getObject,
+  REMOTE_CALL_FAILED_getTimeSerie,
+  REMOTE_CALL_FAILED_getTable,
+  REMOTE_CALL_FAILED_getHtml,
+  REMOTE_CALL_FAILED_getGraph;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging.GuiClientApi");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApi");
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiOperationEnum.java
index c1e38aa..90c1ec1 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiOperationEnum.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.gui.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum GuiClientApiOperationEnum implements EcompOperationEnum {
 
-  getTree,
-  getObject,
-  getTimeSerie,
-  getTable,
-  getHtml,
-  getGraph,
-  REMOTE_getTree,
-  REMOTE_getObject,
-  REMOTE_getTimeSerie,
-  REMOTE_getTable,
-  REMOTE_getHtml,
-  REMOTE_getGraph;
+  GuiClientApi_getTree("GuiClientApi@getTree"),
+  GuiClientApi_getObject("GuiClientApi@getObject"),
+  GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"),
+  GuiClientApi_getTable("GuiClientApi@getTable"),
+  GuiClientApi_getHtml("GuiClientApi@getHtml"),
+  GuiClientApi_getGraph("GuiClientApi@getGraph") ; 
+
+
+	private String n;
+	
+	private GuiClientApiOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager.properties b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager.properties
index ef19f9b..4580ed4 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager.properties
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager.properties
@@ -1,78 +1,78 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-publicKey=\
-  publicKey-FAILED-5001W|\
+REQUEST_FAILED_publicKey=\
+  REQUEST-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-configurationChanged=\
-  configurationChanged-FAILED-5001W|\
+REQUEST_FAILED_configurationChanged=\
+  REQUEST-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateStreams=\
-  updateStreams-FAILED-5001W|\
+REQUEST_FAILED_updateStreams=\
+  REQUEST-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_publicKey=\
-  REMOTE-publicKey-FAILED-5001W|\
+REMOTE_CALL_FAILED_publicKey=\
+  REMOTE-CALL-FAILED-publicKey-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_configurationChanged=\
-  REMOTE-configurationChanged-FAILED-5001W|\
+REMOTE_CALL_FAILED_configurationChanged=\
+  REMOTE-CALL-FAILED-configurationChanged-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateStreams=\
-  REMOTE-updateStreams-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateStreams=\
+  REMOTE-CALL-FAILED-updateStreams-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerMessageEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerMessageEnum.java
index 63cf554..d09ef72 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerMessageEnum.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum ControllerServiceStandardeventcollectorManagerMessageEnum implements EcompMessageEnum {
 
   dummy,
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams;
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_publicKey,
+  REQUEST_FAILED_configurationChanged,
+  REQUEST_FAILED_updateStreams,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_publicKey,
+  REMOTE_CALL_FAILED_configurationChanged,
+  REMOTE_CALL_FAILED_updateStreams;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging.ControllerServiceStandardeventcollectorManager");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManager");
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerOperationEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerOperationEnum.java
index f15b357..5d2f6b5 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerOperationEnum.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/manager/logging/ControllerServiceStandardeventcollectorManagerOperationEnum.java
@@ -1,41 +1,27 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.standardeventcollector.servers.manager.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum ControllerServiceStandardeventcollectorManagerOperationEnum implements EcompOperationEnum {
 
-  test,
-  suspend,
-  resume,
-  publicKey,
-  configurationChanged,
-  updateStreams,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_publicKey,
-  REMOTE_configurationChanged,
-  REMOTE_updateStreams;
+  ControllerServiceStandardeventcollectorManager_test("ControllerServiceStandardeventcollectorManager@test"),
+  ControllerServiceStandardeventcollectorManager_suspend("ControllerServiceStandardeventcollectorManager@suspend"),
+  ControllerServiceStandardeventcollectorManager_resume("ControllerServiceStandardeventcollectorManager@resume"),
+  ControllerServiceStandardeventcollectorManager_publicKey("ControllerServiceStandardeventcollectorManager@publicKey"),
+  ControllerServiceStandardeventcollectorManager_configurationChanged("ControllerServiceStandardeventcollectorManager@configurationChanged"),
+  ControllerServiceStandardeventcollectorManager_updateStreams("ControllerServiceStandardeventcollectorManager@updateStreams") ; 
+
+
+	private String n;
+	
+	private ControllerServiceStandardeventcollectorManagerOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorService.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorService.java
index 24aac3f..51dc413 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorService.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorService.java
@@ -25,24 +25,34 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.ser
 
 
 
+
+
 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.ISiriusProvider;
+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.openecomp.ncomp.sirius.manager.logging.NcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 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.service.standardeventcollector.servers.service.logging.ControllerServiceStandardeventcollectorServiceOperationEnum;
+import org.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging.ControllerServiceStandardeventcollectorServiceMessageEnum;
 
 
 
@@ -51,9 +61,9 @@ import org.openecomp.dcae.controller.service.standardeventcollector.service.impl
 
 
 
-public class DcaeControllerServiceStandardeventcollectorService extends ControllerServiceStandardeventcollectorServiceImpl implements ISiriusPlugin {
+public class DcaeControllerServiceStandardeventcollectorService extends ControllerServiceStandardeventcollectorServiceImpl implements ISiriusProvider, ISiriusPlugin {
 	public static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorService.class);
-	static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+	static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
 	public DcaeControllerServiceStandardeventcollectorServiceProvider controller;
 	ISiriusServer server;
 
@@ -68,8 +78,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.deploy);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_deploy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_deploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.deploy(instanceName,containerPath);
 		}
@@ -78,7 +88,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_deploy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.undeploy);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_undeploy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_undeploy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.undeploy(instanceName);
 		}
@@ -103,7 +116,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.test);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_test,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_test,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.test(instanceName);
 		}
@@ -128,7 +144,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_test, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_test, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.suspend);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_suspend,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_suspend,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.suspend(instanceName);
 		}
@@ -153,7 +172,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_suspend, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.resume);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_resume,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_resume,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.resume(instanceName);
 		}
@@ -178,7 +200,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_resume, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -193,8 +218,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.pushManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pushManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pushManagerConfiguration(instanceName);
 		}
@@ -203,7 +228,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -218,8 +246,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.pollManagerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pollManagerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.pollManagerConfiguration(instanceName);
 		}
@@ -228,7 +256,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -243,8 +274,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.managerConfiguration);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerConfiguration,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerConfiguration,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerConfiguration(instanceName);
 		}
@@ -253,7 +284,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -268,8 +302,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.managerOperation);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerOperation,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerOperation,"self:" + ManagementServer.object2ref(this));
 		try {
 			res =  controller.managerOperation(instanceName,operation,parameters);
 		}
@@ -278,7 +312,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -293,8 +330,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.updateConfigurationFromPolicy);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_updateConfigurationFromPolicy,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.updateConfigurationFromPolicy(instanceName);
 		}
@@ -303,7 +340,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -318,8 +358,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 		if (server != null)
 			server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_);
 		Date now_ = new Date();
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.runHealthTests);
+		ecomplogger.recordAuditEventStartIfNeeded(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_runHealthTests,server,this);
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_runHealthTests,"self:" + ManagementServer.object2ref(this));
 		try {
 			 controller.runHealthTests();
 		}
@@ -328,7 +368,10 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 			if (server != null)
 				server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_);
 			System.err.println("ERROR: " + e);
-			throw e;
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString());
+			EcompException e1 =  EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, ControllerServiceStandardeventcollectorServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		duration_ = new Date().getTime()-now_.getTime();
@@ -342,6 +385,8 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 
 
 
+
+
 	@Override
 	public void start() {
 		controller.start();
@@ -350,7 +395,7 @@ public class DcaeControllerServiceStandardeventcollectorService extends Controll
 	public static void ecoreSetup() {
 		DcaeControllerServiceStandardeventcollectorServiceProvider.ecoreSetup();
 	}
-	public DcaeControllerServiceStandardeventcollectorServiceProvider getSomfProvider() {
+	public DcaeControllerServiceStandardeventcollectorServiceProvider getSiriusProvider() {
 		return controller;
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceClient.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceClient.java
index 329a18e..cbc99d4 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceClient.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceClient.java
@@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient;
 import org.apache.log4j.Logger;
 
 import org.openecomp.logger.EcompLogger;
+import org.openecomp.logger.StatusCodeEnum;
+import org.openecomp.logger.EcompException;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
@@ -54,33 +56,37 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 		DcaeControllerServiceStandardeventcollectorService.ecoreSetup(); 
 		client = new GenericHttpClient(file,name);
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 	public DcaeControllerServiceStandardeventcollectorServiceClient(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);
+		client.setVersion("ONAP-R2");
 	}
 	
 	public DcaeControllerServiceStandardeventcollectorServiceClient(AbstractClient c) {
 		client = c;
 		client.add("/resources", this);
+		client.setVersion("ONAP-R2");
 	}
 
 
 
 	@Override
 	public void deploy(java.lang.String instanceName, java.lang.String containerPath) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_deploy);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_deploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "deploy", null, instanceName,containerPath);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_deploy, e.toString());
-			throw new RuntimeException("remote call failed:  deploy", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -88,16 +94,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public void undeploy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_undeploy);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_undeploy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "undeploy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_undeploy, e.toString());
-			throw new RuntimeException("remote call failed:  undeploy", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -105,16 +112,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_test);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_test,client.getRemote());
 		org.openecomp.dcae.controller.core.service.HealthTestResponse res;
 		try {
 		  res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_test, e.toString());
-			throw new RuntimeException("remote call failed:  test", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -122,16 +130,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public void suspend(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_suspend);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_suspend,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "suspend", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_suspend, e.toString());
-			throw new RuntimeException("remote call failed:  suspend", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -139,16 +148,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public void resume(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_resume);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_resume,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "resume", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_resume, e.toString());
-			throw new RuntimeException("remote call failed:  resume", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -156,16 +166,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public void pushManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_pushManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pushManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pushManagerConfiguration", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -173,16 +184,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public void pollManagerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_pollManagerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_pollManagerConfiguration,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  pollManagerConfiguration", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -190,16 +202,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_managerConfiguration);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerConfiguration,client.getRemote());
 		org.eclipse.emf.ecore.EObject res;
 		try {
 		  res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_managerConfiguration, e.toString());
-			throw new RuntimeException("remote call failed:  managerConfiguration", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -207,16 +220,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_managerOperation);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_managerOperation,client.getRemote());
 		org.json.JSONObject res;
 		try {
 		  res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_managerOperation, e.toString());
-			throw new RuntimeException("remote call failed:  managerOperation", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		return res;
@@ -224,16 +238,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public void updateConfigurationFromPolicy(java.lang.String instanceName) {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_updateConfigurationFromPolicy);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_updateConfigurationFromPolicy,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString());
-			throw new RuntimeException("remote call failed:  updateConfigurationFromPolicy", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
@@ -241,16 +256,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceClient extends Co
 
 	@Override
 	public void runHealthTests() {
-		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); //foo
-		ecomplogger.recordMetricEventStart();
-		ecomplogger.setOperation(ControllerServiceStandardeventcollectorServiceOperationEnum.REMOTE_runHealthTests);
+		EClass c = ServicePackage.eINSTANCE.getControllerServiceStandardeventcollectorService(); 
+		ecomplogger.recordMetricEventStart(ControllerServiceStandardeventcollectorServiceOperationEnum.ControllerServiceStandardeventcollectorService_runHealthTests,client.getRemote());
 		
 		try {
 		  client.operationPath("/resources", c, "runHealthTests", null);
 		}
 		catch (Exception e) {
-			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_runHealthTests, e.toString());
-			throw new RuntimeException("remote call failed:  runHealthTests", e);
+			ecomplogger.warn(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString());
+			EcompException e1 = EcompException.create(ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage());
+			ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,ControllerServiceStandardeventcollectorServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage());
+			throw e1;
 		}
 		ecomplogger.recordMetricEventEnd();
 		
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceServer.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceServer.java
index 0f7ffa4..4a56e1a 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceServer.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/DcaeControllerServiceStandardeventcollectorServiceServer.java
@@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.standardeventcollector.servers.ser
 import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath;
 
 import java.io.IOException;
+import java.io.InputStream;
 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.json.JSONObject;
 import org.openecomp.ncomp.sirius.manager.Jetty8Server;
 import org.openecomp.ncomp.sirius.manager.ManagementServer;
+import org.openecomp.ncomp.sirius.manager.IRequestHandler;
 import org.openecomp.ncomp.sirius.manager.ISiriusServer;
 
 import org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorService;
@@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.standardeventcollector.service.Cont
 
 
 
-public class DcaeControllerServiceStandardeventcollectorServiceServer implements ISiriusServer {
+public class DcaeControllerServiceStandardeventcollectorServiceServer implements ISiriusServer, IRequestHandler {
     public static final Logger logger = Logger.getLogger(DcaeControllerServiceStandardeventcollectorServiceServer.class);
     String serverPath;
     ManagementServer server;
@@ -64,6 +63,7 @@ public class DcaeControllerServiceStandardeventcollectorServiceServer implements
 		props = getPropertiesFromClasspath(filename);
         serverPath = (String) props.get("server.dir");
         server = new ManagementServer(f, "ControllerServiceStandardeventcollectorService", serverPath, filename);
+        ManagementServer.setBuildVersion("ONAP-R2");
         server.addFactory(f);
 
         server.addRuntimeFactories(this);
@@ -73,6 +73,7 @@ public class DcaeControllerServiceStandardeventcollectorServiceServer implements
         controller = (DcaeControllerServiceStandardeventcollectorService) server.find("/").o;
         webServer = new Jetty8Server("service.properties");
         webServer.add("/resources",server);
+        webServer.add("/api",this);
 
 
 
@@ -95,4 +96,17 @@ public class DcaeControllerServiceStandardeventcollectorServiceServer implements
 	public ManagementServer getServer() {
 		return server;
 	}
+	public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context,
+			String clientVersion) {
+		switch ((String) context.get("path")) {
+		case "/api/versions":
+			return server.supportedVersions();
+		}
+		logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2));
+		throw new RuntimeException("Unknown request");
+	}
+	public Object handleBinary(String userName, String action, String resourcePath, InputStream in) {
+		return null;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService.properties b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService.properties
index 13a57d6..f3a3955 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService.properties
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService.properties
@@ -1,138 +1,138 @@
 
 dummy=\
-  null|\
+  dummy-null|\
   null|\
   null|\
   null
 
-deploy=\
-  deploy-FAILED-5001W|\
+REQUEST_FAILED_deploy=\
+  REQUEST-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-undeploy=\
-  undeploy-FAILED-5001W|\
+REQUEST_FAILED_undeploy=\
+  REQUEST-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-test=\
-  test-FAILED-5001W|\
+REQUEST_FAILED_test=\
+  REQUEST-FAILED-test-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-suspend=\
-  suspend-FAILED-5001W|\
+REQUEST_FAILED_suspend=\
+  REQUEST-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-resume=\
-  resume-FAILED-5001W|\
+REQUEST_FAILED_resume=\
+  REQUEST-FAILED-resume-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pushManagerConfiguration=\
-  pushManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pushManagerConfiguration=\
+  REQUEST-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-pollManagerConfiguration=\
-  pollManagerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_pollManagerConfiguration=\
+  REQUEST-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerConfiguration=\
-  managerConfiguration-FAILED-5001W|\
+REQUEST_FAILED_managerConfiguration=\
+  REQUEST-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-managerOperation=\
-  managerOperation-FAILED-5001W|\
+REQUEST_FAILED_managerOperation=\
+  REQUEST-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-updateConfigurationFromPolicy=\
-  updateConfigurationFromPolicy-FAILED-5001W|\
+REQUEST_FAILED_updateConfigurationFromPolicy=\
+  REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-runHealthTests=\
-  runHealthTests-FAILED-5001W|\
+REQUEST_FAILED_runHealthTests=\
+  REQUEST-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Operation Failed with Exception
 
-REMOTE_deploy=\
-  REMOTE-deploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_deploy=\
+  REMOTE-CALL-FAILED-deploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_undeploy=\
-  REMOTE-undeploy-FAILED-5001W|\
+REMOTE_CALL_FAILED_undeploy=\
+  REMOTE-CALL-FAILED-undeploy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_test=\
-  REMOTE-test-FAILED-5001W|\
+REMOTE_CALL_FAILED_test=\
+  REMOTE-CALL-FAILED-test-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_suspend=\
-  REMOTE-suspend-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspend=\
+  REMOTE-CALL-FAILED-suspend-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_resume=\
-  REMOTE-resume-FAILED-5001W|\
+REMOTE_CALL_FAILED_resume=\
+  REMOTE-CALL-FAILED-resume-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pushManagerConfiguration=\
-  REMOTE-pushManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pushManagerConfiguration=\
+  REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_pollManagerConfiguration=\
-  REMOTE-pollManagerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_pollManagerConfiguration=\
+  REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerConfiguration=\
-  REMOTE-managerConfiguration-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerConfiguration=\
+  REMOTE-CALL-FAILED-managerConfiguration-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_managerOperation=\
-  REMOTE-managerOperation-FAILED-5001W|\
+REMOTE_CALL_FAILED_managerOperation=\
+  REMOTE-CALL-FAILED-managerOperation-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_updateConfigurationFromPolicy=\
-  REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\
+REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\
+  REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
 
-REMOTE_runHealthTests=\
-  REMOTE-runHealthTests-FAILED-5001W|\
+REMOTE_CALL_FAILED_runHealthTests=\
+  REMOTE-CALL-FAILED-runHealthTests-4001W|\
   {0}|\
   null|\
   Remote Operation Failed with Exception
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceMessageEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceMessageEnum.java
index 674f680..b0a5f44 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceMessageEnum.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceMessageEnum.java
@@ -1,25 +1,4 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging;
 
 import com.att.eelf.i18n.EELFResourceManager;
@@ -28,30 +7,30 @@ import org.openecomp.logger.EcompMessageEnum;
 public enum ControllerServiceStandardeventcollectorServiceMessageEnum implements EcompMessageEnum {
 
   dummy,
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests;
+  REQUEST_FAILED_deploy,
+  REQUEST_FAILED_undeploy,
+  REQUEST_FAILED_test,
+  REQUEST_FAILED_suspend,
+  REQUEST_FAILED_resume,
+  REQUEST_FAILED_pushManagerConfiguration,
+  REQUEST_FAILED_pollManagerConfiguration,
+  REQUEST_FAILED_managerConfiguration,
+  REQUEST_FAILED_managerOperation,
+  REQUEST_FAILED_updateConfigurationFromPolicy,
+  REQUEST_FAILED_runHealthTests,
+  REMOTE_CALL_FAILED_deploy,
+  REMOTE_CALL_FAILED_undeploy,
+  REMOTE_CALL_FAILED_test,
+  REMOTE_CALL_FAILED_suspend,
+  REMOTE_CALL_FAILED_resume,
+  REMOTE_CALL_FAILED_pushManagerConfiguration,
+  REMOTE_CALL_FAILED_pollManagerConfiguration,
+  REMOTE_CALL_FAILED_managerConfiguration,
+  REMOTE_CALL_FAILED_managerOperation,
+  REMOTE_CALL_FAILED_updateConfigurationFromPolicy,
+  REMOTE_CALL_FAILED_runHealthTests;
 
 	static {
-		EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging.ControllerServiceStandardeventcollectorService");
+		EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorService");
 	}
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceOperationEnum.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceOperationEnum.java
index 9ed3453..913d17d 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceOperationEnum.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/standardeventcollector/servers/service/logging/ControllerServiceStandardeventcollectorServiceOperationEnum.java
@@ -1,51 +1,32 @@
 
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0 
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-	
-
 package org.openecomp.dcae.controller.service.standardeventcollector.servers.service.logging;
 
 import org.openecomp.entity.EcompOperationEnum;
 
 public enum ControllerServiceStandardeventcollectorServiceOperationEnum implements EcompOperationEnum {
 
-  deploy,
-  undeploy,
-  test,
-  suspend,
-  resume,
-  pushManagerConfiguration,
-  pollManagerConfiguration,
-  managerConfiguration,
-  managerOperation,
-  updateConfigurationFromPolicy,
-  runHealthTests,
-  REMOTE_deploy,
-  REMOTE_undeploy,
-  REMOTE_test,
-  REMOTE_suspend,
-  REMOTE_resume,
-  REMOTE_pushManagerConfiguration,
-  REMOTE_pollManagerConfiguration,
-  REMOTE_managerConfiguration,
-  REMOTE_managerOperation,
-  REMOTE_updateConfigurationFromPolicy,
-  REMOTE_runHealthTests;
+  ControllerServiceStandardeventcollectorService_deploy("ControllerServiceStandardeventcollectorService@deploy"),
+  ControllerServiceStandardeventcollectorService_undeploy("ControllerServiceStandardeventcollectorService@undeploy"),
+  ControllerServiceStandardeventcollectorService_test("ControllerServiceStandardeventcollectorService@test"),
+  ControllerServiceStandardeventcollectorService_suspend("ControllerServiceStandardeventcollectorService@suspend"),
+  ControllerServiceStandardeventcollectorService_resume("ControllerServiceStandardeventcollectorService@resume"),
+  ControllerServiceStandardeventcollectorService_pushManagerConfiguration("ControllerServiceStandardeventcollectorService@pushManagerConfiguration"),
+  ControllerServiceStandardeventcollectorService_pollManagerConfiguration("ControllerServiceStandardeventcollectorService@pollManagerConfiguration"),
+  ControllerServiceStandardeventcollectorService_managerConfiguration("ControllerServiceStandardeventcollectorService@managerConfiguration"),
+  ControllerServiceStandardeventcollectorService_managerOperation("ControllerServiceStandardeventcollectorService@managerOperation"),
+  ControllerServiceStandardeventcollectorService_updateConfigurationFromPolicy("ControllerServiceStandardeventcollectorService@updateConfigurationFromPolicy"),
+  ControllerServiceStandardeventcollectorService_runHealthTests("ControllerServiceStandardeventcollectorService@runHealthTests") ; 
+
+
+	private String n;
+	
+	private ControllerServiceStandardeventcollectorServiceOperationEnum(String n) {
+		this.n = n;
+	}
+
+	@Override
+	public String toString() {
+		return n;
+	}
+
 }
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.classpath b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.classpath
index 69b19c6..fa22bb1 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.classpath
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.classpath
@@ -1,17 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/xcore">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/classes" path="src/main/xcore-gen">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src/main/xcore-gen"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.project b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.project
index 95decc1..cf16113 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.project
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.project
@@ -25,8 +25,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.core.resources.prefs b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..447ff97
--- /dev/null
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/xcore=UTF-8
+encoding//src/main/xcore-gen=UTF-8
+encoding/<project>=UTF-8
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.jdt.core.prefs b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.jdt.core.prefs
index 4ede96d..13b3428 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.jdt.core.prefs
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/.settings/org.eclipse.jdt.core.prefs
@@ -1,2 +1,13 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/META-INF/MANIFEST.MF b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/META-INF/MANIFEST.MF
index befd3c9..bbb2695 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/META-INF/MANIFEST.MF
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/META-INF/MANIFEST.MF
@@ -16,17 +16,5 @@ Export-Package: org.openecomp.dcae.controller.service.standardeventcollector.man
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.ecore.xcore.lib,
- dcae-controller-core-model;visibility:=reexport,
- ncomp-core-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-openstack-model;visibility:=reexport,
- ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport,
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0",
- dcae-controller-service-docker-model;bundle-version="0.1.0";visibility:=reexport,
- dcae-controller-service-standardeventcollector-model;visibility:=reexport,
- ncomp-sirius-manager-agent-model;visibility:=reexport,
- ncomp-docker-model;visibility:=reexport,
- dcae-controller-service-docker-host-model;visibility:=reexport,
- dcae-controller-service-vm-model;visibility:=reexport
+ org.eclipse.emf.ecore.xcore.lib
 Bundle-ActivationPolicy: lazy
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/ManagerPackage.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/ManagerPackage.java
index a926505..d6b2f00 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/ManagerPackage.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/ManagerPackage.java
@@ -40,6 +40,24 @@ import org.eclipse.emf.ecore.EPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.standardeventcollector.manager.ManagerFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.standardeventcollector'"
@@ -143,31 +161,31 @@ public interface ManagerPackage extends EPackage {
 	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Keystorepwd</b></em>' attribute.
+	 * The feature id for the '<em><b>Keystorealias</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 3;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute.
+	 * The feature id for the '<em><b>Keystorepwdloc</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 4;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Authid</b></em>' attribute.
+	 * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 5;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Authflag</b></em>' attribute.
@@ -179,40 +197,40 @@ public interface ManagerPackage extends EPackage {
 	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Authpwd</b></em>' attribute.
+	 * The feature id for the '<em><b>Authlist</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 7;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Authfile</b></em>' attribute.
+	 * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 8;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute.
+	 * The feature id for the '<em><b>Schemafile</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 9;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Schemafile</b></em>' attribute.
+	 * The feature id for the '<em><b>Streamid</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 10;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID = DockermanagerPackage.DOCKER_MANAGER_FEATURE_COUNT + 10;
 
 	/**
 	 * The number of structural features of the '<em>Controller Service Standardeventcollector Manager</em>' class.
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/impl/ControllerServiceStandardeventcollectorManagerImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/impl/ControllerServiceStandardeventcollectorManagerImpl.java
index 24761cc..10c02e8 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/impl/ControllerServiceStandardeventcollectorManagerImpl.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/impl/ControllerServiceStandardeventcollectorManagerImpl.java
@@ -24,12 +24,11 @@
 package org.openecomp.dcae.controller.service.standardeventcollector.manager.impl;
 
 import org.openecomp.dcae.controller.service.dockermanager.impl.DockerManagerImpl;
-
 import org.openecomp.dcae.controller.service.standardeventcollector.manager.ControllerServiceStandardeventcollectorManager;
 import org.openecomp.dcae.controller.service.standardeventcollector.manager.ManagerPackage;
-
 import org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration;
 import org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
@@ -40,20 +39,20 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getCport <em>Cport</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getCsecport <em>Csecport</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getKeystoreloc <em>Keystoreloc</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getKeystorepwd <em>Keystorepwd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getKeystorealias <em>Keystorealias</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getKeystorepwdloc <em>Keystorepwdloc</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getMaxinputqueue <em>Maxinputqueue</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthid <em>Authid</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthflag <em>Authflag</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthpwd <em>Authpwd</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthfile <em>Authfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getAuthlist <em>Authlist</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getCheckschemaflag <em>Checkschemaflag</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getSchemafile <em>Schemafile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.manager.impl.ControllerServiceStandardeventcollectorManagerImpl#getStreamid <em>Streamid</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -113,59 +112,59 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 */
 	protected String keystoreloc = KEYSTORELOC_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute.
+	 * The default value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getKeystorepwd()
+	 * @see #getKeystorealias()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String KEYSTOREPWD_EDEFAULT = null;
+	protected static final String KEYSTOREALIAS_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute.
+	 * The cached value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getKeystorepwd()
+	 * @see #getKeystorealias()
 	 * @generated
 	 * @ordered
 	 */
-	protected String keystorepwd = KEYSTOREPWD_EDEFAULT;
+	protected String keystorealias = KEYSTOREALIAS_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
+	 * The default value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMaxinputqueue()
+	 * @see #getKeystorepwdloc()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String MAXINPUTQUEUE_EDEFAULT = null;
+	protected static final String KEYSTOREPWDLOC_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
+	 * The cached value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMaxinputqueue()
+	 * @see #getKeystorepwdloc()
 	 * @generated
 	 * @ordered
 	 */
-	protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT;
+	protected String keystorepwdloc = KEYSTOREPWDLOC_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getAuthid() <em>Authid</em>}' attribute.
+	 * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthid()
+	 * @see #getMaxinputqueue()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHID_EDEFAULT = null;
+	protected static final String MAXINPUTQUEUE_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getAuthid() <em>Authid</em>}' attribute.
+	 * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthid()
+	 * @see #getMaxinputqueue()
 	 * @generated
 	 * @ordered
 	 */
-	protected String authid = AUTHID_EDEFAULT;
+	protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT;
 	/**
 	 * The default value of the '{@link #getAuthflag() <em>Authflag</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -185,41 +184,23 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 */
 	protected String authflag = AUTHFLAG_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthpwd()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHPWD_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthpwd()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authpwd = AUTHPWD_EDEFAULT;
-	/**
-	 * The default value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute.
+	 * The default value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthfile()
+	 * @see #getAuthlist()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHFILE_EDEFAULT = null;
+	protected static final String AUTHLIST_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute.
+	 * The cached value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthfile()
+	 * @see #getAuthlist()
 	 * @generated
 	 * @ordered
 	 */
-	protected String authfile = AUTHFILE_EDEFAULT;
+	protected String authlist = AUTHLIST_EDEFAULT;
 	/**
 	 * The default value of the '{@link #getCheckschemaflag() <em>Checkschemaflag</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -257,6 +238,24 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 */
 	protected String schemafile = SCHEMAFILE_EDEFAULT;
 	/**
+	 * The default value of the '{@link #getStreamid() <em>Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STREAMID_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getStreamid() <em>Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected String streamid = STREAMID_EDEFAULT;
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -343,8 +342,8 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getKeystorepwd() {
-		return keystorepwd;
+	public String getKeystorealias() {
+		return keystorealias;
 	}
 
 	/**
@@ -352,11 +351,11 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setKeystorepwd(String newKeystorepwd) {
-		String oldKeystorepwd = keystorepwd;
-		keystorepwd = newKeystorepwd;
+	public void setKeystorealias(String newKeystorealias) {
+		String oldKeystorealias = keystorealias;
+		keystorealias = newKeystorealias;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD, oldKeystorepwd, keystorepwd));
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS, oldKeystorealias, keystorealias));
 	}
 
 	/**
@@ -364,8 +363,8 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getMaxinputqueue() {
-		return maxinputqueue;
+	public String getKeystorepwdloc() {
+		return keystorepwdloc;
 	}
 
 	/**
@@ -373,11 +372,11 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setMaxinputqueue(String newMaxinputqueue) {
-		String oldMaxinputqueue = maxinputqueue;
-		maxinputqueue = newMaxinputqueue;
+	public void setKeystorepwdloc(String newKeystorepwdloc) {
+		String oldKeystorepwdloc = keystorepwdloc;
+		keystorepwdloc = newKeystorepwdloc;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue));
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC, oldKeystorepwdloc, keystorepwdloc));
 	}
 
 	/**
@@ -385,8 +384,8 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getAuthid() {
-		return authid;
+	public String getMaxinputqueue() {
+		return maxinputqueue;
 	}
 
 	/**
@@ -394,11 +393,11 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAuthid(String newAuthid) {
-		String oldAuthid = authid;
-		authid = newAuthid;
+	public void setMaxinputqueue(String newMaxinputqueue) {
+		String oldMaxinputqueue = maxinputqueue;
+		maxinputqueue = newMaxinputqueue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID, oldAuthid, authid));
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue));
 	}
 
 	/**
@@ -427,48 +426,6 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getAuthpwd() {
-		return authpwd;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthpwd(String newAuthpwd) {
-		String oldAuthpwd = authpwd;
-		authpwd = newAuthpwd;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD, oldAuthpwd, authpwd));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthfile() {
-		return authfile;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthfile(String newAuthfile) {
-		String oldAuthfile = authfile;
-		authfile = newAuthfile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE, oldAuthfile, authfile));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	public String getCheckschemaflag() {
 		return checkschemaflag;
 	}
@@ -520,22 +477,22 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 				return getCsecport();
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC:
 				return getKeystoreloc();
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD:
-				return getKeystorepwd();
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS:
+				return getKeystorealias();
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC:
+				return getKeystorepwdloc();
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE:
 				return getMaxinputqueue();
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID:
-				return getAuthid();
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG:
 				return getAuthflag();
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD:
-				return getAuthpwd();
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE:
-				return getAuthfile();
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST:
+				return getAuthlist();
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG:
 				return getCheckschemaflag();
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE:
 				return getSchemafile();
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID:
+				return getStreamid();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -557,23 +514,20 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC:
 				setKeystoreloc((String)newValue);
 				return;
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD:
-				setKeystorepwd((String)newValue);
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS:
+				setKeystorealias((String)newValue);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC:
+				setKeystorepwdloc((String)newValue);
 				return;
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE:
 				setMaxinputqueue((String)newValue);
 				return;
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID:
-				setAuthid((String)newValue);
-				return;
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG:
 				setAuthflag((String)newValue);
 				return;
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD:
-				setAuthpwd((String)newValue);
-				return;
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE:
-				setAuthfile((String)newValue);
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST:
+				setAuthlist((String)newValue);
 				return;
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG:
 				setCheckschemaflag((String)newValue);
@@ -581,6 +535,9 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE:
 				setSchemafile((String)newValue);
 				return;
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID:
+				setStreamid((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -602,23 +559,20 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC:
 				setKeystoreloc(KEYSTORELOC_EDEFAULT);
 				return;
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD:
-				setKeystorepwd(KEYSTOREPWD_EDEFAULT);
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS:
+				setKeystorealias(KEYSTOREALIAS_EDEFAULT);
+				return;
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC:
+				setKeystorepwdloc(KEYSTOREPWDLOC_EDEFAULT);
 				return;
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE:
 				setMaxinputqueue(MAXINPUTQUEUE_EDEFAULT);
 				return;
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID:
-				setAuthid(AUTHID_EDEFAULT);
-				return;
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG:
 				setAuthflag(AUTHFLAG_EDEFAULT);
 				return;
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD:
-				setAuthpwd(AUTHPWD_EDEFAULT);
-				return;
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE:
-				setAuthfile(AUTHFILE_EDEFAULT);
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST:
+				setAuthlist(AUTHLIST_EDEFAULT);
 				return;
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG:
 				setCheckschemaflag(CHECKSCHEMAFLAG_EDEFAULT);
@@ -626,6 +580,9 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE:
 				setSchemafile(SCHEMAFILE_EDEFAULT);
 				return;
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID:
+				setStreamid(STREAMID_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -644,22 +601,22 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 				return CSECPORT_EDEFAULT == null ? csecport != null : !CSECPORT_EDEFAULT.equals(csecport);
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC:
 				return KEYSTORELOC_EDEFAULT == null ? keystoreloc != null : !KEYSTORELOC_EDEFAULT.equals(keystoreloc);
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD:
-				return KEYSTOREPWD_EDEFAULT == null ? keystorepwd != null : !KEYSTOREPWD_EDEFAULT.equals(keystorepwd);
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS:
+				return KEYSTOREALIAS_EDEFAULT == null ? keystorealias != null : !KEYSTOREALIAS_EDEFAULT.equals(keystorealias);
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC:
+				return KEYSTOREPWDLOC_EDEFAULT == null ? keystorepwdloc != null : !KEYSTOREPWDLOC_EDEFAULT.equals(keystorepwdloc);
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE:
 				return MAXINPUTQUEUE_EDEFAULT == null ? maxinputqueue != null : !MAXINPUTQUEUE_EDEFAULT.equals(maxinputqueue);
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID:
-				return AUTHID_EDEFAULT == null ? authid != null : !AUTHID_EDEFAULT.equals(authid);
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG:
 				return AUTHFLAG_EDEFAULT == null ? authflag != null : !AUTHFLAG_EDEFAULT.equals(authflag);
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD:
-				return AUTHPWD_EDEFAULT == null ? authpwd != null : !AUTHPWD_EDEFAULT.equals(authpwd);
-			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE:
-				return AUTHFILE_EDEFAULT == null ? authfile != null : !AUTHFILE_EDEFAULT.equals(authfile);
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST:
+				return AUTHLIST_EDEFAULT == null ? authlist != null : !AUTHLIST_EDEFAULT.equals(authlist);
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG:
 				return CHECKSCHEMAFLAG_EDEFAULT == null ? checkschemaflag != null : !CHECKSCHEMAFLAG_EDEFAULT.equals(checkschemaflag);
 			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE:
 				return SCHEMAFILE_EDEFAULT == null ? schemafile != null : !SCHEMAFILE_EDEFAULT.equals(schemafile);
+			case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID:
+				return STREAMID_EDEFAULT == null ? streamid != null : !STREAMID_EDEFAULT.equals(streamid);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -676,14 +633,14 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT;
 				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CSECPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT;
 				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC;
-				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD;
+				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS;
+				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC;
 				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE;
-				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID;
 				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG;
-				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD;
-				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE;
+				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST;
 				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG;
 				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE;
+				case ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID;
 				default: return -1;
 			}
 		}
@@ -702,14 +659,14 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CPORT;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CSECPORT;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTORELOC;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWD;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREALIAS;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__KEYSTOREPWDLOC;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__MAXINPUTQUEUE;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHID;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFLAG;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHPWD;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHFILE;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__AUTHLIST;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__CHECKSCHEMAFLAG;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__SCHEMAFILE;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID: return ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID;
 				default: return -1;
 			}
 		}
@@ -732,24 +689,57 @@ public class ControllerServiceStandardeventcollectorManagerImpl extends DockerMa
 		result.append(csecport);
 		result.append(", keystoreloc: ");
 		result.append(keystoreloc);
-		result.append(", keystorepwd: ");
-		result.append(keystorepwd);
+		result.append(", keystorealias: ");
+		result.append(keystorealias);
+		result.append(", keystorepwdloc: ");
+		result.append(keystorepwdloc);
 		result.append(", maxinputqueue: ");
 		result.append(maxinputqueue);
-		result.append(", authid: ");
-		result.append(authid);
 		result.append(", authflag: ");
 		result.append(authflag);
-		result.append(", authpwd: ");
-		result.append(authpwd);
-		result.append(", authfile: ");
-		result.append(authfile);
+		result.append(", authlist: ");
+		result.append(authlist);
 		result.append(", checkschemaflag: ");
 		result.append(checkschemaflag);
 		result.append(", schemafile: ");
 		result.append(schemafile);
+		result.append(", streamid: ");
+		result.append(streamid);
 		result.append(')');
 		return result.toString();
 	}
 
+	@Override
+	public String getAuthlist() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setAuthlist(String value) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getStreamid() {
+		return streamid;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setStreamid(String newStreamid) {
+		String oldStreamid = streamid;
+		streamid = newStreamid;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ManagerPackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_MANAGER__STREAMID, oldStreamid, streamid));
+	}
+
 } //ControllerServiceStandardeventcollectorManagerImpl
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerAdapterFactory.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerAdapterFactory.java
index 4936e09..2e5ad28 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerAdapterFactory.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerAdapterFactory.java
@@ -23,8 +23,6 @@
  */
 package org.openecomp.dcae.controller.service.standardeventcollector.manager.util;
 
-import org.openecomp.dcae.controller.core.manager.DcaeManager;
-
 import org.openecomp.dcae.controller.service.dockermanager.DockerManager;
 
 import org.openecomp.dcae.controller.service.standardeventcollector.manager.*;
@@ -37,6 +35,7 @@ import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerSwitch.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerSwitch.java
index 4833d85..79b00be 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerSwitch.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/manager/util/ManagerSwitch.java
@@ -23,8 +23,6 @@
  */
 package org.openecomp.dcae.controller.service.standardeventcollector.manager.util;
 
-import org.openecomp.dcae.controller.core.manager.DcaeManager;
-
 import org.openecomp.dcae.controller.service.dockermanager.DockerManager;
 
 import org.openecomp.dcae.controller.service.standardeventcollector.manager.*;
@@ -35,6 +33,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
+import org.openecomp.dcae.controller.core.manager.DcaeManager;
 
 /**
  * <!-- begin-user-doc -->
@@ -74,7 +73,7 @@ public class ManagerSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ControllerServiceStandardeventcollectorServiceConfiguration.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ControllerServiceStandardeventcollectorServiceConfiguration.java
index d7866bf..c664ea6 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ControllerServiceStandardeventcollectorServiceConfiguration.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ControllerServiceStandardeventcollectorServiceConfiguration.java
@@ -32,20 +32,20 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCport <em>Cport</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCsecport <em>Csecport</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystoreloc <em>Keystoreloc</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwd <em>Keystorepwd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorealias <em>Keystorealias</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwdloc <em>Keystorepwdloc</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthid <em>Authid</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthflag <em>Authflag</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthpwd <em>Authpwd</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthfile <em>Authfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthlist <em>Authlist</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getStreamid <em>Streamid</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration()
  * @model
@@ -135,85 +135,85 @@ public interface ControllerServiceStandardeventcollectorServiceConfiguration ext
 	void setKeystoreloc(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Keystorepwd</b></em>' attribute.
+	 * Returns the value of the '<em><b>Keystorealias</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Keystorepwd</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Keystorealias</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Keystorepwd</em>' attribute.
-	 * @see #setKeystorepwd(String)
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd()
+	 * @return the value of the '<em>Keystorealias</em>' attribute.
+	 * @see #setKeystorealias(String)
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias()
 	 * @model unique="false"
 	 *        annotation="http://openecomp.org type='configuration'"
 	 * @generated
 	 */
-	String getKeystorepwd();
+	String getKeystorealias();
 
 	/**
-	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwd <em>Keystorepwd</em>}' attribute.
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorealias <em>Keystorealias</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Keystorepwd</em>' attribute.
-	 * @see #getKeystorepwd()
+	 * @param value the new value of the '<em>Keystorealias</em>' attribute.
+	 * @see #getKeystorealias()
 	 * @generated
 	 */
-	void setKeystorepwd(String value);
+	void setKeystorealias(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Maxinputqueue</b></em>' attribute.
+	 * Returns the value of the '<em><b>Keystorepwdloc</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Maxinputqueue</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Keystorepwdloc</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Maxinputqueue</em>' attribute.
-	 * @see #setMaxinputqueue(String)
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue()
+	 * @return the value of the '<em>Keystorepwdloc</em>' attribute.
+	 * @see #setKeystorepwdloc(String)
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc()
 	 * @model unique="false"
 	 *        annotation="http://openecomp.org type='configuration'"
 	 * @generated
 	 */
-	String getMaxinputqueue();
+	String getKeystorepwdloc();
 
 	/**
-	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}' attribute.
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwdloc <em>Keystorepwdloc</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Maxinputqueue</em>' attribute.
-	 * @see #getMaxinputqueue()
+	 * @param value the new value of the '<em>Keystorepwdloc</em>' attribute.
+	 * @see #getKeystorepwdloc()
 	 * @generated
 	 */
-	void setMaxinputqueue(String value);
+	void setKeystorepwdloc(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Authid</b></em>' attribute.
+	 * Returns the value of the '<em><b>Maxinputqueue</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Authid</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Maxinputqueue</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Authid</em>' attribute.
-	 * @see #setAuthid(String)
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Authid()
+	 * @return the value of the '<em>Maxinputqueue</em>' attribute.
+	 * @see #setMaxinputqueue(String)
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue()
 	 * @model unique="false"
 	 *        annotation="http://openecomp.org type='configuration'"
 	 * @generated
 	 */
-	String getAuthid();
+	String getMaxinputqueue();
 
 	/**
-	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthid <em>Authid</em>}' attribute.
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authid</em>' attribute.
-	 * @see #getAuthid()
+	 * @param value the new value of the '<em>Maxinputqueue</em>' attribute.
+	 * @see #getMaxinputqueue()
 	 * @generated
 	 */
-	void setAuthid(String value);
+	void setMaxinputqueue(String value);
 
 	/**
 	 * Returns the value of the '<em><b>Authflag</b></em>' attribute.
@@ -243,110 +243,110 @@ public interface ControllerServiceStandardeventcollectorServiceConfiguration ext
 	void setAuthflag(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Authpwd</b></em>' attribute.
+	 * Returns the value of the '<em><b>Checkschemaflag</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Authpwd</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Checkschemaflag</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Authpwd</em>' attribute.
-	 * @see #setAuthpwd(String)
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd()
+	 * @return the value of the '<em>Checkschemaflag</em>' attribute.
+	 * @see #setCheckschemaflag(String)
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag()
 	 * @model unique="false"
 	 *        annotation="http://openecomp.org type='configuration'"
 	 * @generated
 	 */
-	String getAuthpwd();
+	String getCheckschemaflag();
 
 	/**
-	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthpwd <em>Authpwd</em>}' attribute.
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authpwd</em>' attribute.
-	 * @see #getAuthpwd()
+	 * @param value the new value of the '<em>Checkschemaflag</em>' attribute.
+	 * @see #getCheckschemaflag()
 	 * @generated
 	 */
-	void setAuthpwd(String value);
+	void setCheckschemaflag(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Authfile</b></em>' attribute.
+	 * Returns the value of the '<em><b>Schemafile</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Authfile</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Schemafile</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Authfile</em>' attribute.
-	 * @see #setAuthfile(String)
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Authfile()
+	 * @return the value of the '<em>Schemafile</em>' attribute.
+	 * @see #setSchemafile(String)
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile()
 	 * @model unique="false"
 	 *        annotation="http://openecomp.org type='configuration'"
 	 * @generated
 	 */
-	String getAuthfile();
+	String getSchemafile();
 
 	/**
-	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthfile <em>Authfile</em>}' attribute.
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Authfile</em>' attribute.
-	 * @see #getAuthfile()
+	 * @param value the new value of the '<em>Schemafile</em>' attribute.
+	 * @see #getSchemafile()
 	 * @generated
 	 */
-	void setAuthfile(String value);
+	void setSchemafile(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Checkschemaflag</b></em>' attribute.
+	 * Returns the value of the '<em><b>Authlist</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Checkschemaflag</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Authlist</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Checkschemaflag</em>' attribute.
-	 * @see #setCheckschemaflag(String)
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag()
+	 * @return the value of the '<em>Authlist</em>' attribute.
+	 * @see #setAuthlist(String)
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Authlist()
 	 * @model unique="false"
 	 *        annotation="http://openecomp.org type='configuration'"
 	 * @generated
 	 */
-	String getCheckschemaflag();
+	String getAuthlist();
 
 	/**
-	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}' attribute.
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthlist <em>Authlist</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Checkschemaflag</em>' attribute.
-	 * @see #getCheckschemaflag()
+	 * @param value the new value of the '<em>Authlist</em>' attribute.
+	 * @see #getAuthlist()
 	 * @generated
 	 */
-	void setCheckschemaflag(String value);
+	void setAuthlist(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Schemafile</b></em>' attribute.
+	 * Returns the value of the '<em><b>Streamid</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Schemafile</em>' attribute isn't clear,
+	 * If the meaning of the '<em>Streamid</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Schemafile</em>' attribute.
-	 * @see #setSchemafile(String)
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile()
+	 * @return the value of the '<em>Streamid</em>' attribute.
+	 * @see #setStreamid(String)
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServicePackage#getControllerServiceStandardeventcollectorServiceConfiguration_Streamid()
 	 * @model unique="false"
 	 *        annotation="http://openecomp.org type='configuration'"
 	 * @generated
 	 */
-	String getSchemafile();
+	String getStreamid();
 
 	/**
-	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}' attribute.
+	 * Sets the value of the '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getStreamid <em>Streamid</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Schemafile</em>' attribute.
-	 * @see #getSchemafile()
+	 * @param value the new value of the '<em>Streamid</em>' attribute.
+	 * @see #getStreamid()
 	 * @generated
 	 */
-	void setSchemafile(String value);
+	void setStreamid(String value);
 } // ControllerServiceStandardeventcollectorServiceConfiguration
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ServicePackage.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ServicePackage.java
index c69f5c3..f5bf0fa 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ServicePackage.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/ServicePackage.java
@@ -41,6 +41,24 @@ import org.eclipse.emf.ecore.EPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * -
+ * ============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============================================
+ * <!-- end-model-doc -->
  * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ServiceFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen' basePackage='org.openecomp.dcae.controller.service.standardeventcollector'"
@@ -479,31 +497,31 @@ public interface ServicePackage extends EPackage {
 	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>Keystorepwd</b></em>' attribute.
+	 * The feature id for the '<em><b>Keystorealias</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 3;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute.
+	 * The feature id for the '<em><b>Keystorepwdloc</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 4;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>Authid</b></em>' attribute.
+	 * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 5;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Authflag</b></em>' attribute.
@@ -515,40 +533,40 @@ public interface ServicePackage extends EPackage {
 	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 6;
 
 	/**
-	 * The feature id for the '<em><b>Authpwd</b></em>' attribute.
+	 * The feature id for the '<em><b>Authlist</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 7;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Authfile</b></em>' attribute.
+	 * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 8;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute.
+	 * The feature id for the '<em><b>Schemafile</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 9;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 9;
 
 	/**
-	 * The feature id for the '<em><b>Schemafile</b></em>' attribute.
+	 * The feature id for the '<em><b>Streamid</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 10;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID = DockerPackage.DOCKER_SERVICE_INSTANCE_FEATURE_COUNT + 10;
 
 	/**
 	 * The number of structural features of the '<em>Controller Service Standardeventcollector Service Instance</em>' class.
@@ -606,31 +624,31 @@ public interface ServicePackage extends EPackage {
 	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC = 2;
 
 	/**
-	 * The feature id for the '<em><b>Keystorepwd</b></em>' attribute.
+	 * The feature id for the '<em><b>Keystorealias</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD = 3;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS = 3;
 
 	/**
-	 * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute.
+	 * The feature id for the '<em><b>Keystorepwdloc</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE = 4;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC = 4;
 
 	/**
-	 * The feature id for the '<em><b>Authid</b></em>' attribute.
+	 * The feature id for the '<em><b>Maxinputqueue</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID = 5;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE = 5;
 
 	/**
 	 * The feature id for the '<em><b>Authflag</b></em>' attribute.
@@ -642,40 +660,40 @@ public interface ServicePackage extends EPackage {
 	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG = 6;
 
 	/**
-	 * The feature id for the '<em><b>Authpwd</b></em>' attribute.
+	 * The feature id for the '<em><b>Authlist</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD = 7;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST = 7;
 
 	/**
-	 * The feature id for the '<em><b>Authfile</b></em>' attribute.
+	 * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE = 8;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG = 8;
 
 	/**
-	 * The feature id for the '<em><b>Checkschemaflag</b></em>' attribute.
+	 * The feature id for the '<em><b>Schemafile</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG = 9;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Schemafile</b></em>' attribute.
+	 * The feature id for the '<em><b>Streamid</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE = 10;
+	int CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID = 10;
 
 	/**
 	 * The number of structural features of the '<em>Controller Service Standardeventcollector Service Configuration</em>' class.
@@ -760,37 +778,37 @@ public interface ServicePackage extends EPackage {
 	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystoreloc();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwd <em>Keystorepwd</em>}'.
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorealias <em>Keystorealias</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Keystorepwd</em>'.
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwd()
+	 * @return the meta object for the attribute '<em>Keystorealias</em>'.
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorealias()
 	 * @see #getControllerServiceStandardeventcollectorServiceConfiguration()
 	 * @generated
 	 */
-	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd();
+	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}'.
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwdloc <em>Keystorepwdloc</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Maxinputqueue</em>'.
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue()
+	 * @return the meta object for the attribute '<em>Keystorepwdloc</em>'.
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getKeystorepwdloc()
 	 * @see #getControllerServiceStandardeventcollectorServiceConfiguration()
 	 * @generated
 	 */
-	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue();
+	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthid <em>Authid</em>}'.
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue <em>Maxinputqueue</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authid</em>'.
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthid()
+	 * @return the meta object for the attribute '<em>Maxinputqueue</em>'.
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getMaxinputqueue()
 	 * @see #getControllerServiceStandardeventcollectorServiceConfiguration()
 	 * @generated
 	 */
-	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authid();
+	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue();
 
 	/**
 	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthflag <em>Authflag</em>}'.
@@ -804,48 +822,48 @@ public interface ServicePackage extends EPackage {
 	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authflag();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthpwd <em>Authpwd</em>}'.
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authpwd</em>'.
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthpwd()
+	 * @return the meta object for the attribute '<em>Checkschemaflag</em>'.
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag()
 	 * @see #getControllerServiceStandardeventcollectorServiceConfiguration()
 	 * @generated
 	 */
-	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd();
+	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthfile <em>Authfile</em>}'.
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Authfile</em>'.
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthfile()
+	 * @return the meta object for the attribute '<em>Schemafile</em>'.
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile()
 	 * @see #getControllerServiceStandardeventcollectorServiceConfiguration()
 	 * @generated
 	 */
-	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authfile();
+	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag <em>Checkschemaflag</em>}'.
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthlist <em>Authlist</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Checkschemaflag</em>'.
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getCheckschemaflag()
+	 * @return the meta object for the attribute '<em>Authlist</em>'.
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getAuthlist()
 	 * @see #getControllerServiceStandardeventcollectorServiceConfiguration()
 	 * @generated
 	 */
-	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag();
+	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authlist();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile <em>Schemafile</em>}'.
+	 * Returns the meta object for the attribute '{@link org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getStreamid <em>Streamid</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Schemafile</em>'.
-	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getSchemafile()
+	 * @return the meta object for the attribute '<em>Streamid</em>'.
+	 * @see org.openecomp.dcae.controller.service.standardeventcollector.service.ControllerServiceStandardeventcollectorServiceConfiguration#getStreamid()
 	 * @see #getControllerServiceStandardeventcollectorServiceConfiguration()
 	 * @generated
 	 */
-	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile();
+	EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Streamid();
 
 	/**
 	 * Returns the factory that creates the instances of the model.
@@ -925,28 +943,28 @@ public interface ServicePackage extends EPackage {
 		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Keystoreloc();
 
 		/**
-		 * The meta object literal for the '<em><b>Keystorepwd</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Keystorealias</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd();
+		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias();
 
 		/**
-		 * The meta object literal for the '<em><b>Maxinputqueue</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Keystorepwdloc</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue();
+		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc();
 
 		/**
-		 * The meta object literal for the '<em><b>Authid</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Maxinputqueue</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authid();
+		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue();
 
 		/**
 		 * The meta object literal for the '<em><b>Authflag</b></em>' attribute feature.
@@ -957,36 +975,36 @@ public interface ServicePackage extends EPackage {
 		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authflag();
 
 		/**
-		 * The meta object literal for the '<em><b>Authpwd</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Checkschemaflag</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd();
+		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag();
 
 		/**
-		 * The meta object literal for the '<em><b>Authfile</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Schemafile</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authfile();
+		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile();
 
 		/**
-		 * The meta object literal for the '<em><b>Checkschemaflag</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Authlist</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag();
+		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Authlist();
 
 		/**
-		 * The meta object literal for the '<em><b>Schemafile</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Streamid</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile();
+		EAttribute CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID = eINSTANCE.getControllerServiceStandardeventcollectorServiceConfiguration_Streamid();
 
 	}
 
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceConfigurationImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceConfigurationImpl.java
index ce333f2..acecfe3 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceConfigurationImpl.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceConfigurationImpl.java
@@ -38,20 +38,20 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getCport <em>Cport</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getCsecport <em>Csecport</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getKeystoreloc <em>Keystoreloc</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getKeystorepwd <em>Keystorepwd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getKeystorealias <em>Keystorealias</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getKeystorepwdloc <em>Keystorepwdloc</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getMaxinputqueue <em>Maxinputqueue</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthid <em>Authid</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthflag <em>Authflag</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthpwd <em>Authpwd</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthfile <em>Authfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getAuthlist <em>Authlist</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getCheckschemaflag <em>Checkschemaflag</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getSchemafile <em>Schemafile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceConfigurationImpl#getStreamid <em>Streamid</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -111,59 +111,59 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 */
 	protected String keystoreloc = KEYSTORELOC_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute.
+	 * The default value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getKeystorepwd()
+	 * @see #getKeystorealias()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String KEYSTOREPWD_EDEFAULT = null;
+	protected static final String KEYSTOREALIAS_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute.
+	 * The cached value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getKeystorepwd()
+	 * @see #getKeystorealias()
 	 * @generated
 	 * @ordered
 	 */
-	protected String keystorepwd = KEYSTOREPWD_EDEFAULT;
+	protected String keystorealias = KEYSTOREALIAS_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
+	 * The default value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMaxinputqueue()
+	 * @see #getKeystorepwdloc()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String MAXINPUTQUEUE_EDEFAULT = null;
+	protected static final String KEYSTOREPWDLOC_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
+	 * The cached value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMaxinputqueue()
+	 * @see #getKeystorepwdloc()
 	 * @generated
 	 * @ordered
 	 */
-	protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT;
+	protected String keystorepwdloc = KEYSTOREPWDLOC_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getAuthid() <em>Authid</em>}' attribute.
+	 * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthid()
+	 * @see #getMaxinputqueue()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHID_EDEFAULT = null;
+	protected static final String MAXINPUTQUEUE_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getAuthid() <em>Authid</em>}' attribute.
+	 * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthid()
+	 * @see #getMaxinputqueue()
 	 * @generated
 	 * @ordered
 	 */
-	protected String authid = AUTHID_EDEFAULT;
+	protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT;
 	/**
 	 * The default value of the '{@link #getAuthflag() <em>Authflag</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -183,41 +183,23 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 */
 	protected String authflag = AUTHFLAG_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthpwd()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHPWD_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute.
+	 * The default value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthpwd()
+	 * @see #getAuthlist()
 	 * @generated
 	 * @ordered
 	 */
-	protected String authpwd = AUTHPWD_EDEFAULT;
+	protected static final String AUTHLIST_EDEFAULT = null;
 	/**
-	 * The default value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute.
+	 * The cached value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthfile()
+	 * @see #getAuthlist()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHFILE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthfile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authfile = AUTHFILE_EDEFAULT;
+	protected String authlist = AUTHLIST_EDEFAULT;
 	/**
 	 * The default value of the '{@link #getCheckschemaflag() <em>Checkschemaflag</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -255,6 +237,24 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 */
 	protected String schemafile = SCHEMAFILE_EDEFAULT;
 	/**
+	 * The default value of the '{@link #getStreamid() <em>Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STREAMID_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getStreamid() <em>Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected String streamid = STREAMID_EDEFAULT;
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -341,8 +341,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getKeystorepwd() {
-		return keystorepwd;
+	public String getKeystorealias() {
+		return keystorealias;
 	}
 
 	/**
@@ -350,11 +350,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setKeystorepwd(String newKeystorepwd) {
-		String oldKeystorepwd = keystorepwd;
-		keystorepwd = newKeystorepwd;
+	public void setKeystorealias(String newKeystorealias) {
+		String oldKeystorealias = keystorealias;
+		keystorealias = newKeystorealias;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD, oldKeystorepwd, keystorepwd));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS, oldKeystorealias, keystorealias));
 	}
 
 	/**
@@ -362,8 +362,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getMaxinputqueue() {
-		return maxinputqueue;
+	public String getKeystorepwdloc() {
+		return keystorepwdloc;
 	}
 
 	/**
@@ -371,11 +371,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setMaxinputqueue(String newMaxinputqueue) {
-		String oldMaxinputqueue = maxinputqueue;
-		maxinputqueue = newMaxinputqueue;
+	public void setKeystorepwdloc(String newKeystorepwdloc) {
+		String oldKeystorepwdloc = keystorepwdloc;
+		keystorepwdloc = newKeystorepwdloc;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC, oldKeystorepwdloc, keystorepwdloc));
 	}
 
 	/**
@@ -383,8 +383,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getAuthid() {
-		return authid;
+	public String getMaxinputqueue() {
+		return maxinputqueue;
 	}
 
 	/**
@@ -392,11 +392,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAuthid(String newAuthid) {
-		String oldAuthid = authid;
-		authid = newAuthid;
+	public void setMaxinputqueue(String newMaxinputqueue) {
+		String oldMaxinputqueue = maxinputqueue;
+		maxinputqueue = newMaxinputqueue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID, oldAuthid, authid));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue));
 	}
 
 	/**
@@ -425,8 +425,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getAuthpwd() {
-		return authpwd;
+	public String getCheckschemaflag() {
+		return checkschemaflag;
 	}
 
 	/**
@@ -434,11 +434,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAuthpwd(String newAuthpwd) {
-		String oldAuthpwd = authpwd;
-		authpwd = newAuthpwd;
+	public void setCheckschemaflag(String newCheckschemaflag) {
+		String oldCheckschemaflag = checkschemaflag;
+		checkschemaflag = newCheckschemaflag;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD, oldAuthpwd, authpwd));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG, oldCheckschemaflag, checkschemaflag));
 	}
 
 	/**
@@ -446,8 +446,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getAuthfile() {
-		return authfile;
+	public String getSchemafile() {
+		return schemafile;
 	}
 
 	/**
@@ -455,11 +455,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAuthfile(String newAuthfile) {
-		String oldAuthfile = authfile;
-		authfile = newAuthfile;
+	public void setSchemafile(String newSchemafile) {
+		String oldSchemafile = schemafile;
+		schemafile = newSchemafile;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE, oldAuthfile, authfile));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE, oldSchemafile, schemafile));
 	}
 
 	/**
@@ -467,8 +467,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getCheckschemaflag() {
-		return checkschemaflag;
+	public String getAuthlist() {
+		return authlist;
 	}
 
 	/**
@@ -476,11 +476,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setCheckschemaflag(String newCheckschemaflag) {
-		String oldCheckschemaflag = checkschemaflag;
-		checkschemaflag = newCheckschemaflag;
+	public void setAuthlist(String newAuthlist) {
+		String oldAuthlist = authlist;
+		authlist = newAuthlist;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG, oldCheckschemaflag, checkschemaflag));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST, oldAuthlist, authlist));
 	}
 
 	/**
@@ -488,8 +488,8 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getSchemafile() {
-		return schemafile;
+	public String getStreamid() {
+		return streamid;
 	}
 
 	/**
@@ -497,11 +497,11 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setSchemafile(String newSchemafile) {
-		String oldSchemafile = schemafile;
-		schemafile = newSchemafile;
+	public void setStreamid(String newStreamid) {
+		String oldStreamid = streamid;
+		streamid = newStreamid;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE, oldSchemafile, schemafile));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID, oldStreamid, streamid));
 	}
 
 	/**
@@ -518,22 +518,22 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 				return getCsecport();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC:
 				return getKeystoreloc();
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD:
-				return getKeystorepwd();
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS:
+				return getKeystorealias();
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC:
+				return getKeystorepwdloc();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE:
 				return getMaxinputqueue();
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID:
-				return getAuthid();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG:
 				return getAuthflag();
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD:
-				return getAuthpwd();
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE:
-				return getAuthfile();
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST:
+				return getAuthlist();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG:
 				return getCheckschemaflag();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE:
 				return getSchemafile();
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID:
+				return getStreamid();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -555,23 +555,20 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC:
 				setKeystoreloc((String)newValue);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD:
-				setKeystorepwd((String)newValue);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS:
+				setKeystorealias((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC:
+				setKeystorepwdloc((String)newValue);
 				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE:
 				setMaxinputqueue((String)newValue);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID:
-				setAuthid((String)newValue);
-				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG:
 				setAuthflag((String)newValue);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD:
-				setAuthpwd((String)newValue);
-				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE:
-				setAuthfile((String)newValue);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST:
+				setAuthlist((String)newValue);
 				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG:
 				setCheckschemaflag((String)newValue);
@@ -579,6 +576,9 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE:
 				setSchemafile((String)newValue);
 				return;
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID:
+				setStreamid((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -600,23 +600,20 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC:
 				setKeystoreloc(KEYSTORELOC_EDEFAULT);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD:
-				setKeystorepwd(KEYSTOREPWD_EDEFAULT);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS:
+				setKeystorealias(KEYSTOREALIAS_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC:
+				setKeystorepwdloc(KEYSTOREPWDLOC_EDEFAULT);
 				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE:
 				setMaxinputqueue(MAXINPUTQUEUE_EDEFAULT);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID:
-				setAuthid(AUTHID_EDEFAULT);
-				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG:
 				setAuthflag(AUTHFLAG_EDEFAULT);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD:
-				setAuthpwd(AUTHPWD_EDEFAULT);
-				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE:
-				setAuthfile(AUTHFILE_EDEFAULT);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST:
+				setAuthlist(AUTHLIST_EDEFAULT);
 				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG:
 				setCheckschemaflag(CHECKSCHEMAFLAG_EDEFAULT);
@@ -624,6 +621,9 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE:
 				setSchemafile(SCHEMAFILE_EDEFAULT);
 				return;
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID:
+				setStreamid(STREAMID_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -642,22 +642,22 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 				return CSECPORT_EDEFAULT == null ? csecport != null : !CSECPORT_EDEFAULT.equals(csecport);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC:
 				return KEYSTORELOC_EDEFAULT == null ? keystoreloc != null : !KEYSTORELOC_EDEFAULT.equals(keystoreloc);
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD:
-				return KEYSTOREPWD_EDEFAULT == null ? keystorepwd != null : !KEYSTOREPWD_EDEFAULT.equals(keystorepwd);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS:
+				return KEYSTOREALIAS_EDEFAULT == null ? keystorealias != null : !KEYSTOREALIAS_EDEFAULT.equals(keystorealias);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC:
+				return KEYSTOREPWDLOC_EDEFAULT == null ? keystorepwdloc != null : !KEYSTOREPWDLOC_EDEFAULT.equals(keystorepwdloc);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE:
 				return MAXINPUTQUEUE_EDEFAULT == null ? maxinputqueue != null : !MAXINPUTQUEUE_EDEFAULT.equals(maxinputqueue);
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID:
-				return AUTHID_EDEFAULT == null ? authid != null : !AUTHID_EDEFAULT.equals(authid);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG:
 				return AUTHFLAG_EDEFAULT == null ? authflag != null : !AUTHFLAG_EDEFAULT.equals(authflag);
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD:
-				return AUTHPWD_EDEFAULT == null ? authpwd != null : !AUTHPWD_EDEFAULT.equals(authpwd);
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE:
-				return AUTHFILE_EDEFAULT == null ? authfile != null : !AUTHFILE_EDEFAULT.equals(authfile);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST:
+				return AUTHLIST_EDEFAULT == null ? authlist != null : !AUTHLIST_EDEFAULT.equals(authlist);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG:
 				return CHECKSCHEMAFLAG_EDEFAULT == null ? checkschemaflag != null : !CHECKSCHEMAFLAG_EDEFAULT.equals(checkschemaflag);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE:
 				return SCHEMAFILE_EDEFAULT == null ? schemafile != null : !SCHEMAFILE_EDEFAULT.equals(schemafile);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID:
+				return STREAMID_EDEFAULT == null ? streamid != null : !STREAMID_EDEFAULT.equals(streamid);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -678,22 +678,22 @@ public class ControllerServiceStandardeventcollectorServiceConfigurationImpl ext
 		result.append(csecport);
 		result.append(", keystoreloc: ");
 		result.append(keystoreloc);
-		result.append(", keystorepwd: ");
-		result.append(keystorepwd);
+		result.append(", keystorealias: ");
+		result.append(keystorealias);
+		result.append(", keystorepwdloc: ");
+		result.append(keystorepwdloc);
 		result.append(", maxinputqueue: ");
 		result.append(maxinputqueue);
-		result.append(", authid: ");
-		result.append(authid);
 		result.append(", authflag: ");
 		result.append(authflag);
-		result.append(", authpwd: ");
-		result.append(authpwd);
-		result.append(", authfile: ");
-		result.append(authfile);
+		result.append(", authlist: ");
+		result.append(authlist);
 		result.append(", checkschemaflag: ");
 		result.append(checkschemaflag);
 		result.append(", schemafile: ");
 		result.append(schemafile);
+		result.append(", streamid: ");
+		result.append(streamid);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceImpl.java
index 136dc7e..3892716 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceImpl.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceImpl.java
@@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Controller Service Standardeventcollector Service</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceInstanceImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceInstanceImpl.java
index b0cc8aa..4269ae8 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceInstanceImpl.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ControllerServiceStandardeventcollectorServiceInstanceImpl.java
@@ -39,20 +39,20 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getCport <em>Cport</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getCsecport <em>Csecport</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getKeystoreloc <em>Keystoreloc</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getKeystorepwd <em>Keystorepwd</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getKeystorealias <em>Keystorealias</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getKeystorepwdloc <em>Keystorepwdloc</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getMaxinputqueue <em>Maxinputqueue</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthid <em>Authid</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthflag <em>Authflag</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthpwd <em>Authpwd</em>}</li>
- *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthfile <em>Authfile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getAuthlist <em>Authlist</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getCheckschemaflag <em>Checkschemaflag</em>}</li>
  *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getSchemafile <em>Schemafile</em>}</li>
+ *   <li>{@link org.openecomp.dcae.controller.service.standardeventcollector.service.impl.ControllerServiceStandardeventcollectorServiceInstanceImpl#getStreamid <em>Streamid</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -112,59 +112,59 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 */
 	protected String keystoreloc = KEYSTORELOC_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute.
+	 * The default value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getKeystorepwd()
+	 * @see #getKeystorealias()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String KEYSTOREPWD_EDEFAULT = null;
+	protected static final String KEYSTOREALIAS_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getKeystorepwd() <em>Keystorepwd</em>}' attribute.
+	 * The cached value of the '{@link #getKeystorealias() <em>Keystorealias</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getKeystorepwd()
+	 * @see #getKeystorealias()
 	 * @generated
 	 * @ordered
 	 */
-	protected String keystorepwd = KEYSTOREPWD_EDEFAULT;
+	protected String keystorealias = KEYSTOREALIAS_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
+	 * The default value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMaxinputqueue()
+	 * @see #getKeystorepwdloc()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String MAXINPUTQUEUE_EDEFAULT = null;
+	protected static final String KEYSTOREPWDLOC_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
+	 * The cached value of the '{@link #getKeystorepwdloc() <em>Keystorepwdloc</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMaxinputqueue()
+	 * @see #getKeystorepwdloc()
 	 * @generated
 	 * @ordered
 	 */
-	protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT;
+	protected String keystorepwdloc = KEYSTOREPWDLOC_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getAuthid() <em>Authid</em>}' attribute.
+	 * The default value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthid()
+	 * @see #getMaxinputqueue()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHID_EDEFAULT = null;
+	protected static final String MAXINPUTQUEUE_EDEFAULT = null;
 	/**
-	 * The cached value of the '{@link #getAuthid() <em>Authid</em>}' attribute.
+	 * The cached value of the '{@link #getMaxinputqueue() <em>Maxinputqueue</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthid()
+	 * @see #getMaxinputqueue()
 	 * @generated
 	 * @ordered
 	 */
-	protected String authid = AUTHID_EDEFAULT;
+	protected String maxinputqueue = MAXINPUTQUEUE_EDEFAULT;
 	/**
 	 * The default value of the '{@link #getAuthflag() <em>Authflag</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -184,41 +184,23 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 */
 	protected String authflag = AUTHFLAG_EDEFAULT;
 	/**
-	 * The default value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthpwd()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHPWD_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getAuthpwd() <em>Authpwd</em>}' attribute.
+	 * The default value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthpwd()
+	 * @see #getAuthlist()
 	 * @generated
 	 * @ordered
 	 */
-	protected String authpwd = AUTHPWD_EDEFAULT;
+	protected static final String AUTHLIST_EDEFAULT = null;
 	/**
-	 * The default value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute.
+	 * The cached value of the '{@link #getAuthlist() <em>Authlist</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getAuthfile()
+	 * @see #getAuthlist()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String AUTHFILE_EDEFAULT = null;
-	/**
-	 * The cached value of the '{@link #getAuthfile() <em>Authfile</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthfile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String authfile = AUTHFILE_EDEFAULT;
+	protected String authlist = AUTHLIST_EDEFAULT;
 	/**
 	 * The default value of the '{@link #getCheckschemaflag() <em>Checkschemaflag</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -256,6 +238,24 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 */
 	protected String schemafile = SCHEMAFILE_EDEFAULT;
 	/**
+	 * The default value of the '{@link #getStreamid() <em>Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STREAMID_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getStreamid() <em>Streamid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getStreamid()
+	 * @generated
+	 * @ordered
+	 */
+	protected String streamid = STREAMID_EDEFAULT;
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -342,8 +342,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getKeystorepwd() {
-		return keystorepwd;
+	public String getKeystorealias() {
+		return keystorealias;
 	}
 
 	/**
@@ -351,11 +351,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setKeystorepwd(String newKeystorepwd) {
-		String oldKeystorepwd = keystorepwd;
-		keystorepwd = newKeystorepwd;
+	public void setKeystorealias(String newKeystorealias) {
+		String oldKeystorealias = keystorealias;
+		keystorealias = newKeystorealias;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD, oldKeystorepwd, keystorepwd));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS, oldKeystorealias, keystorealias));
 	}
 
 	/**
@@ -363,8 +363,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getMaxinputqueue() {
-		return maxinputqueue;
+	public String getKeystorepwdloc() {
+		return keystorepwdloc;
 	}
 
 	/**
@@ -372,11 +372,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setMaxinputqueue(String newMaxinputqueue) {
-		String oldMaxinputqueue = maxinputqueue;
-		maxinputqueue = newMaxinputqueue;
+	public void setKeystorepwdloc(String newKeystorepwdloc) {
+		String oldKeystorepwdloc = keystorepwdloc;
+		keystorepwdloc = newKeystorepwdloc;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC, oldKeystorepwdloc, keystorepwdloc));
 	}
 
 	/**
@@ -384,8 +384,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getAuthid() {
-		return authid;
+	public String getMaxinputqueue() {
+		return maxinputqueue;
 	}
 
 	/**
@@ -393,11 +393,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAuthid(String newAuthid) {
-		String oldAuthid = authid;
-		authid = newAuthid;
+	public void setMaxinputqueue(String newMaxinputqueue) {
+		String oldMaxinputqueue = maxinputqueue;
+		maxinputqueue = newMaxinputqueue;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID, oldAuthid, authid));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE, oldMaxinputqueue, maxinputqueue));
 	}
 
 	/**
@@ -426,8 +426,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getAuthpwd() {
-		return authpwd;
+	public String getCheckschemaflag() {
+		return checkschemaflag;
 	}
 
 	/**
@@ -435,11 +435,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAuthpwd(String newAuthpwd) {
-		String oldAuthpwd = authpwd;
-		authpwd = newAuthpwd;
+	public void setCheckschemaflag(String newCheckschemaflag) {
+		String oldCheckschemaflag = checkschemaflag;
+		checkschemaflag = newCheckschemaflag;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD, oldAuthpwd, authpwd));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG, oldCheckschemaflag, checkschemaflag));
 	}
 
 	/**
@@ -447,8 +447,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getAuthfile() {
-		return authfile;
+	public String getSchemafile() {
+		return schemafile;
 	}
 
 	/**
@@ -456,11 +456,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setAuthfile(String newAuthfile) {
-		String oldAuthfile = authfile;
-		authfile = newAuthfile;
+	public void setSchemafile(String newSchemafile) {
+		String oldSchemafile = schemafile;
+		schemafile = newSchemafile;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE, oldAuthfile, authfile));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE, oldSchemafile, schemafile));
 	}
 
 	/**
@@ -468,8 +468,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getCheckschemaflag() {
-		return checkschemaflag;
+	public String getAuthlist() {
+		return authlist;
 	}
 
 	/**
@@ -477,11 +477,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setCheckschemaflag(String newCheckschemaflag) {
-		String oldCheckschemaflag = checkschemaflag;
-		checkschemaflag = newCheckschemaflag;
+	public void setAuthlist(String newAuthlist) {
+		String oldAuthlist = authlist;
+		authlist = newAuthlist;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG, oldCheckschemaflag, checkschemaflag));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST, oldAuthlist, authlist));
 	}
 
 	/**
@@ -489,8 +489,8 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getSchemafile() {
-		return schemafile;
+	public String getStreamid() {
+		return streamid;
 	}
 
 	/**
@@ -498,11 +498,11 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setSchemafile(String newSchemafile) {
-		String oldSchemafile = schemafile;
-		schemafile = newSchemafile;
+	public void setStreamid(String newStreamid) {
+		String oldStreamid = streamid;
+		streamid = newStreamid;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE, oldSchemafile, schemafile));
+			eNotify(new ENotificationImpl(this, Notification.SET, ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID, oldStreamid, streamid));
 	}
 
 	/**
@@ -519,22 +519,22 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 				return getCsecport();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC:
 				return getKeystoreloc();
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD:
-				return getKeystorepwd();
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS:
+				return getKeystorealias();
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC:
+				return getKeystorepwdloc();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE:
 				return getMaxinputqueue();
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID:
-				return getAuthid();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG:
 				return getAuthflag();
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD:
-				return getAuthpwd();
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE:
-				return getAuthfile();
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST:
+				return getAuthlist();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG:
 				return getCheckschemaflag();
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE:
 				return getSchemafile();
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID:
+				return getStreamid();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -556,23 +556,20 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC:
 				setKeystoreloc((String)newValue);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD:
-				setKeystorepwd((String)newValue);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS:
+				setKeystorealias((String)newValue);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC:
+				setKeystorepwdloc((String)newValue);
 				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE:
 				setMaxinputqueue((String)newValue);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID:
-				setAuthid((String)newValue);
-				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG:
 				setAuthflag((String)newValue);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD:
-				setAuthpwd((String)newValue);
-				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE:
-				setAuthfile((String)newValue);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST:
+				setAuthlist((String)newValue);
 				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG:
 				setCheckschemaflag((String)newValue);
@@ -580,6 +577,9 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE:
 				setSchemafile((String)newValue);
 				return;
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID:
+				setStreamid((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -601,23 +601,20 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC:
 				setKeystoreloc(KEYSTORELOC_EDEFAULT);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD:
-				setKeystorepwd(KEYSTOREPWD_EDEFAULT);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS:
+				setKeystorealias(KEYSTOREALIAS_EDEFAULT);
+				return;
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC:
+				setKeystorepwdloc(KEYSTOREPWDLOC_EDEFAULT);
 				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE:
 				setMaxinputqueue(MAXINPUTQUEUE_EDEFAULT);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID:
-				setAuthid(AUTHID_EDEFAULT);
-				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG:
 				setAuthflag(AUTHFLAG_EDEFAULT);
 				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD:
-				setAuthpwd(AUTHPWD_EDEFAULT);
-				return;
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE:
-				setAuthfile(AUTHFILE_EDEFAULT);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST:
+				setAuthlist(AUTHLIST_EDEFAULT);
 				return;
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG:
 				setCheckschemaflag(CHECKSCHEMAFLAG_EDEFAULT);
@@ -625,6 +622,9 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE:
 				setSchemafile(SCHEMAFILE_EDEFAULT);
 				return;
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID:
+				setStreamid(STREAMID_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -643,22 +643,22 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 				return CSECPORT_EDEFAULT == null ? csecport != null : !CSECPORT_EDEFAULT.equals(csecport);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC:
 				return KEYSTORELOC_EDEFAULT == null ? keystoreloc != null : !KEYSTORELOC_EDEFAULT.equals(keystoreloc);
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD:
-				return KEYSTOREPWD_EDEFAULT == null ? keystorepwd != null : !KEYSTOREPWD_EDEFAULT.equals(keystorepwd);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS:
+				return KEYSTOREALIAS_EDEFAULT == null ? keystorealias != null : !KEYSTOREALIAS_EDEFAULT.equals(keystorealias);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC:
+				return KEYSTOREPWDLOC_EDEFAULT == null ? keystorepwdloc != null : !KEYSTOREPWDLOC_EDEFAULT.equals(keystorepwdloc);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE:
 				return MAXINPUTQUEUE_EDEFAULT == null ? maxinputqueue != null : !MAXINPUTQUEUE_EDEFAULT.equals(maxinputqueue);
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID:
-				return AUTHID_EDEFAULT == null ? authid != null : !AUTHID_EDEFAULT.equals(authid);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG:
 				return AUTHFLAG_EDEFAULT == null ? authflag != null : !AUTHFLAG_EDEFAULT.equals(authflag);
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD:
-				return AUTHPWD_EDEFAULT == null ? authpwd != null : !AUTHPWD_EDEFAULT.equals(authpwd);
-			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE:
-				return AUTHFILE_EDEFAULT == null ? authfile != null : !AUTHFILE_EDEFAULT.equals(authfile);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST:
+				return AUTHLIST_EDEFAULT == null ? authlist != null : !AUTHLIST_EDEFAULT.equals(authlist);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG:
 				return CHECKSCHEMAFLAG_EDEFAULT == null ? checkschemaflag != null : !CHECKSCHEMAFLAG_EDEFAULT.equals(checkschemaflag);
 			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE:
 				return SCHEMAFILE_EDEFAULT == null ? schemafile != null : !SCHEMAFILE_EDEFAULT.equals(schemafile);
+			case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID:
+				return STREAMID_EDEFAULT == null ? streamid != null : !STREAMID_EDEFAULT.equals(streamid);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -675,14 +675,14 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CSECPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID;
 				default: return -1;
 			}
 		}
@@ -701,14 +701,14 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CPORT;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CSECPORT;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTORELOC;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWD;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREALIAS;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__KEYSTOREPWDLOC;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__MAXINPUTQUEUE;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHID;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFLAG;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHPWD;
-				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHFILE;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__AUTHLIST;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__CHECKSCHEMAFLAG;
 				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__SCHEMAFILE;
+				case ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID: return ServicePackage.CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_INSTANCE__STREAMID;
 				default: return -1;
 			}
 		}
@@ -731,22 +731,22 @@ public class ControllerServiceStandardeventcollectorServiceInstanceImpl extends
 		result.append(csecport);
 		result.append(", keystoreloc: ");
 		result.append(keystoreloc);
-		result.append(", keystorepwd: ");
-		result.append(keystorepwd);
+		result.append(", keystorealias: ");
+		result.append(keystorealias);
+		result.append(", keystorepwdloc: ");
+		result.append(keystorepwdloc);
 		result.append(", maxinputqueue: ");
 		result.append(maxinputqueue);
-		result.append(", authid: ");
-		result.append(authid);
 		result.append(", authflag: ");
 		result.append(authflag);
-		result.append(", authpwd: ");
-		result.append(authpwd);
-		result.append(", authfile: ");
-		result.append(authfile);
+		result.append(", authlist: ");
+		result.append(authlist);
 		result.append(", checkschemaflag: ");
 		result.append(checkschemaflag);
 		result.append(", schemafile: ");
 		result.append(schemafile);
+		result.append(", streamid: ");
+		result.append(streamid);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ServicePackageImpl.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ServicePackageImpl.java
index 3ff2a1e..6ff6910 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ServicePackageImpl.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/impl/ServicePackageImpl.java
@@ -189,7 +189,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd() {
+	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias() {
 		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(3);
 	}
 
@@ -198,7 +198,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue() {
+	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc() {
 		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(4);
 	}
 
@@ -207,7 +207,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authid() {
+	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue() {
 		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(5);
 	}
 
@@ -225,8 +225,8 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd() {
-		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(7);
+	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag() {
+		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
@@ -234,8 +234,8 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authfile() {
-		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(8);
+	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile() {
+		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
@@ -243,8 +243,8 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag() {
-		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(9);
+	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Authlist() {
+		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
@@ -252,7 +252,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile() {
+	public EAttribute getControllerServiceStandardeventcollectorServiceConfiguration_Streamid() {
 		return (EAttribute)controllerServiceStandardeventcollectorServiceConfigurationEClass.getEStructuralFeatures().get(10);
 	}
 
@@ -292,14 +292,14 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CPORT);
 		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CSECPORT);
 		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTORELOC);
-		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWD);
+		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREALIAS);
+		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__KEYSTOREPWDLOC);
 		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__MAXINPUTQUEUE);
-		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHID);
 		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFLAG);
-		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHPWD);
-		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHFILE);
+		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__AUTHLIST);
 		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__CHECKSCHEMAFLAG);
 		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__SCHEMAFILE);
+		createEAttribute(controllerServiceStandardeventcollectorServiceConfigurationEClass, CONTROLLER_SERVICE_STANDARDEVENTCOLLECTOR_SERVICE_CONFIGURATION__STREAMID);
 	}
 
 	/**
@@ -347,14 +347,14 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Cport(), theEcorePackage.getEString(), "cport", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Csecport(), theEcorePackage.getEString(), "csecport", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Keystoreloc(), theEcorePackage.getEString(), "keystoreloc", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd(), theEcorePackage.getEString(), "keystorepwd", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias(), theEcorePackage.getEString(), "keystorealias", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc(), theEcorePackage.getEString(), "keystorepwdloc", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(), theEcorePackage.getEString(), "maxinputqueue", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authid(), theEcorePackage.getEString(), "authid", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authflag(), theEcorePackage.getEString(), "authflag", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd(), theEcorePackage.getEString(), "authpwd", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authfile(), theEcorePackage.getEString(), "authfile", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Authlist(), theEcorePackage.getEString(), "authlist", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(), theEcorePackage.getEString(), "checkschemaflag", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(), theEcorePackage.getEString(), "schemafile", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getControllerServiceStandardeventcollectorServiceConfiguration_Streamid(), theEcorePackage.getEString(), "streamid", null, 0, 1, ControllerServiceStandardeventcollectorServiceConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
@@ -363,7 +363,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 		// http://www.eclipse.org/emf/2011/Xcore
 		createXcoreAnnotations();
 		// http://openecomp.org
-		createEcompAnnotations();
+		createOpenecompAnnotations();
 	}
 
 	/**
@@ -388,7 +388,7 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected void createEcompAnnotations() {
+	protected void createOpenecompAnnotations() {
 		String source = "http://openecomp.org";	
 		addAnnotation
 		  (getControllerServiceStandardeventcollectorServiceConfiguration_Cport(), 
@@ -409,19 +409,19 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 			 "type", "configuration"
 		   });	
 		addAnnotation
-		  (getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwd(), 
+		  (getControllerServiceStandardeventcollectorServiceConfiguration_Keystorealias(), 
 		   source, 
 		   new String[] {
 			 "type", "configuration"
 		   });	
 		addAnnotation
-		  (getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(), 
+		  (getControllerServiceStandardeventcollectorServiceConfiguration_Keystorepwdloc(), 
 		   source, 
 		   new String[] {
 			 "type", "configuration"
 		   });	
 		addAnnotation
-		  (getControllerServiceStandardeventcollectorServiceConfiguration_Authid(), 
+		  (getControllerServiceStandardeventcollectorServiceConfiguration_Maxinputqueue(), 
 		   source, 
 		   new String[] {
 			 "type", "configuration"
@@ -433,25 +433,25 @@ public class ServicePackageImpl extends EPackageImpl implements ServicePackage {
 			 "type", "configuration"
 		   });	
 		addAnnotation
-		  (getControllerServiceStandardeventcollectorServiceConfiguration_Authpwd(), 
+		  (getControllerServiceStandardeventcollectorServiceConfiguration_Authlist(), 
 		   source, 
 		   new String[] {
 			 "type", "configuration"
 		   });	
 		addAnnotation
-		  (getControllerServiceStandardeventcollectorServiceConfiguration_Authfile(), 
+		  (getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(), 
 		   source, 
 		   new String[] {
 			 "type", "configuration"
 		   });	
 		addAnnotation
-		  (getControllerServiceStandardeventcollectorServiceConfiguration_Checkschemaflag(), 
+		  (getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(), 
 		   source, 
 		   new String[] {
 			 "type", "configuration"
 		   });	
 		addAnnotation
-		  (getControllerServiceStandardeventcollectorServiceConfiguration_Schemafile(), 
+		  (getControllerServiceStandardeventcollectorServiceConfiguration_Streamid(), 
 		   source, 
 		   new String[] {
 			 "type", "configuration"
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceAdapterFactory.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceAdapterFactory.java
index a95ef53..4ab8c92 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceAdapterFactory.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceAdapterFactory.java
@@ -23,22 +23,19 @@
  */
 package org.openecomp.dcae.controller.service.standardeventcollector.service.util;
 
-import org.openecomp.dcae.controller.core.service.DcaeService;
-import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
-
 import org.openecomp.dcae.controller.service.docker.DockerService;
 import org.openecomp.dcae.controller.service.docker.DockerServiceInstance;
 
 import org.openecomp.dcae.controller.service.standardeventcollector.service.*;
-
 import org.openecomp.ncomp.core.NamedEntity;
-
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 
 import org.eclipse.emf.ecore.EObject;
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceSwitch.java b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceSwitch.java
index d729c31..5997f38 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceSwitch.java
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore-gen/org/openecomp/dcae/controller/service/standardeventcollector/service/util/ServiceSwitch.java
@@ -23,20 +23,17 @@
  */
 package org.openecomp.dcae.controller.service.standardeventcollector.service.util;
 
-import org.openecomp.dcae.controller.core.service.DcaeService;
-import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
-
 import org.openecomp.dcae.controller.service.docker.DockerService;
 import org.openecomp.dcae.controller.service.docker.DockerServiceInstance;
 
 import org.openecomp.dcae.controller.service.standardeventcollector.service.*;
-
 import org.openecomp.ncomp.core.NamedEntity;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
 import org.eclipse.emf.ecore.util.Switch;
+import org.openecomp.dcae.controller.core.service.DcaeService;
+import org.openecomp.dcae.controller.core.service.DcaeServiceInstance;
 
 /**
  * <!-- begin-user-doc -->
@@ -76,7 +73,7 @@ public class ServiceSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
diff --git a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore/service.xcore b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore/service.xcore
index 97e6cf1..f63a754 100644
--- a/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore/service.xcore
+++ b/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/src/main/xcore/service.xcore
@@ -25,13 +25,13 @@
 package org.openecomp.dcae.controller.service.standardeventcollector.service

 

 

-import org.openecomp.dcae.controller.service.docker.DockerService 

+import org.openecomp.dcae.controller.service.docker.DockerService

 import org.openecomp.dcae.controller.service.docker.DockerServiceInstance 

 

-annotation "http://openecomp.org" as ecomp

+annotation "http://openecomp.org" as ecomp 

 

 class ControllerServiceStandardeventcollectorService extends DockerService {   

-	  

+ 	  

 } 

 

 // state in the controller

@@ -40,8 +40,6 @@ class ControllerServiceStandardeventcollectorServiceInstance extends DockerServi
 

 // state in both controller and manager

 class ControllerServiceStandardeventcollectorServiceConfiguration { 

-//	@ecomp(^type = "configuration")

-//	String cdapUrl

 	@ecomp(^type = "configuration")

 	String cport

 	@ecomp(^type = "configuration")

@@ -49,23 +47,21 @@ class ControllerServiceStandardeventcollectorServiceConfiguration {
 	@ecomp(^type = "configuration")

 	String keystoreloc

 	@ecomp(^type = "configuration")

-	String keystorepwd

+	String keystorealias

+	@ecomp(^type = "configuration")

+	String keystorepwdloc

     @ecomp(^type = "configuration")

 	String maxinputqueue

 	@ecomp(^type = "configuration")

-	String authid

-	@ecomp(^type = "configuration")

 	String authflag

-    @ecomp(^type = "configuration")

-	String authpwd

 	@ecomp(^type = "configuration")

-	String authfile

+	String authlist

 	@ecomp(^type = "configuration")

 	String checkschemaflag

 	@ecomp(^type = "configuration")

 	String schemafile

-	

- 

+	@ecomp(^type = "configuration")

+	String streamid	

 }