add drop down menu for showing main account and sub account

deploy-board/deploy_board/templates/deploys/deploy_progress.tmpl

@@ -13,29 +13,69 @@
             {% for agentStat in report.agentStats %}
                 {% for hostTag in hostTags %}
                     {% if agentStat.agent.hostName == hostTag.hostName %}
+                        {% if report.showMode == "complete" or report.showMode == "compact" %}
                         <a href="/env/{{env.envName}}/{{env.stageName}}/host/{{ agentStat.agent.hostName }}"
-                           type="button" class="deployToolTip btn btn-xs {{ agentStat | agentButton }} host-btn"
-                           title="{{ agentStat | agentTip }}">
-                           {% if report.showMode == "complete" %}
-                           <small>{{ agentStat.agent.hostName }}</small>
-                           {% endif %}
-                           <i class="fa fa-fw {{ agentStat | agentIcon }}"></i>
+                        type="button" class="deployToolTip btn btn-xs {{ agentStat | agentButton }} host-btn"
+                        title="{{ agentStat | agentTip }}">
+                        {% if report.showMode != "compact" %}
+                        <small>{{ agentStat.agent.hostName }}</small>
+                        {% endif %}
+                        <i class="fa fa-fw {{ agentStat | agentIcon }}"></i>
+                        </a>
+                        {% elif report.showMode == "primaryAcct" %}
+
+                        <a href="/env/{{env.envName}}/{{env.stageName}}/host/{{ agentStat.agent.hostName }}"
+                        type="button" class="deployToolTip btn btn-xs {{ agentStat | agentButton }} host-btn"
+                        title="{{ agentStat | agentTip }}">              
+                        <small>{{ agentStat.agent.hostName }}</small>
+                        <i class="fa fa-fw {{ agentStat | agentIcon }}"></i>
+                        </a>
+
+                        {% elif report.showMode == "subAcct" %}
+
+                        <a href="/env/{{env.envName}}/{{env.stageName}}/host/{{ agentStat.agent.hostName }}"
+                        type="button" class="deployToolTip btn btn-xs {{ agentStat | agentButton }} host-btn"
+                        title="{{ agentStat | agentTip }}">              
+                        <small>{{ agentStat.agent.hostName }}</small>
+                        <i class="fa fa-fw {{ agentStat | agentIcon }}"></i>
                         </a>
+
+                        {% endif %}             
                     {% endif %}
                 {% endfor %}
             {% endfor %}
         </div>
         {% endfor %}
     {% else %}
         {% for agentStat in report.agentStats %}
-            <a href="/env/{{env.envName}}/{{env.stageName}}/host/{{ agentStat.agent.hostName }}"
+               {% if report.showMode == "complete" or report.showMode == "compact" %}
+               <a href="/env/{{env.envName}}/{{env.stageName}}/host/{{ agentStat.agent.hostName }}"
                type="button" class="deployToolTip btn btn-xs {{ agentStat | agentButton }} host-btn"
                title="{{ agentStat | agentTip }}">
-               {% if report.showMode == "complete" %}
+               {% if report.showMode != "compact" %}
                <small>{{ agentStat.agent.hostName }}</small>
                {% endif %}
                <i class="fa fa-fw {{ agentStat | agentIcon }}"></i>
-            </a>
+               </a>
+               {% elif report.showMode == "primaryAcct" %}
+               {% if agentStat.agent.hostId == 'i-0ce811ae17e6c1b78' %}
+               <a href="/env/{{env.envName}}/{{env.stageName}}/host/{{ agentStat.agent.hostName }}"
+               type="button" class="deployToolTip btn btn-xs {{ agentStat | agentButton }} host-btn"
+               title="{{ agentStat | agentTip }}">              
+               <small>{{ agentStat.agent.hostName }}</small>
+               <i class="fa fa-fw {{ agentStat | agentIcon }}"></i>
+               </a>
+               {% endif %}
+               {% elif report.showMode == "subAcct" %}
+               {% if accountIds['i-0a6485b3eed813298'] == 998131032990 %}
+               <a href="/env/{{env.envName}}/{{env.stageName}}/host/{{ agentStat.agent.hostName }}"
+               type="button" class="deployToolTip btn btn-xs {{ agentStat | agentButton }} host-btn"
+               title="{{ agentStat | agentTip }}">              
+               <small>{{ agentStat.agent.hostName }}</small>
+               <i class="fa fa-fw {{ agentStat | agentIcon }}"></i>
+               </a>
+               {% endif %}
+               {% endif %}              
         {% endfor %}
     {% endif %}
 

deploy-board/deploy_board/templates/environs/env_landing.html

@@ -408,6 +408,24 @@ <h4 class="panel-title pull-left pointer-cursor">
                         > Complete
                         </label></div>
                     </li>
+                    <li>
+                        <div class="radio"><label>&nbsp;
+                        <input type="radio" name="showMode" value="primaryAcct"
+                        {% if report.showMode == "primaryAcct" %}
+                        checked
+                        {% endif %}
+                        > Primary Account
+                        </label></div>
+                    </li>
+                    <li>
+                        <div class="radio"><label>&nbsp;
+                        <input type="radio" name="showMode" value="subAcct"
+                        {% if report.showMode == "subAcct" %}
+                        checked
+                        {% endif %}
+                        > Sub Account
+                        </label></div>
+                    </li>
                     <li role="presentation" class="divider"></li>
                     <li>
                         <div class="checkbox"><label>&nbsp;

