Add statistics for Distribution Set (#1388)

* Add Statistics for Rollouts and Actions count by Status for a Distribution Set Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com> * remove unused imports Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com> * Refactoring and additional statistics for auto assignments Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com> * Fixed review findings and added tests Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com> * Added tests for the Management API Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com> * Remove unused imports Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com> * refactoring Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com> --------- Signed-off-by: Denislav Prinov <denislav.prinov@bosch.com>
2023-07-11 08:58:52 +03:00
parent 2fe73ee40c
commit 3402808ee9
11 changed files with 505 additions and 2 deletions
--- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java
+++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java
@@ -77,7 +77,6 @@ import io.qameta.allure.Step;
 import io.qameta.allure.Story;
 import org.springframework.util.Assert;

-import javax.validation.constraints.AssertTrue;

@Feature("Component Tests - Management API")
@Story("Distribution Set Resource")
@@ -1442,6 +1441,130 @@ public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegr
        assertThat(actions.get(0).getWeight()).get().isEqualTo(weight);
    }

+    @Test
+    @Description("Request to get the count of all Rollouts by status for specific Distribution set")
+    public void statisticsForRolloutsCountByStatus() throws Exception {
+        testdataFactory.createTargets("targets", 4);
+        DistributionSet ds1 = testdataFactory.createDistributionSet("DS1");
+        DistributionSet ds2 = testdataFactory.createDistributionSet("DS2");
+
+        testdataFactory.createRolloutByVariables("rollout1", "description",
+                1, "name==targets*", ds1, "50", "5", false);
+        Rollout rollout = testdataFactory.createRolloutByVariables("rollout2", "description",
+                1, "name==targets*", ds1, "50", "5", false);
+        rolloutManagement.start(rollout.getId());
+        rolloutHandler.handleAll();
+
+        mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/rollouts", ds1.getId()).contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("totalRolloutsPerStatus.READY", equalTo(1)))
+                .andExpect(jsonPath("totalRolloutsPerStatus.RUNNING", equalTo(1)))
+                .andExpect(jsonPath("totalRolloutsPerStatus.total", equalTo(2)))
+                .andExpect(jsonPath("totalActionsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
+
+        mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/rollouts", ds2.getId()).contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalActionsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
+    }
+
+    @Test
+    @Description("Request to get the count of all Actions by status for specific Distribution set")
+    public void statisticsForActionsCountByStatus() throws Exception {
+        testdataFactory.createTargets("targets", 4);
+
+        DistributionSet ds1 = testdataFactory.createDistributionSet("DS1");
+        DistributionSet ds2 = testdataFactory.createDistributionSet("DS2");
+
+        Rollout rollout = testdataFactory.createRolloutByVariables("rollout", "description",
+                1, "name==targets*", ds1, "50", "5", false);
+        rolloutManagement.start(rollout.getId());
+        rolloutHandler.handleAll();
+
+        mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/actions", ds1.getId()).contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("totalActionsPerStatus.RUNNING", equalTo(4)))
+                .andExpect(jsonPath("totalActionsPerStatus.total", equalTo(4)))
+                .andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
+
+        mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/actions", ds2.getId()).contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalActionsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
+    }
+
+    @Test
+    @Description("Request to get the count of all Auto Assignments for specific Distribution set")
+    public void statisticsForAutoAssignmentsCount() throws Exception {
+        testdataFactory.createTargets("targets", 4);
+        DistributionSet ds1 = testdataFactory.createDistributionSet("DS1");
+        DistributionSet ds2 = testdataFactory.createDistributionSet("DS2");
+
+        targetFilterQueryManagement.create(
+                entityFactory.targetFilterQuery().create().name("test filter 1").autoAssignDistributionSet(ds1.getId()).query("name==targets*"));
+
+        targetFilterQueryManagement.create(
+                entityFactory.targetFilterQuery().create().name("test filter 2").autoAssignDistributionSet(ds1.getId()).query("name==targets*"));
+
+        mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/autoassignments", ds1.getId()).contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("totalAutoAssignments", equalTo(2)))
+                .andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalActionsPerStatus").doesNotExist());
+
+        mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/autoassignments", ds2.getId()).contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalActionsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
+    }
+
+    @Test
+    @Description("Request to get full Statistics for specific Distribution set")
+    public void statisticsForDistributionSet() throws Exception {
+        testdataFactory.createTargets("targets", 4);
+        testdataFactory.createTargets("autoAssignments", 4);
+        DistributionSet ds1 = testdataFactory.createDistributionSet("DS1");
+        DistributionSet ds2 = testdataFactory.createDistributionSet("DS2");
+
+        targetFilterQueryManagement.create(
+                entityFactory.targetFilterQuery().create().name("test filter 1").autoAssignDistributionSet(ds1.getId()).query("name==autoAssignments*"));
+
+        Rollout rollout = testdataFactory.createRolloutByVariables("rollout", "description",
+                1, "name==targets*", ds1, "50", "5", false);
+        rolloutManagement.start(rollout.getId());
+        rolloutHandler.handleAll();
+
+
+        mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics", ds1.getId()).contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("totalAutoAssignments", equalTo(1)))
+                .andExpect(jsonPath("totalActionsPerStatus.RUNNING", equalTo(4)))
+                .andExpect(jsonPath("totalActionsPerStatus.total", equalTo(4)))
+                .andExpect(jsonPath("totalRolloutsPerStatus.RUNNING", equalTo(1)))
+                .andExpect(jsonPath("totalRolloutsPerStatus.total", equalTo(1)));
+
+
+        mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{ds}/statistics/autoassignments", ds2.getId()).contentType(MediaType.APPLICATION_JSON))
+                .andDo(MockMvcResultPrinter.print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("totalRolloutsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalActionsPerStatus").doesNotExist())
+                .andExpect(jsonPath("totalAutoAssignments").doesNotExist());
+    }
+
+
    @Test
    @Description("Verify invalidation of distribution sets that removes distribution sets from auto assignments, stops rollouts and cancels assignments")
    public void invalidateDistributionSet() throws Exception {