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

Expose rollout group dynamic flag via REST (#1691)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-03-15 16:20:16 +02:00
committed by GitHub
parent 0dcf646385
commit 50d34dd81e
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroupResponseBody.java
View File

@@ -84,6 +84,9 @@ public class MgmtRolloutGroupResponseBody extends MgmtRolloutGroup {
@Schema(description = "Rollouts id", example = "63") @Schema(description = "Rollouts id", example = "63")
private Long rolloutGroupId; private Long rolloutGroupId;
@Schema(description = "If the rollout group is dynamic", example = "false")
private boolean dynamic;
@JsonProperty(required = true) @JsonProperty(required = true)
@Schema(description = "The status of this rollout", example = "ready") @Schema(description = "The status of this rollout", example = "ready")
private String status; private String status;

2
hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java
View File

@@ -211,6 +211,8 @@ final class MgmtRolloutMapper {
body.setConfirmationRequired(rolloutGroup.isConfirmationRequired()); body.setConfirmationRequired(rolloutGroup.isConfirmationRequired());
} }
body.setDynamic(rolloutGroup.isDynamic());
body.setSuccessCondition(new MgmtRolloutCondition(map(rolloutGroup.getSuccessCondition()), body.setSuccessCondition(new MgmtRolloutCondition(map(rolloutGroup.getSuccessCondition()),
rolloutGroup.getSuccessConditionExp())); rolloutGroup.getSuccessConditionExp()));
body.setSuccessAction( body.setSuccessAction(

6
hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/SetupHelper.java
View File

@@ -35,12 +35,8 @@ import java.util.Random;
@Slf4j @Slf4j
public class SetupHelper { public class SetupHelper {
private static final String AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED = "authentication.gatewaytoken.enabled";
/**
* Gateway token value.
*/
private static final String AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY = "authentication.gatewaytoken.key"; private static final String AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY = "authentication.gatewaytoken.key";
private static final String AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED = "authentication.gatewaytoken.enabled";
private static final String AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED = "authentication.targettoken.enabled"; private static final String AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED = "authentication.targettoken.enabled";
// if gateway toke is configured then the gateway auth is enabled key is set // if gateway toke is configured then the gateway auth is enabled key is set

1
hawkbit-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/DdiController.java
View File

@@ -217,6 +217,7 @@ public class DdiController {
} }
void sendFeedback(final UpdateStatus updateStatus) { void sendFeedback(final UpdateStatus updateStatus) {
log.debug(LOG_PREFIX + "Send feedback {} -> {}", getTenantId(), getControllerId(), currentActionId, updateStatus);
getDdiApi().postDeploymentBaseActionFeedback( getDdiApi().postDeploymentBaseActionFeedback(
updateStatus.feedback(), getTenantId(), getControllerId(), currentActionId); updateStatus.feedback(), getTenantId(), getControllerId(), currentActionId);
if (updateStatus.status() == UpdateStatus.Status.SUCCESSFUL || if (updateStatus.status() == UpdateStatus.Status.SUCCESSFUL ||