import org.onap.vid.job.impl.JobSharedData
import org.onap.vid.model.Action
import org.onap.vid.model.serviceInstantiation.BaseResource
+import org.onap.vid.model.serviceInstantiation.BaseResource.PauseInstantiation
import org.onap.vid.model.serviceInstantiation.VfModule
-import org.onap.vid.model.serviceInstantiation.VfModule.PauseInstantiation
import org.onap.vid.model.serviceInstantiation.Vnf
import org.onap.vid.mso.RestMsoImplementation
import org.onap.vid.properties.Features
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import javax.annotation.Nullable;
import org.apache.commons.lang3.StringUtils;
import org.onap.vid.job.JobAdapter;
import org.onap.vid.job.JobType;
public abstract class BaseResource implements JobAdapter.AsyncJobRequest {
+ public enum PauseInstantiation {
+ afterCompletion
+ }
+
protected String instanceId;
protected ModelInfo modelInfo;
@JsonInclude(NON_NULL)
protected String originalName; //not used at backend, but stored for fronted
+ @JsonInclude(NON_NULL)
+ protected final PauseInstantiation pauseInstantiation;
private static final Map<String, Action> actionStingToEnumMap = ImmutableMap.<String, Action>builder()
.put("Delete", Action.Delete)
@JsonProperty("isFailed") Boolean isFailed,
@JsonProperty("statusMessage") String statusMessage,
@JsonProperty("position") Integer position,
+ @JsonProperty("pauseInstantiation") PauseInstantiation pauseInstantiation,
@JsonProperty("originalName") String originalName) {
this.modelInfo = modelInfo;
this.modelInfo.setModelType(getModelType());
this.isFailed = isFailed!= null ? isFailed: false;
this.statusMessage = statusMessage;
this.position = position;
+ this.pauseInstantiation = pauseInstantiation;
this.originalName = originalName;
}
@JsonIgnore
public abstract JobType getJobType();
+
+ @Nullable
+ public PauseInstantiation getPauseInstantiation() {
+ return pauseInstantiation;
+ }
}
@JsonProperty("originalName") String originalName) {
super(modelInfo, instanceName, action, null, null, null, null, rollbackOnFailure, instanceId, trackById, isFailed, statusMessage,
- position, originalName);
+ position, null, originalName);
this.vnfGroupMembers = vnfGroupMembers;
}
@JsonProperty("position") Integer position,
@JsonProperty("originalName") String originalName) {
super(new ModelInfo(), null, action, null, null, null, null, false, instanceId, trackById, isFailed, statusMessage,
- position, originalName);
+ position, null, originalName);
}
@Override
@JsonProperty("originalName") String originalName) {
super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId, trackById, isFailed, statusMessage,
- position, originalName);
+ position, null, originalName);
this.productFamilyId = productFamilyId;
this.platformName = platformName;
this.lineOfBusiness = lineOfBusiness;
@JsonProperty("vidNotions") VidNotions vidNotions,
@JsonProperty("originalName") String originalName) {
super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId, trackById, isFailed, statusMessage,
- null, originalName);
+ null, null, originalName);
this.owningEntityId = owningEntityId;
this.owningEntityName = owningEntityName;
this.projectName = projectName;
@JsonInclude(NON_NULL)
private final Boolean retainVolumeGroups;
- @JsonInclude(NON_NULL)
- private final PauseInstantiation pauseInstantiation;
-
@JsonInclude(NON_NULL)
private Boolean retainAssignments;
@JsonProperty("pauseInstantiation") PauseInstantiation pauseInstantiation,
@JsonProperty("originalName") String originalName) {
super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId, trackById, isFailed, statusMessage,
- position, originalName);
+ position, pauseInstantiation, originalName);
this.volumeGroupInstanceName = volumeGroupInstanceName;
this.usePreload = usePreload;
this.supplementaryParams = supplementaryParams;
this.retainAssignments = retainAssignments;
this.retainVolumeGroups = retainVolumeGroups;
- this.pauseInstantiation = pauseInstantiation;
}
public String getVolumeGroupInstanceName() {
return usePreload;
}
- public enum PauseInstantiation {
- afterCompletion
- }
-
public List<UserParamNameAndValue> getSupplementaryParams() {
return supplementaryParams;
}
return retainVolumeGroups;
}
- @Nullable
- public PauseInstantiation getPauseInstantiation() {return pauseInstantiation;}
-
public VfModule cloneWith(ModelInfo modelInfo) {
return new VfModule(
modelInfo,
@JsonProperty("originalName") String originalName) {
super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId, trackById, isFailed, statusMessage,
- position, originalName);
+ position, null, originalName);
this.productFamilyId = productFamilyId;
this.platformName = platformName;
this.lineOfBusiness = lineOfBusiness;
import org.onap.vid.job.command.ResourceCommandTest.FakeResourceCreator
import org.onap.vid.job.impl.JobSharedData
import org.onap.vid.model.Action
+import org.onap.vid.model.serviceInstantiation.BaseResource.PauseInstantiation.afterCompletion
import org.onap.vid.model.serviceInstantiation.VfModule
-import org.onap.vid.model.serviceInstantiation.VfModule.PauseInstantiation.afterCompletion
import org.onap.vid.mso.RestMsoImplementation
import org.onap.vid.properties.Features
import org.onap.vid.services.AsyncInstantiationBusinessLogic
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.samePropertyValuesAs;
import static org.onap.vid.model.Action.Create;
-import static org.onap.vid.model.serviceInstantiation.VfModule.PauseInstantiation.afterCompletion;
+import static org.onap.vid.model.serviceInstantiation.BaseResource.PauseInstantiation.afterCompletion;
import static org.onap.vid.testUtils.TestUtils.setStringsInStringFields;
import static org.onap.vid.utils.KotlinUtilsKt.JACKSON_OBJECT_MAPPER;