Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
Revert "Add plan-summary endpoint (#911)" (#919)
Browse files Browse the repository at this point in the history
This reverts commit 9668f12.
  • Loading branch information
gabrielhartmann authored Apr 26, 2017
1 parent c45ccb8 commit 05672ec
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 166 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.mesosphere.sdk.api;

import com.mesosphere.sdk.api.types.PlanInfo;
import com.mesosphere.sdk.api.types.PlanSummaryInfo;
import com.mesosphere.sdk.api.types.PrettyJsonResource;
import com.mesosphere.sdk.offer.evaluate.placement.RegexMatcher;
import com.mesosphere.sdk.offer.evaluate.placement.StringMatcher;
Expand Down Expand Up @@ -47,26 +46,6 @@ public Response listPlans() {
return jsonOkResponse(new JSONArray(getPlanNames()));
}

/**
* Returns a summary of all plans.
*/
@GET
@Path("/plan-summary")
public Response getPlanSummary() {
List<PlanSummaryInfo> planSummaries = planCoordinator.getPlanManagers().stream()
.map(planManager -> planManager.getPlan())
.map(plan -> PlanSummaryInfo.forPlan(plan))
.collect(Collectors.toList());

long incompletePlanCount = planSummaries.stream()
.filter(planSummaryInfo -> !planSummaryInfo.getStatus().equals(Status.COMPLETE))
.count();

Response.Status status = incompletePlanCount == 0 ? Response.Status.OK : Response.Status.ACCEPTED;

return jsonResponseBean(planSummaries, status);
}

/**
* Returns a full list of the {@link Plan}'s contents (incl all {@link Phase}s/{@link Step}s).
*/
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -67,87 +67,6 @@ public void testListPlans() {
assertEquals(String.format("[\"%s\"]", planName), response.getEntity().toString());
}

@Test
public void testGetSingleCompletePlanSummary() {
when(mockPlan.getStatus()).thenReturn(Status.COMPLETE);
when(mockPlan.getMessage()).thenReturn("The test plan is complete.");
Response response = resource.getPlanSummary();
assertEquals(200, response.getStatus());
}

@Test
public void testGetMultipleCompletePlanSummary() {
when(mockPlan.getStatus()).thenReturn(Status.COMPLETE);
when(mockPlan.getMessage()).thenReturn("The test plan is complete.");
resource = new PlansResource(
new DefaultPlanCoordinator(
Arrays.asList(
new DefaultPlanManager(mockPlan),
new DefaultPlanManager(mockPlan)),
planScheduler));
Response response = resource.getPlanSummary();
assertEquals(200, response.getStatus());
}

@Test
public void testGetMultipleIncompletePlanSummary() {
when(mockPlan.getStatus()).thenReturn(Status.COMPLETE);
when(mockPlan.getMessage()).thenReturn("The test plan is complete.");
PlanManager planManagerA = new DefaultPlanManager(mockPlan);

when(mockPlan.getStatus()).thenReturn(Status.IN_PROGRESS);
when(mockPlan.getMessage()).thenReturn("The test plan is in progress.");
PlanManager planManagerB = new DefaultPlanManager(mockPlan);

resource = new PlansResource(
new DefaultPlanCoordinator(
Arrays.asList(
planManagerA,
planManagerB),
planScheduler));
Response response = resource.getPlanSummary();
assertEquals(202, response.getStatus());
}

@Test
public void testGetMultipleBothIncompletePlanSummary() {
when(mockPlan.getStatus()).thenReturn(Status.STARTING);
when(mockPlan.getMessage()).thenReturn("The test plan is starting.");
PlanManager planManagerA = new DefaultPlanManager(mockPlan);

when(mockPlan.getStatus()).thenReturn(Status.IN_PROGRESS);
when(mockPlan.getMessage()).thenReturn("The test plan is in progress.");
PlanManager planManagerB = new DefaultPlanManager(mockPlan);

resource = new PlansResource(
new DefaultPlanCoordinator(
Arrays.asList(
planManagerA,
planManagerB),
planScheduler));
Response response = resource.getPlanSummary();
assertEquals(202, response.getStatus());
}

@Test
public void testGetMultipleBothCompletePlanSummary() {
when(mockPlan.getMessage()).thenReturn("The test plan is complete.");
when(mockPlan.getStatus()).thenReturn(Status.COMPLETE);
PlanManager planManagerA = new DefaultPlanManager(mockPlan);

when(mockPlan.getStatus()).thenReturn(Status.COMPLETE);
PlanManager planManagerB = new DefaultPlanManager(mockPlan);

resource = new PlansResource(
new DefaultPlanCoordinator(
Arrays.asList(
planManagerA,
planManagerB),
planScheduler));
Response response = resource.getPlanSummary();
assertEquals(200, response.getStatus());
}

@Test
public void testFullInfoComplete() {
when(mockPlan.isComplete()).thenReturn(true);
Expand Down

0 comments on commit 05672ec

Please sign in to comment.