lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Set offline DS action inactive on creation (#728)

Browse Source 
* fix: set offline DS action inactive on creation
* test: assert that all offline actions are inactive

Signed-off-by: Subhadip Pramanik <pramaniksubhadip@gmail.com>
This commit is contained in:
Subhadip Pramanik
2018-08-24 19:13:08 +05:30
committed by Jeroen Laverman
parent 086c5ca0cf
commit 9bec200a7a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java
View File

@@ -89,6 +89,7 @@ public class OfflineDsAssignmentStrategy extends AbstractDsAssignmentStrategy {
final JpaTarget target, final JpaDistributionSet set) { final JpaTarget target, final JpaDistributionSet set) {
final JpaAction result = super.createTargetAction(targetsWithActionMap, target, set); final JpaAction result = super.createTargetAction(targetsWithActionMap, target, set);
result.setStatus(Status.FINISHED); result.setStatus(Status.FINISHED);
result.setActive(Boolean.FALSE);
return result; return result;
} }

3
hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java
View File

@@ -484,7 +484,8 @@ public class DeploymentManagementTest extends AbstractJpaIntegrationTest {
final List<Target> targets = deploymentManagement.offlineAssignedDistributionSet(ds.getId(), controllerIds) final List<Target> targets = deploymentManagement.offlineAssignedDistributionSet(ds.getId(), controllerIds)
.getAssignedEntity(); .getAssignedEntity();
assertThat(actionRepository.count()).isEqualTo(20); assertThat(actionRepository.count()).isEqualTo(20);
assertThat(actionRepository.findByDistributionSetId(PAGE, ds.getId()))
.as("Offline actions are not active").allMatch(action -> !action.isActive());
assertThat(targetManagement.findByInstalledDistributionSet(PAGE, ds.getId()).getContent()).containsAll(targets) assertThat(targetManagement.findByInstalledDistributionSet(PAGE, ds.getId()).getContent()).containsAll(targets)
.hasSize(10).containsAll(targetManagement.findByAssignedDistributionSet(PAGE, ds.getId())) .hasSize(10).containsAll(targetManagement.findByAssignedDistributionSet(PAGE, ds.getId()))
.as("InstallationDate set").allMatch(target -> target.getInstallationDate() >= current) .as("InstallationDate set").allMatch(target -> target.getInstallationDate() >= current)