Merge branch 'master' into Download_server_supports_download_through_HTTP_and_HTTPs
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
package org.eclipse.hawkbit.repository;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.hawkbit.repository.model.AssignmentResult;
|
||||
@@ -19,7 +20,7 @@ import org.eclipse.hawkbit.repository.model.Target;
|
||||
* how much of the assignments had already been existed.
|
||||
*
|
||||
*/
|
||||
public class DistributionSetAssignmentResult extends AssignmentResult {
|
||||
public class DistributionSetAssignmentResult extends AssignmentResult<Target> {
|
||||
|
||||
private final List<String> assignedTargets;
|
||||
private final List<Long> actions;
|
||||
@@ -45,16 +46,14 @@ public class DistributionSetAssignmentResult extends AssignmentResult {
|
||||
*/
|
||||
public DistributionSetAssignmentResult(final List<String> assignedTargets, final int assigned,
|
||||
final int alreadyAssigned, final List<Long> actions, final TargetManagement targetManagement) {
|
||||
super(assigned, alreadyAssigned);
|
||||
super(assigned, alreadyAssigned, 0, Collections.emptyList(), Collections.emptyList());
|
||||
this.assignedTargets = assignedTargets;
|
||||
this.actions = actions;
|
||||
this.targetManagement = targetManagement;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the assignedTargets
|
||||
*/
|
||||
public List<Target> getAssignedTargets() {
|
||||
|
||||
@Override
|
||||
public List<Target> getAssignedEntity() {
|
||||
return targetManagement.findTargetByControllerID(assignedTargets);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,15 +8,21 @@
|
||||
*/
|
||||
package org.eclipse.hawkbit.repository.model;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Generic assignment result bean.
|
||||
*
|
||||
*/
|
||||
public class AssignmentResult {
|
||||
public class AssignmentResult<T extends BaseEntity> {
|
||||
|
||||
private final int total;
|
||||
private final int assigned;
|
||||
private final int alreadyAssigned;
|
||||
|
||||
private final int unassigned;
|
||||
private final List<T> assignedEntity;
|
||||
private final List<T> unassignedEntity;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
@@ -24,25 +30,47 @@ public class AssignmentResult {
|
||||
* @param assigned
|
||||
* is the number of newly assigned elements.
|
||||
* @param alreadyAssigned
|
||||
* is the number of already assigned elements.
|
||||
* number of already assigned/ignored elements
|
||||
* @param unassigned
|
||||
* number of newly assigned elements
|
||||
* @param assignedEntity
|
||||
* {@link List} of assigned entity.
|
||||
* @param unassignedEntity
|
||||
* {@link List} of unassigned entity.
|
||||
*/
|
||||
public AssignmentResult(final int assigned, final int alreadyAssigned) {
|
||||
super();
|
||||
public AssignmentResult(final int assigned, final int alreadyAssigned, final int unassigned,
|
||||
final List<T> assignedEntity, final List<T> unassignedEntity) {
|
||||
this.assigned = assigned;
|
||||
this.alreadyAssigned = alreadyAssigned;
|
||||
total = assigned + alreadyAssigned;
|
||||
this.unassigned = unassigned;
|
||||
this.assignedEntity = assignedEntity;
|
||||
this.unassignedEntity = unassignedEntity;
|
||||
}
|
||||
|
||||
|
||||
public int getAssigned() {
|
||||
return assigned;
|
||||
}
|
||||
|
||||
|
||||
public int getTotal() {
|
||||
return total;
|
||||
}
|
||||
|
||||
|
||||
public int getAlreadyAssigned() {
|
||||
return alreadyAssigned;
|
||||
}
|
||||
|
||||
|
||||
public int getUnassigned() {
|
||||
return unassigned;
|
||||
}
|
||||
|
||||
public List<T> getAssignedEntity() {
|
||||
return assignedEntity;
|
||||
}
|
||||
|
||||
public List<T> getUnassignedEntity() {
|
||||
return unassignedEntity;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -14,11 +14,8 @@ import java.util.List;
|
||||
* Result object for {@link DistributionSetTag} assignments.
|
||||
*
|
||||
*/
|
||||
public class DistributionSetTagAssignmentResult extends AssignmentResult {
|
||||
public class DistributionSetTagAssignmentResult extends AssignmentResult<DistributionSet> {
|
||||
|
||||
private final int unassigned;
|
||||
private final List<DistributionSet> assignedDs;
|
||||
private final List<DistributionSet> unassignedDs;
|
||||
private final DistributionSetTag distributionSetTag;
|
||||
|
||||
/**
|
||||
@@ -40,27 +37,13 @@ public class DistributionSetTagAssignmentResult extends AssignmentResult {
|
||||
public DistributionSetTagAssignmentResult(final int alreadyAssigned, final int assigned, final int unassigned,
|
||||
final List<DistributionSet> assignedDs, final List<DistributionSet> unassignedDs,
|
||||
final DistributionSetTag distributionSetTag) {
|
||||
super(assigned, alreadyAssigned);
|
||||
this.unassigned = unassigned;
|
||||
this.assignedDs = assignedDs;
|
||||
this.unassignedDs = unassignedDs;
|
||||
super(assigned, alreadyAssigned,unassigned, assignedDs, unassignedDs);
|
||||
this.distributionSetTag = distributionSetTag;
|
||||
}
|
||||
|
||||
public int getUnassigned() {
|
||||
return unassigned;
|
||||
}
|
||||
|
||||
public DistributionSetTag getDistributionSetTag() {
|
||||
return distributionSetTag;
|
||||
}
|
||||
|
||||
public List<DistributionSet> getAssignedDs() {
|
||||
return assignedDs;
|
||||
}
|
||||
|
||||
public List<DistributionSet> getUnassignedDs() {
|
||||
return unassignedDs;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -14,11 +14,8 @@ import java.util.List;
|
||||
* Result object for {@link TargetTag} assignments.
|
||||
*
|
||||
*/
|
||||
public class TargetTagAssignmentResult extends AssignmentResult {
|
||||
public class TargetTagAssignmentResult extends AssignmentResult<Target> {
|
||||
|
||||
private final int unassigned;
|
||||
private final List<Target> assignedTargets;
|
||||
private final List<Target> unassignedTargets;
|
||||
private final TargetTag targetTag;
|
||||
|
||||
/**
|
||||
@@ -39,25 +36,10 @@ public class TargetTagAssignmentResult extends AssignmentResult {
|
||||
*/
|
||||
public TargetTagAssignmentResult(final int alreadyAssigned, final int assigned, final int unassigned,
|
||||
final List<Target> assignedTargets, final List<Target> unassignedTargets, final TargetTag targetTag) {
|
||||
super(assigned, alreadyAssigned);
|
||||
this.unassigned = unassigned;
|
||||
this.assignedTargets = assignedTargets;
|
||||
this.unassignedTargets = unassignedTargets;
|
||||
super(assigned, alreadyAssigned, unassigned, assignedTargets, unassignedTargets);
|
||||
this.targetTag = targetTag;
|
||||
}
|
||||
|
||||
public int getUnassigned() {
|
||||
return unassigned;
|
||||
}
|
||||
|
||||
public List<Target> getAssignedTargets() {
|
||||
return assignedTargets;
|
||||
}
|
||||
|
||||
public List<Target> getUnassignedTargets() {
|
||||
return unassignedTargets;
|
||||
}
|
||||
|
||||
public TargetTag getTargetTag() {
|
||||
return targetTag;
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ public class ControllerManagementTest extends AbstractIntegrationTest {
|
||||
|
||||
assertThat(savedTarget.getTargetInfo().getUpdateStatus()).isEqualTo(TargetUpdateStatus.UNKNOWN);
|
||||
|
||||
savedTarget = deploymentManagement.assignDistributionSet(ds, toAssign).getAssignedTargets().iterator().next();
|
||||
savedTarget = deploymentManagement.assignDistributionSet(ds, toAssign).getAssignedEntity().iterator().next();
|
||||
final Action savedAction = deploymentManagement.findActiveActionsByTarget(savedTarget).get(0);
|
||||
|
||||
assertThat(targetManagement.findTargetByControllerID(savedTarget.getControllerId()).getTargetInfo()
|
||||
@@ -104,7 +104,7 @@ public class ControllerManagementTest extends AbstractIntegrationTest {
|
||||
Target savedTarget = targetManagement.createTarget(target);
|
||||
final List<Target> toAssign = new ArrayList<>();
|
||||
toAssign.add(savedTarget);
|
||||
savedTarget = deploymentManagement.assignDistributionSet(ds, toAssign).getAssignedTargets().iterator().next();
|
||||
savedTarget = deploymentManagement.assignDistributionSet(ds, toAssign).getAssignedEntity().iterator().next();
|
||||
Action savedAction = deploymentManagement.findActiveActionsByTarget(savedTarget).get(0);
|
||||
|
||||
// test and verify
|
||||
|
||||
@@ -155,8 +155,8 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
|
||||
List<Target> targets = targetManagement
|
||||
.createTargets(TestDataUtil.generateTargets(Constants.MAX_ENTRIES_IN_STATEMENT + 10));
|
||||
|
||||
targets = deploymentManagement.assignDistributionSet(cancelDs, targets).getAssignedTargets();
|
||||
targets = deploymentManagement.assignDistributionSet(cancelDs2, targets).getAssignedTargets();
|
||||
targets = deploymentManagement.assignDistributionSet(cancelDs, targets).getAssignedEntity();
|
||||
targets = deploymentManagement.assignDistributionSet(cancelDs2, targets).getAssignedEntity();
|
||||
|
||||
targetManagement.findAllTargetIds().forEach(targetIdName -> {
|
||||
assertThat(deploymentManagement.findActiveActionsByTarget(
|
||||
@@ -604,7 +604,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
|
||||
// activeActions, add a corresponding cancelAction and another
|
||||
// UpdateAction for dsA
|
||||
final Iterable<Target> deployed2DS = deploymentManagement
|
||||
.assignDistributionSet(dsA, deployResWithDsB.getDeployedTargets()).getAssignedTargets();
|
||||
.assignDistributionSet(dsA, deployResWithDsB.getDeployedTargets()).getAssignedEntity();
|
||||
actionRepository.findByDistributionSet(pageRequest, dsA).getContent().get(1);
|
||||
|
||||
// get final updated version of targets
|
||||
@@ -761,7 +761,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
|
||||
targs.add(targ);
|
||||
|
||||
// doing the assignment
|
||||
targs = deploymentManagement.assignDistributionSet(dsA, targs).getAssignedTargets();
|
||||
targs = deploymentManagement.assignDistributionSet(dsA, targs).getAssignedEntity();
|
||||
targ = targetManagement.findTargetByControllerID(targs.iterator().next().getControllerId());
|
||||
|
||||
// checking the revisions of the created entities
|
||||
@@ -799,7 +799,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
|
||||
assertEquals("wrong installed ds", dsA, targ.getTargetInfo().getInstalledDistributionSet());
|
||||
|
||||
targs = deploymentManagement.assignDistributionSet(dsB.getId(), new String[] { "target-id-A" })
|
||||
.getAssignedTargets();
|
||||
.getAssignedEntity();
|
||||
|
||||
targ = targs.iterator().next();
|
||||
|
||||
@@ -830,7 +830,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
|
||||
|
||||
final List<Target> targs = new ArrayList<Target>();
|
||||
targs.add(targ);
|
||||
final Iterable<Target> savedTargs = deploymentManagement.assignDistributionSet(dsA, targs).getAssignedTargets();
|
||||
final Iterable<Target> savedTargs = deploymentManagement.assignDistributionSet(dsA, targs).getAssignedEntity();
|
||||
targ = savedTargs.iterator().next();
|
||||
|
||||
assertThat(dsA.getOptLockRevision()).as("lock revision is wrong").isEqualTo(
|
||||
@@ -926,7 +926,7 @@ public class DeploymentManagementTest extends AbstractIntegrationTest {
|
||||
// assigning all DistributionSet to the Target in the list
|
||||
// deployedTargets
|
||||
for (final DistributionSet ds : dsList) {
|
||||
deployedTargets = deploymentManagement.assignDistributionSet(ds, deployedTargets).getAssignedTargets();
|
||||
deployedTargets = deploymentManagement.assignDistributionSet(ds, deployedTargets).getAssignedEntity();
|
||||
}
|
||||
|
||||
final DeploymentResult deploymentResult = new DeploymentResult(deployedTargets, nakedTargets, dsList,
|
||||
|
||||
@@ -495,11 +495,11 @@ public class DistributionSetManagementTest extends AbstractIntegrationTest {
|
||||
distributionSetManagement.deleteDistributionSet(dsDeleted);
|
||||
dsDeleted = distributionSetManagement.findDistributionSetById(dsDeleted.getId());
|
||||
|
||||
ds100Group1 = distributionSetManagement.toggleTagAssignment(ds100Group1, dsTagA).getAssignedDs();
|
||||
ds100Group1 = distributionSetManagement.toggleTagAssignment(ds100Group1, dsTagA).getAssignedEntity();
|
||||
dsTagA = distributionSetTagRepository.findByNameEquals(dsTagA.getName());
|
||||
ds100Group1 = distributionSetManagement.toggleTagAssignment(ds100Group1, dsTagB).getAssignedDs();
|
||||
ds100Group1 = distributionSetManagement.toggleTagAssignment(ds100Group1, dsTagB).getAssignedEntity();
|
||||
dsTagA = distributionSetTagRepository.findByNameEquals(dsTagA.getName());
|
||||
ds100Group2 = distributionSetManagement.toggleTagAssignment(ds100Group2, dsTagA).getAssignedDs();
|
||||
ds100Group2 = distributionSetManagement.toggleTagAssignment(ds100Group2, dsTagA).getAssignedEntity();
|
||||
dsTagA = distributionSetTagRepository.findByNameEquals(dsTagA.getName());
|
||||
|
||||
// check setup
|
||||
|
||||
@@ -179,29 +179,29 @@ public class TagManagementTest extends AbstractIntegrationTest {
|
||||
DistributionSetTagAssignmentResult result = distributionSetManagement.toggleTagAssignment(groupA, tag);
|
||||
assertThat(result.getAlreadyAssigned()).isEqualTo(0);
|
||||
assertThat(result.getAssigned()).isEqualTo(20);
|
||||
assertThat(result.getAssignedDs()).containsAll(distributionSetManagement.findDistributionSetListWithDetails(
|
||||
assertThat(result.getAssignedEntity()).containsAll(distributionSetManagement.findDistributionSetListWithDetails(
|
||||
groupA.stream().map(set -> set.getId()).collect(Collectors.toList())));
|
||||
assertThat(result.getUnassigned()).isEqualTo(0);
|
||||
assertThat(result.getUnassignedDs()).isEmpty();
|
||||
assertThat(result.getUnassignedEntity()).isEmpty();
|
||||
assertThat(result.getDistributionSetTag()).isEqualTo(tag);
|
||||
|
||||
// toggle A+B -> A is still assigned and B is assigned as well
|
||||
result = distributionSetManagement.toggleTagAssignment(concat(groupA, groupB), tag);
|
||||
assertThat(result.getAlreadyAssigned()).isEqualTo(20);
|
||||
assertThat(result.getAssigned()).isEqualTo(20);
|
||||
assertThat(result.getAssignedDs()).containsAll(distributionSetManagement.findDistributionSetListWithDetails(
|
||||
assertThat(result.getAssignedEntity()).containsAll(distributionSetManagement.findDistributionSetListWithDetails(
|
||||
groupB.stream().map(set -> set.getId()).collect(Collectors.toList())));
|
||||
assertThat(result.getUnassigned()).isEqualTo(0);
|
||||
assertThat(result.getUnassignedDs()).isEmpty();
|
||||
assertThat(result.getUnassignedEntity()).isEmpty();
|
||||
assertThat(result.getDistributionSetTag()).isEqualTo(tag);
|
||||
|
||||
// toggle A+B -> both unassigned
|
||||
result = distributionSetManagement.toggleTagAssignment(concat(groupA, groupB), tag);
|
||||
assertThat(result.getAlreadyAssigned()).isEqualTo(0);
|
||||
assertThat(result.getAssigned()).isEqualTo(0);
|
||||
assertThat(result.getAssignedDs()).isEmpty();
|
||||
assertThat(result.getAssignedEntity()).isEmpty();
|
||||
assertThat(result.getUnassigned()).isEqualTo(40);
|
||||
assertThat(result.getUnassignedDs()).containsAll(distributionSetManagement.findDistributionSetListWithDetails(
|
||||
assertThat(result.getUnassignedEntity()).containsAll(distributionSetManagement.findDistributionSetListWithDetails(
|
||||
concat(groupB, groupA).stream().map(set -> set.getId()).collect(Collectors.toList())));
|
||||
assertThat(result.getDistributionSetTag()).isEqualTo(tag);
|
||||
|
||||
@@ -220,29 +220,29 @@ public class TagManagementTest extends AbstractIntegrationTest {
|
||||
TargetTagAssignmentResult result = targetManagement.toggleTagAssignment(groupA, tag);
|
||||
assertThat(result.getAlreadyAssigned()).isEqualTo(0);
|
||||
assertThat(result.getAssigned()).isEqualTo(20);
|
||||
assertThat(result.getAssignedTargets()).containsAll(targetManagement.findTargetsByControllerIDsWithTags(
|
||||
assertThat(result.getAssignedEntity()).containsAll(targetManagement.findTargetsByControllerIDsWithTags(
|
||||
groupA.stream().map(target -> target.getControllerId()).collect(Collectors.toList())));
|
||||
assertThat(result.getUnassigned()).isEqualTo(0);
|
||||
assertThat(result.getUnassignedTargets()).isEmpty();
|
||||
assertThat(result.getUnassignedEntity()).isEmpty();
|
||||
assertThat(result.getTargetTag()).isEqualTo(tag);
|
||||
|
||||
// toggle A+B -> A is still assigned and B is assigned as well
|
||||
result = targetManagement.toggleTagAssignment(concat(groupA, groupB), tag);
|
||||
assertThat(result.getAlreadyAssigned()).isEqualTo(20);
|
||||
assertThat(result.getAssigned()).isEqualTo(20);
|
||||
assertThat(result.getAssignedTargets()).containsAll(targetManagement.findTargetsByControllerIDsWithTags(
|
||||
assertThat(result.getAssignedEntity()).containsAll(targetManagement.findTargetsByControllerIDsWithTags(
|
||||
groupB.stream().map(target -> target.getControllerId()).collect(Collectors.toList())));
|
||||
assertThat(result.getUnassigned()).isEqualTo(0);
|
||||
assertThat(result.getUnassignedTargets()).isEmpty();
|
||||
assertThat(result.getUnassignedEntity()).isEmpty();
|
||||
assertThat(result.getTargetTag()).isEqualTo(tag);
|
||||
|
||||
// toggle A+B -> both unassigned
|
||||
result = targetManagement.toggleTagAssignment(concat(groupA, groupB), tag);
|
||||
assertThat(result.getAlreadyAssigned()).isEqualTo(0);
|
||||
assertThat(result.getAssigned()).isEqualTo(0);
|
||||
assertThat(result.getAssignedTargets()).isEmpty();
|
||||
assertThat(result.getAssignedEntity()).isEmpty();
|
||||
assertThat(result.getUnassigned()).isEqualTo(40);
|
||||
assertThat(result.getUnassignedTargets()).containsAll(targetManagement.findTargetsByControllerIDsWithTags(
|
||||
assertThat(result.getUnassignedEntity()).containsAll(targetManagement.findTargetsByControllerIDsWithTags(
|
||||
concat(groupB, groupA).stream().map(target -> target.getControllerId()).collect(Collectors.toList())));
|
||||
assertThat(result.getTargetTag()).isEqualTo(tag);
|
||||
|
||||
|
||||
@@ -64,19 +64,19 @@ public class TargetManagementSearchTest extends AbstractIntegrationTest {
|
||||
final String targetDsAIdPref = "targ-A";
|
||||
List<Target> targAs = targetManagement.createTargets(
|
||||
TestDataUtil.buildTargetFixtures(100, targetDsAIdPref, targetDsAIdPref.concat(" description")));
|
||||
targAs = targetManagement.toggleTagAssignment(targAs, targTagX).getAssignedTargets();
|
||||
targAs = targetManagement.toggleTagAssignment(targAs, targTagX).getAssignedEntity();
|
||||
|
||||
final String targetDsBIdPref = "targ-B";
|
||||
List<Target> targBs = targetManagement.createTargets(
|
||||
TestDataUtil.buildTargetFixtures(100, targetDsBIdPref, targetDsBIdPref.concat(" description")));
|
||||
targBs = targetManagement.toggleTagAssignment(targBs, targTagY).getAssignedTargets();
|
||||
targBs = targetManagement.toggleTagAssignment(targBs, targTagW).getAssignedTargets();
|
||||
targBs = targetManagement.toggleTagAssignment(targBs, targTagY).getAssignedEntity();
|
||||
targBs = targetManagement.toggleTagAssignment(targBs, targTagW).getAssignedEntity();
|
||||
|
||||
final String targetDsCIdPref = "targ-C";
|
||||
List<Target> targCs = targetManagement.createTargets(
|
||||
TestDataUtil.buildTargetFixtures(100, targetDsCIdPref, targetDsCIdPref.concat(" description")));
|
||||
targCs = targetManagement.toggleTagAssignment(targCs, targTagZ).getAssignedTargets();
|
||||
targCs = targetManagement.toggleTagAssignment(targCs, targTagW).getAssignedTargets();
|
||||
targCs = targetManagement.toggleTagAssignment(targCs, targTagZ).getAssignedEntity();
|
||||
targCs = targetManagement.toggleTagAssignment(targCs, targTagW).getAssignedEntity();
|
||||
|
||||
final String targetDsDIdPref = "targ-D";
|
||||
final List<Target> targDs = targetManagement.createTargets(
|
||||
@@ -688,8 +688,8 @@ public class TargetManagementSearchTest extends AbstractIntegrationTest {
|
||||
final DistributionSet ds = TestDataUtil.generateDistributionSet("a", softwareManagement,
|
||||
distributionSetManagement);
|
||||
|
||||
targAssigned = deploymentManagement.assignDistributionSet(ds, targAssigned).getAssignedTargets();
|
||||
targInstalled = deploymentManagement.assignDistributionSet(ds, targInstalled).getAssignedTargets();
|
||||
targAssigned = deploymentManagement.assignDistributionSet(ds, targAssigned).getAssignedEntity();
|
||||
targInstalled = deploymentManagement.assignDistributionSet(ds, targInstalled).getAssignedEntity();
|
||||
targInstalled = sendUpdateActionStatusToTargets(ds, targInstalled, Status.FINISHED, "installed");
|
||||
|
||||
final Slice<Target> result = targetManagement.findTargetsAllOrderByLinkedDistributionSet(pageReq, ds.getId(),
|
||||
|
||||
@@ -49,7 +49,6 @@ import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.data.auditing.AuditingHandler;
|
||||
import org.springframework.data.auditing.DateTimeProvider;
|
||||
import org.springframework.data.jpa.repository.Modifying;
|
||||
import org.springframework.security.authentication.TestingAuthenticationToken;
|
||||
import org.springframework.security.core.context.SecurityContext;
|
||||
@@ -132,24 +131,18 @@ public final class RepositoryDataGenerator {
|
||||
final DistributionSetTag dsTag = tagManagement
|
||||
.createDistributionSetTag(new DistributionSetTag("For " + group + "s"));
|
||||
|
||||
auditingHandler.setDateTimeProvider(new DateTimeProvider() {
|
||||
@Override
|
||||
public Calendar getNow() {
|
||||
final Calendar instance = Calendar.getInstance();
|
||||
instance.add(Calendar.MONTH, -new Random().nextInt(7));
|
||||
auditingHandler.setDateTimeProvider(() -> {
|
||||
final Calendar instance = Calendar.getInstance();
|
||||
instance.add(Calendar.MONTH, -new Random().nextInt(7));
|
||||
|
||||
return instance;
|
||||
}
|
||||
return instance;
|
||||
});
|
||||
|
||||
final List<Target> targets = createTargetTestGroup(group, 20 * sizeMultiplikator);
|
||||
|
||||
auditingHandler.setDateTimeProvider(new DateTimeProvider() {
|
||||
@Override
|
||||
public Calendar getNow() {
|
||||
final Calendar instance = Calendar.getInstance();
|
||||
return instance;
|
||||
}
|
||||
auditingHandler.setDateTimeProvider(() -> {
|
||||
final Calendar instance = Calendar.getInstance();
|
||||
return instance;
|
||||
});
|
||||
|
||||
LOG.debug("initDemoRepo - start now real action history for group: {}", group);
|
||||
@@ -290,7 +283,7 @@ public final class RepositoryDataGenerator {
|
||||
|
||||
LOG.debug("createTargetTestGroup: {} targets status updated including IP", group);
|
||||
|
||||
return targetManagement.toggleTagAssignment(targAs, targTag).getAssignedTargets();
|
||||
return targetManagement.toggleTagAssignment(targAs, targTag).getAssignedEntity();
|
||||
}
|
||||
|
||||
private List<Target> buildTargets(final int noOfTgts, final String descriptionPrefix) {
|
||||
@@ -328,75 +321,70 @@ public final class RepositoryDataGenerator {
|
||||
private void initDemoRepo(final int sizeMultiplikator, final int loadtestgroups) {
|
||||
final LoremIpsum jlorem = new LoremIpsum();
|
||||
|
||||
runAsAllAuthorityContext(new Runnable() {
|
||||
runAsAllAuthorityContext(() -> {
|
||||
dbCleanupUtil.cleanupDB(null);
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
dbCleanupUtil.cleanupDB(null);
|
||||
// generate targets and assign DS
|
||||
// 5 groups - 100 targets each -> 500
|
||||
final String[] targetTestGroups = { "SHC", "CCU", "Vehicle", "Vending machine", "ECU" };
|
||||
|
||||
// generate targets and assign DS
|
||||
// 5 groups - 100 targets each -> 500
|
||||
final String[] targetTestGroups = { "SHC", "CCU", "Vehicle", "Vending machine", "ECU" };
|
||||
final String[] modulesTypes = { "HeadUnit_FW", "EDC17_FW", "OSGi_Bundle" };
|
||||
|
||||
final String[] modulesTypes = { "HeadUnit_FW", "EDC17_FW", "OSGi_Bundle" };
|
||||
final DistributionSetTag depTag = tagManagement
|
||||
.createDistributionSetTag(new DistributionSetTag("deprecated"));
|
||||
|
||||
final DistributionSetTag depTag = tagManagement
|
||||
.createDistributionSetTag(new DistributionSetTag("deprecated"));
|
||||
Arrays.stream(targetTestGroups).forEach(group -> {
|
||||
generateTestTagetGroup(group, sizeMultiplikator);
|
||||
});
|
||||
|
||||
Arrays.stream(targetTestGroups).forEach(group -> {
|
||||
generateTestTagetGroup(group, sizeMultiplikator);
|
||||
});
|
||||
// garbage DS
|
||||
LOG.debug("initDemoRepo - start now DS garbage");
|
||||
TestDataUtil.generateDistributionSets("Generic Software Package", sizeMultiplikator,
|
||||
softwareManagement, distributionSetManagement);
|
||||
LOG.debug("initDemoRepo - DS garbage finished");
|
||||
|
||||
// garbage DS
|
||||
LOG.debug("initDemoRepo - start now DS garbage");
|
||||
TestDataUtil.generateDistributionSets("Generic Software Package", sizeMultiplikator,
|
||||
softwareManagement, distributionSetManagement);
|
||||
LOG.debug("initDemoRepo - DS garbage finished");
|
||||
LOG.debug("initDemoRepo - start now Extra Software Modules and types");
|
||||
Arrays.stream(modulesTypes).forEach(typeName -> {
|
||||
final SoftwareModuleType smtype = softwareManagement.createSoftwareModuleType(
|
||||
new SoftwareModuleType(typeName.toLowerCase().replaceAll("\\s+", ""), typeName,
|
||||
jlorem.words(5), Integer.MAX_VALUE));
|
||||
|
||||
LOG.debug("initDemoRepo - start now Extra Software Modules and types");
|
||||
Arrays.stream(modulesTypes).forEach(typeName -> {
|
||||
final SoftwareModuleType smtype = softwareManagement.createSoftwareModuleType(
|
||||
new SoftwareModuleType(typeName.toLowerCase().replaceAll("\\s+", ""), typeName,
|
||||
jlorem.words(5), Integer.MAX_VALUE));
|
||||
|
||||
for (int i = 0; i < sizeMultiplikator; i++) {
|
||||
softwareManagement.createSoftwareModule(new SoftwareModule(smtype, typeName + i, "1.0." + i,
|
||||
jlorem.words(5), "the " + typeName + " vendor Inc."));
|
||||
}
|
||||
|
||||
});
|
||||
LOG.debug("initDemoRepo - Extra Software Modules and types finished");
|
||||
|
||||
LOG.debug("initDemoRepo - start now target garbage");
|
||||
|
||||
// garbage targets
|
||||
// unknown
|
||||
targetManagement
|
||||
.createTargets(TestDataUtil.generateTargets(targetTestGroups.length * sizeMultiplikator));
|
||||
|
||||
// registered
|
||||
targetManagement.createTargets(
|
||||
TestDataUtil.generateTargets(targetTestGroups.length * sizeMultiplikator, "registered"),
|
||||
TargetUpdateStatus.REGISTERED, System.currentTimeMillis(), generateIPAddress());
|
||||
|
||||
// pending
|
||||
final DistributionSetTag dsTag = tagManagement
|
||||
.createDistributionSetTag(new DistributionSetTag("OnlyAssignedTag"));
|
||||
final DistributionSet ds = TestDataUtil.generateDistributionSet("Pending DS", "v1.0",
|
||||
softwareManagement, distributionSetManagement,
|
||||
Arrays.asList(new DistributionSetTag[] { dsTag }));
|
||||
deploymentManagement.assignDistributionSet(ds, targetManagement.createTargets(
|
||||
TestDataUtil.generateTargets(targetTestGroups.length * sizeMultiplikator, "pending")));
|
||||
|
||||
// Load test means additional 1_000_000 target
|
||||
|
||||
for (int i = 0; i < loadtestgroups; i++) {
|
||||
targetManagement.createTargets(TestDataUtil.generateTargets(i * 1_000, 1_000, "loadtest-"));
|
||||
for (int i1 = 0; i1 < sizeMultiplikator; i1++) {
|
||||
softwareManagement.createSoftwareModule(new SoftwareModule(smtype, typeName + i1, "1.0." + i1,
|
||||
jlorem.words(5), "the " + typeName + " vendor Inc."));
|
||||
}
|
||||
|
||||
LOG.debug("initDemoRepo complete");
|
||||
});
|
||||
LOG.debug("initDemoRepo - Extra Software Modules and types finished");
|
||||
|
||||
LOG.debug("initDemoRepo - start now target garbage");
|
||||
|
||||
// garbage targets
|
||||
// unknown
|
||||
targetManagement
|
||||
.createTargets(TestDataUtil.generateTargets(targetTestGroups.length * sizeMultiplikator));
|
||||
|
||||
// registered
|
||||
targetManagement.createTargets(
|
||||
TestDataUtil.generateTargets(targetTestGroups.length * sizeMultiplikator, "registered"),
|
||||
TargetUpdateStatus.REGISTERED, System.currentTimeMillis(), generateIPAddress());
|
||||
|
||||
// pending
|
||||
final DistributionSetTag dsTag = tagManagement
|
||||
.createDistributionSetTag(new DistributionSetTag("OnlyAssignedTag"));
|
||||
final DistributionSet ds = TestDataUtil.generateDistributionSet("Pending DS", "v1.0",
|
||||
softwareManagement, distributionSetManagement,
|
||||
Arrays.asList(new DistributionSetTag[] { dsTag }));
|
||||
deploymentManagement.assignDistributionSet(ds, targetManagement.createTargets(
|
||||
TestDataUtil.generateTargets(targetTestGroups.length * sizeMultiplikator, "pending")));
|
||||
|
||||
// Load test means additional 1_000_000 target
|
||||
|
||||
for (int i2 = 0; i2 < loadtestgroups; i2++) {
|
||||
targetManagement.createTargets(TestDataUtil.generateTargets(i2 * 1_000, 1_000, "loadtest-"));
|
||||
}
|
||||
|
||||
LOG.debug("initDemoRepo complete");
|
||||
});
|
||||
}
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user