Expose rollout group dynamic flag via REST (#1691)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
eclipse · Mar 15, 2024 · 50d34dd · 50d34dd
1 parent 0dcf646
commit 50d34dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/...n/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroupResponseBody.java b/...n/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroupResponseBody.java
@@ -84,6 +84,9 @@ public class MgmtRolloutGroupResponseBody extends MgmtRolloutGroup {
     @Schema(description = "Rollouts id", example = "63")
     private Long rolloutGroupId;
 
+    @Schema(description = "If the rollout group is dynamic", example = "false")
+    private boolean dynamic;
+
     @JsonProperty(required = true)
     @Schema(description = "The status of this rollout", example = "ready")
     private String status;

diff --git a/...mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java b/...mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java
@@ -211,6 +211,8 @@ static MgmtRolloutGroupResponseBody toResponseRolloutGroup(final RolloutGroup ro
             body.setConfirmationRequired(rolloutGroup.isConfirmationRequired());
         }
 
+        body.setDynamic(rolloutGroup.isDynamic());
+
         body.setSuccessCondition(new MgmtRolloutCondition(map(rolloutGroup.getSuccessCondition()),
                 rolloutGroup.getSuccessConditionExp()));
         body.setSuccessAction(

diff --git a/hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/SetupHelper.java b/hawkbit-sdk/hawkbit-sdk-demo/src/main/java/org/eclipse/hawkbit/sdk/demo/SetupHelper.java
@@ -35,12 +35,8 @@
 @Slf4j
 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_ENABLED = "authentication.gatewaytoken.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

diff --git a/...it-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/DdiController.java b/...it-sdk/hawkbit-sdk-device/src/main/java/org/eclipse/hawkbit/sdk/device/DdiController.java
@@ -217,6 +217,7 @@ public void updateAttribute(final String mode, final String key, final String va
     }
 
     void sendFeedback(final UpdateStatus updateStatus) {
+        log.debug(LOG_PREFIX + "Send feedback {} -> {}", getTenantId(), getControllerId(), currentActionId, updateStatus);
         getDdiApi().postDeploymentBaseActionFeedback(
                 updateStatus.feedback(), getTenantId(), getControllerId(), currentActionId);
         if (updateStatus.status() == UpdateStatus.Status.SUCCESSFUL ||