[DCAE-15] Changes related to version 1.1

See Jira for details

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

8 files changed, 381 insertions, 9 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 {