CB-22064 FreeIPA Service API must be able to get AZ configuration and…

… should expose it FreeIPA Service API must be able to get AZ configuration and should expose it
hortonworks · Jul 9, 2023 · 69b6347 · 69b6347
1 parent f38380d
commit 69b6347
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/...a/com/sequenceiq/freeipa/api/v1/freeipa/stack/model/describe/DescribeFreeIpaResponse.java b/...a/com/sequenceiq/freeipa/api/v1/freeipa/stack/model/describe/DescribeFreeIpaResponse.java
@@ -96,6 +96,9 @@ public class DescribeFreeIpaResponse {
     @ApiModelProperty(value = FreeIpaModelDescriptions.USERSYNC_STATUS_DETAILS)
     private UserSyncStatusResponse userSyncStatus;
 
+    @ApiModelProperty(value = FreeIpaModelDescriptions.MULTIAZ)
+    private boolean multiAz;
+
     public String getEnvironmentCrn() {
         return environmentCrn;
     }
@@ -264,6 +267,14 @@ public void setRecipes(Set<String> recipes) {
         this.recipes = recipes;
     }
 
+    public boolean isMultiAz() {
+        return multiAz;
+    }
+
+    public void setMultiAz(boolean multiAz) {
+        this.multiAz = multiAz;
+    }
+
     @Override
     public String toString() {
         return "DescribeFreeIpaResponse{" +
@@ -287,6 +298,7 @@ public String toString() {
                 ", cloudStorage=" + cloudStorage +
                 ", userSyncStatus=" + userSyncStatus +
                 ", recipes=" + recipes +
+                ", multiAz=" + multiAz +
                 '}';
     }
 }
diff --git a/.../java/com/sequenceiq/freeipa/converter/stack/StackToDescribeFreeIpaResponseConverter.java b/.../java/com/sequenceiq/freeipa/converter/stack/StackToDescribeFreeIpaResponseConverter.java
@@ -87,6 +87,7 @@ public DescribeFreeIpaResponse convert(Stack stack, ImageEntity image, FreeIpa f
         describeFreeIpaResponse.setStatus(stack.getStackStatus().getStatus());
         describeFreeIpaResponse.setStatusString(stack.getStackStatus().getStatusString());
         describeFreeIpaResponse.setStatusReason(stack.getStackStatus().getStatusReason());
+        describeFreeIpaResponse.setMultiAz(stack.isMultiAz());
         decorateFreeIpaServerResponseWithIps(describeFreeIpaResponse.getFreeIpa(), describeFreeIpaResponse.getInstanceGroups());
         decorateFreeIpaServerResponseWithLoadBalancedHost(stack, describeFreeIpaResponse.getFreeIpa(), freeIpa);
         describeFreeIpaResponse.setAppVersion(stack.getAppVersion());

diff --git a/...a/com/sequenceiq/freeipa/converter/stack/StackToDescribeFreeIpaResponseConverterTest.java b/...a/com/sequenceiq/freeipa/converter/stack/StackToDescribeFreeIpaResponseConverterTest.java
@@ -163,7 +163,8 @@ void convertTest(Tunnel tunnel) {
                 .returns(VARIANT, DescribeFreeIpaResponse::getVariant)
                 // TODO decorateWithCloudStorageAndTelemetry
                 .returns(USERSYNC_STATUS_RESPONSE, DescribeFreeIpaResponse::getUserSyncStatus)
-                .returns(tunnel, DescribeFreeIpaResponse::getTunnel);
+                .returns(tunnel, DescribeFreeIpaResponse::getTunnel)
+                .returns(true, DescribeFreeIpaResponse::isMultiAz);
 
         assertThat(result.getRecipes()).containsExactlyInAnyOrder("recipe1", "recipe2");
         assertThat(freeIpaServerResponse)
@@ -185,6 +186,7 @@ private Stack createStack(Tunnel tunnel) {
         stack.setPlatformvariant(VARIANT);
         stack.setGatewayport(GATEWAY_PORT);
         stack.setTunnel(tunnel);
+        stack.setMultiAz(true);
         return stack;
     }