deploy-board/deploy_board/webapp/env_views.py

@@ -411,12 +411,14 @@ def get(self, request, name, stage=None):
             report = agent_report.gen_report(request, env, progress, sortByStatus=sortByStatus)
             report.showMode = showMode
             report.sortByStatus = sortByStatus
+            accountIds = agents_helper.get_accountIds_by_env(request, env['id'])
             context = {
                 "envs": envs,
                 "env": env,
                 "env_promote": env_promote,
                 "stages": stages,
                 "report": report,
+                "accountIds": json.dumps(accountIds),
                 "has_deploy": True,
                 "metrics": metrics,
                 "metrics_dashboard_only": metrics_dashboard_only,

deploy-board/deploy_board/webapp/helpers/agents_helper.py

@@ -57,3 +57,7 @@ def get_agents_by_host(request, host_name):
 
 def get_agents_total_by_env(request, env_id):
     return deployclient.get("/agents/env/%s/total" % env_id, request.teletraan_user_id.token)
+
+
+def get_accountIds_by_env(request, env_id):
+    return deployclient.get("/agents/env/%s/accountIds" % env_id, request.teletraan_user_id.token)

deploy-board/deploy_board/webapp/helpers/hosts_helper.py

@@ -21,4 +21,4 @@
 
 
 def get_hosts_by_name(request, host_name):
-    return deployclient.get("/hosts/%s" % host_name, request.teletraan_user_id.token)
+    return deployclient.get("/hosts/%s" % host_name, request.teletraan_user_id.token)

deploy-service/common/src/main/java/com/pinterest/deployservice/dao/HostDAO.java

@@ -77,4 +77,6 @@ public interface HostDAO {
     Collection<String> getTerminatingHostIdsByGroup(String groupName) throws Exception;
 
     String getAccountIdByHost(String hostName) throws Exception;
+
+    String getAccountIdByHostId(String hostId) throws Exception;
 }

deploy-service/common/src/main/java/com/pinterest/deployservice/db/DBHostDAOImpl.java

@@ -71,6 +71,7 @@ public class DBHostDAOImpl implements HostDAO {
     private static final String GET_NEW_HOSTIDS_BY_GROUP = "SELECT DISTINCT host_id FROM hosts WHERE can_retire=0 AND group_name=? AND state not in (?,?,?)";
     private static final String GET_TERMINATING_HOST_IDS_BY_GROUP = "SELECT DISTINCT host_id FROM hosts WHERE state in (?, ?, ?) AND group_name=?";
     private static final String GET_ACCOUNTID_BY_HOSTNAME = "SELECT DISTINCT account_id FROM hosts WHERE host_name=?";
+    private static final String GET_ACCOUNTID_BY_HOSTID = "SELECT DISTINCT account_id FROM hosts WHERE host_id=?";
 
     private BasicDataSource dataSource;
 
@@ -294,4 +295,10 @@ public String getAccountIdByHost(String hostName) throws Exception {
         return new QueryRunner(dataSource).query(GET_ACCOUNTID_BY_HOSTNAME,
                 SingleResultSetHandlerFactory.<String>newObjectHandler(), hostName);
     }
+
+    @Override
+    public String getAccountIdByHostId(String hostId) throws Exception {
+        return new QueryRunner(dataSource).query(GET_ACCOUNTID_BY_HOSTID,
+                SingleResultSetHandlerFactory.<String>newObjectHandler(), hostId);
+    }
 }

deploy-service/teletraanservice/src/main/java/com/pinterest/teletraan/resource/Agents.java

@@ -17,6 +17,8 @@
 
 import com.pinterest.deployservice.bean.AgentBean;
 import com.pinterest.deployservice.dao.AgentDAO;
+import com.pinterest.deployservice.dao.HostDAO;
+
 import com.pinterest.teletraan.TeletraanServiceContext;
 
 import org.slf4j.Logger;
@@ -32,6 +34,8 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 
 @Path("/v1/agents")
 @Api(tags = "Agents")
@@ -45,9 +49,11 @@
 public class Agents {
     private static final Logger LOG = LoggerFactory.getLogger(Agents.class);
     private AgentDAO agentDAO;
+    private HostDAO hostDAO;
 
     public Agents(TeletraanServiceContext context) {
         agentDAO = context.getAgentDAO();
+        hostDAO = context.getHostDAO();
     }
 
     @GET
@@ -89,4 +95,23 @@ public long getCountByEnvName(
     public long getCountTotalHosts() throws Exception {
         return agentDAO.countDeployedHosts();
     }
+
+    @GET
+    @Path("/env/{envId : [a-zA-Z0-9\\-_]+}/accountIds")
+    @ApiOperation(
+            value = "Get account id for a specific environment object",
+            notes = "Returns a mapping object of host id and account id given an environment id",
+            response = String.class, responseContainer = "Map")
+    public Map<String, String> getAccountIds(
+            @ApiParam(value = "Environment id", required = true)@PathParam("envId") String envId) throws Exception {
+        Map<String, String> result = new HashMap<String, String>();
+        List<AgentBean> agents = agentDAO.getAllByEnv(envId);
+        for (int i = 0; i < agents.size(); i++) 
+        {
+            String hostId = agents.get(i).getHost_id();
+            String accountId = hostDAO.getAccountIdByHostId(hostId);
+            result.put(hostId, accountId);
+        }
+        return result;
+    }
 }