AMBARI-790. OK in registration response.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1393242 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -12,6 +12,8 @@ AMBARI-666 branch (unreleased changes)
 
   NEW FEATURES
 
+  AMBARI-790. OK in registration response. (jitendra)
+
   AMBARI-789. Prototype for management spi interface. (hitesh)
 
   AMBARI-787. Registration throws HostNotFoundException for new hosts. (jitendra)

ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java

@@ -147,8 +147,10 @@ public class HeartBeatHandler {
       hostObject.handleEvent(new HostStatusUpdatesReceivedEvent(hostname,
           now));
     } else {
-      response.setCommand(cmds);
+      response.setCommands(cmds);
     }
+    response.setResponseStatus(RegistrationStatus.OK);
+    response.setResponseId(0);
     return response;
   }
 }

ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java

@@ -38,6 +38,11 @@ public class RegistrationResponse {
   @XmlElement
   private RegistrationStatus response;
   
+  //Response id to start with, usually zero.
+  @XmlElement
+  private long responseId;
+  
+  @XmlElement
   private List<StatusCommand> commands = null;
 
   public RegistrationStatus getResponseStatus() {
@@ -48,11 +53,19 @@ public class RegistrationResponse {
     this.response = response;
   }
 
-  public List<StatusCommand> getCommand() {
+  public List<StatusCommand> getCommands() {
     return commands;
   }
 
-  public void setCommand(List<StatusCommand> commands) {
+  public void setCommands(List<StatusCommand> commands) {
     this.commands = commands;
   }
+
+  public long getResponseId() {
+    return responseId;
+  }
+
+  public void setResponseId(long responseId) {
+    this.responseId = responseId;
+  }
 }

ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java

@@ -90,9 +90,12 @@ public class TestHeartbeatHandler {
     hi.setOS("MegaOperatingSystem");
     reg.setHostname(hostname);
     reg.setHardwareProfile(hi);
-    handler.handleRegistration(reg);
+    RegistrationResponse response = handler.handleRegistration(reg);
     Host hostObject = fsm.getHost(hostname);
     assertEquals(hostObject.getState(), HostState.HEALTHY);
     assertEquals("MegaOperatingSystem", hostObject.getOsType());
+    assertEquals(RegistrationStatus.OK, response.getResponseStatus());
+    assertEquals(0, response.getResponseId());
+    assertEquals(null, response.getCommands());
   }
 }