Merge pull request #418 from Microsoft/yqwang/launcher-dev

[Launcher]: Add queue into SummarizedFrameworkInfo

frameworklauncher/src/main/java/com/microsoft/frameworklauncher/applicationmaster/StatusManager.java

@@ -506,7 +506,7 @@ public class StatusManager extends AbstractService {  // THREAD SAFE
     }
     return startStatesTaskCount;
   }
-  
+
   public synchronized List<ValueRange> getLiveAssociatedContainerPorts(String taskRoleName) {
     List<TaskStatus> taskStatusList = taskStatuseses.get(taskRoleName).getTaskStatusArray();
     for (TaskStatus taskStatus : taskStatusList) {

frameworklauncher/src/main/java/com/microsoft/frameworklauncher/common/model/SummarizedFrameworkInfo.java

@@ -26,6 +26,7 @@ public class SummarizedFrameworkInfo implements Serializable {
   private ExecutionType executionType;
   private String frameworkDescription;
   private String userName;
+  private String queue;
   private Long firstRequestTimestamp;
   private Long lastRequestTimestamp;
 
@@ -44,6 +45,7 @@ public class SummarizedFrameworkInfo implements Serializable {
     sFrameworkInfo.setExecutionType(frameworkDescriptor.getExecutionType());
     sFrameworkInfo.setFrameworkDescription(frameworkDescriptor.getDescription());
     sFrameworkInfo.setUserName(frameworkDescriptor.getUser().getName());
+    sFrameworkInfo.setQueue(frameworkDescriptor.getPlatformSpecificParameters().getQueue());
     sFrameworkInfo.setFirstRequestTimestamp(frameworkRequest.getFirstRequestTimestamp());
     sFrameworkInfo.setLastRequestTimestamp(frameworkRequest.getLastRequestTimestamp());
 
@@ -94,6 +96,14 @@ public class SummarizedFrameworkInfo implements Serializable {
     this.userName = userName;
   }
 
+  public String getQueue() {
+    return queue;
+  }
+
+  public void setQueue(String queue) {
+    this.queue = queue;
+  }
+
   public Long getFirstRequestTimestamp() {
     return firstRequestTimestamp;
   }

frameworklauncher/src/test/java/com/microsoft/frameworklauncher/applicationmaster/SelectionManagerTest.java

@@ -19,7 +19,6 @@ package com.microsoft.frameworklauncher.applicationmaster;
 
 
 import com.microsoft.frameworklauncher.common.exceptions.NotAvailableException;
-import com.microsoft.frameworklauncher.common.model.ClusterConfiguration;
 import com.microsoft.frameworklauncher.common.model.NodeConfiguration;
 import com.microsoft.frameworklauncher.common.model.ResourceDescriptor;
 import com.microsoft.frameworklauncher.common.model.ValueRange;