Templates: show correct values of sdnc-preload, volume-group name

[vid.git] / vid-app-common / src / main / java / org / onap / vid / model / serviceInstantiation / VfModule.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java
index 5c847b8..89e25e6 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java
@@ -22,6 +22,7 @@ package org.onap.vid.model.serviceInstantiation;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
 
+import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Collection;
@@ -39,17 +40,19 @@ import org.onap.vid.mso.model.ModelInfo;
 @JsonInclude(NON_NULL)
 public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest {
 
-       @JsonInclude(NON_NULL) private final String volumeGroupInstanceName;
-       @JsonInclude(NON_NULL) private Boolean usePreload;
+       @JsonInclude(NON_NULL) @JsonProperty("volumeGroupName") private final String volumeGroupInstanceName;
+       @JsonInclude(NON_NULL) @JsonProperty("sdncPreLoad") private Boolean usePreload;
        private Map<String, String> supplementaryParams;
 
        @JsonInclude(NON_NULL)
-       @Nullable
        private final Boolean retainVolumeGroups;
 
+       @JsonInclude(NON_NULL)
+       private Boolean retainAssignments;
+
        public VfModule(@JsonProperty("modelInfo") ModelInfo modelInfo,
                @JsonProperty("instanceName") String instanceName,
-               @JsonProperty("volumeGroupName") String volumeGroupInstanceName,
+               @JsonProperty("volumeGroupName") @JsonAlias("volumeGroupInstanceName") String volumeGroupInstanceName,
                @JsonProperty("action") String action,
                @JsonProperty("lcpCloudRegionId") String lcpCloudRegionId,
                @JsonProperty("legacyRegion") String legacyRegion,
@@ -57,18 +60,20 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest
                @JsonProperty("instanceParams") List<Map<String, String>> instanceParams,
                @JsonProperty("supplementaryFileContent") Map<String, String> supplementaryParams,
                @JsonProperty("rollbackOnFailure") boolean rollbackOnFailure,
-               @JsonProperty("sdncPreLoad") Boolean usePreload,
+               @JsonProperty("sdncPreLoad") @JsonAlias("usePreload") Boolean usePreload,
                @JsonProperty("instanceId") String instanceId,
                @JsonProperty("trackById") String trackById,
                @JsonProperty("isFailed") Boolean isFailed,
                @JsonProperty("statusMessage") String statusMessage,
-               @JsonProperty("retainVolumeGroups") Boolean retainVolumeGroups,
+               @Nullable @JsonProperty("retainAssignments") Boolean retainAssignments,
+               @Nullable @JsonProperty("retainVolumeGroups") Boolean retainVolumeGroups,
                @JsonProperty("position") Integer position) {
                super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId, trackById, isFailed, statusMessage,
                        position);
                this.volumeGroupInstanceName = volumeGroupInstanceName;
                this.usePreload = usePreload;
                this.supplementaryParams = supplementaryParams;
+               this.retainAssignments = retainAssignments;
                this.retainVolumeGroups = retainVolumeGroups;
        }
 
@@ -100,6 +105,11 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest
                return JobType.VfmoduleInstantiation;
        }
 
+       @Nullable
+       public Boolean isRetainAssignments() {
+               return retainAssignments;
+       }
+
        @Nullable
        public Boolean isRetainVolumeGroups() {
                return retainVolumeGroups;
@@ -122,6 +132,7 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest
                                this.getTrackById(),
                                this.getIsFailed(),
                                this.getStatusMessage(),
+                               this.isRetainAssignments(),
                                this.isRetainVolumeGroups(),
                                this.getPosition());
        }