@@ -57,7 +57,7 @@ public Answer execute(final CheckOnHostCommand command, final LibvirtComputingRe
             if (hasHeartBeat) {
                 return new CheckOnHostAnswer(command, true, "Heart is beating");
             } else {
-                return new CheckOnHostAnswer(command, "Heart is not beating");
+                return new CheckOnHostAnswer(command, false, "Heart is not beating");
             }
         } catch (final InterruptedException e) {
             return new CheckOnHostAnswer(command, "CheckOnHostCommand: can't get status of host: InterruptedException");
 
@@ -117,6 +117,7 @@ public Status getHostAgentStatus(Host host) {
         }
 
         Status hostStatusFromNeighbour = checkHostStatusWithNeighbourHosts(host);
+        logger.debug("{} status reported from itself: {} and neighbor: {}", host.toString(), hostStatusFromItself, hostStatusFromNeighbour);
         Status hostStatus = hostStatusFromItself;
         if (hostStatusFromNeighbour == Status.Up && (hostStatusFromItself == Status.Disconnected || hostStatusFromItself == Status.Down)) {
             hostStatus = Status.Disconnected;
 
@@ -61,6 +61,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import com.cloud.agent.api.CheckOnHostAnswer;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
@@ -3202,7 +3203,9 @@ public void testCheckOnHostCommand() {
         assertNotNull(wrapper);
 
         final Answer answer = wrapper.execute(command, libvirtComputingResourceMock);
-        assertFalse(answer.getResult());
+        assertTrue(answer.getResult());
+        assertTrue(answer instanceof CheckOnHostAnswer);
+        assertFalse(((CheckOnHostAnswer)answer).isAlive());
 
         verify(libvirtComputingResourceMock, times(1)).getMonitor();
     }
 
@@ -5807,7 +5807,7 @@ protected Answer execute(PingTestCommand cmd) {
     }
 
     protected Answer execute(CheckOnHostCommand cmd) {
-        return new CheckOnHostAnswer(cmd, null, "Not Implmeneted");
+        return new CheckOnHostAnswer(cmd, null, "Not Implemented");
     }
 
     protected Answer execute(ModifySshKeysCommand cmd) {
 
@@ -31,6 +31,6 @@ public final class CitrixCheckOnHostCommandWrapper extends CommandWrapper<CheckO
 
     @Override
     public Answer execute(final CheckOnHostCommand command, final CitrixResourceBase citrixResourceBase) {
-        return new CheckOnHostAnswer(command, "Not Implmeneted");
+        return new CheckOnHostAnswer(command, "Not Implemented");
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public Answer execute(final CheckOnHostCommand command, final LibvirtComputingRe`
`57`	`57`	`if (hasHeartBeat) {`
`58`	`58`	`return new CheckOnHostAnswer(command, true, "Heart is beating");`
`59`	`59`	`} else {`
`60`		`- return new CheckOnHostAnswer(command, "Heart is not beating");`
	`60`	`+ return new CheckOnHostAnswer(command, false, "Heart is not beating");`
`61`	`61`	`}`
`62`	`62`	`} catch (final InterruptedException e) {`
`63`	`63`	`return new CheckOnHostAnswer(command, "CheckOnHostCommand: can't get status of host: InterruptedException");`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ public Status getHostAgentStatus(Host host) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`Status hostStatusFromNeighbour = checkHostStatusWithNeighbourHosts(host);`
	`120`	`+ logger.debug("{} status reported from itself: {} and neighbor: {}", host.toString(), hostStatusFromItself, hostStatusFromNeighbour);`
`120`	`121`	`Status hostStatus = hostStatusFromItself;`
`121`	`122`	`if (hostStatusFromNeighbour == Status.Up && (hostStatusFromItself == Status.Disconnected \|\| hostStatusFromItself == Status.Down)) {`
`122`	`123`	`hostStatus = Status.Disconnected;`
Original file line number	Diff line number	Diff line change
`@@ -5807,7 +5807,7 @@ protected Answer execute(PingTestCommand cmd) {`
`5807`	`5807`	`}`
`5808`	`5808`
`5809`	`5809`	`protected Answer execute(CheckOnHostCommand cmd) {`
`5810`		`- return new CheckOnHostAnswer(cmd, null, "Not Implmeneted");`
	`5810`	`+ return new CheckOnHostAnswer(cmd, null, "Not Implemented");`
`5811`	`5811`	`}`
`5812`	`5812`
`5813`	`5813`	`protected Answer execute(ModifySshKeysCommand cmd) {`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ public final class CitrixCheckOnHostCommandWrapper extends CommandWrapper<CheckO`
`31`	`31`
`32`	`32`	`@Override`
`33`	`33`	`public Answer execute(final CheckOnHostCommand command, final CitrixResourceBase citrixResourceBase) {`
`34`		`- return new CheckOnHostAnswer(command, "Not Implmeneted");`
	`34`	`+ return new CheckOnHostAnswer(command, "Not Implemented");`
`35`	`35`	`}`
`36`	`36`	`}`