summaryrefslogtreecommitdiffstats
path: root/vid-app-common
diff options
context:
space:
mode:
authorPATTANAYAK, SAUMYA SWARUP (sp931a) <sp931a@att.com>2020-06-25 09:42:48 -0400
committerPATTANAYAK, SAUMYA SWARUP (sp931a) <sp931a@att.com>2020-06-25 11:19:37 -0400
commit4e09eb5de8ba5f963ea374f2773fcd6f84cf36b3 (patch)
tree5105cdba1c2eb63487f56e4407e1872d693a103a /vid-app-common
parent60e246814415ee1daf838db78aff8afd53ce46f5 (diff)
Rollback on failure flag should always be true while vfm replace callfeature/mfa
Issue-ID: VID-851 Signed-off-by: Soumya Pattanayak <sp931a@att.com> Change-Id: I2cb3fd0a6b6d25133e426c76ac5851df9cc55216
Diffstat (limited to 'vid-app-common')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/job/command/VfmoduleCommand.kt4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java8
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json2
3 files changed, 7 insertions, 7 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/VfmoduleCommand.kt b/vid-app-common/src/main/java/org/onap/vid/job/command/VfmoduleCommand.kt
index a92f610da..734faf650 100644
--- a/vid-app-common/src/main/java/org/onap/vid/job/command/VfmoduleCommand.kt
+++ b/vid-app-common/src/main/java/org/onap/vid/job/command/VfmoduleCommand.kt
@@ -82,7 +82,7 @@ class VfmoduleCommand @Autowired constructor(
}
private fun planReplaceMyselfRestCall(commandParentData: CommandParentData): MsoRestCallPlan {
-
+ val shouldRollBackOnFailure = true
val newestModel = fetchNewestServiceModel()
val serviceInstanceId = serviceInstanceIdFromRequest()
@@ -90,7 +90,7 @@ class VfmoduleCommand @Autowired constructor(
val (serviceModelInfo, vnfModelInfo, vfmModelInfo) = newestSelector(newestModel, commandParentData);
- val originalRequestWithNewestVfmModelInfo = getRequest().cloneWith(vfmModelInfo)
+ val originalRequestWithNewestVfmModelInfo = getRequest().cloneWith(vfmModelInfo, shouldRollBackOnFailure)
val requestDetailsWrapper = msoRequestBuilder.generateVfModuleReplaceRequest(
originalRequestWithNewestVfmModelInfo, serviceModelInfo, serviceInstanceId,
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 dc6a2c67a..bfe4d697f 100644
--- 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
@@ -118,7 +118,7 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest
return retainVolumeGroups;
}
- public VfModule cloneWith(ModelInfo modelInfo) {
+ public VfModule cloneWith(ModelInfo modelInfo, boolean shouldRollbackOnFailure) {
return new VfModule(
modelInfo,
this.getInstanceName(),
@@ -129,7 +129,7 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest
this.getTenantId(),
this.getInstanceParams(),
this.getSupplementaryParams(),
- this.isRollbackOnFailure(),
+ shouldRollbackOnFailure,
this.isUsePreload(),
this.getInstanceId(),
this.getTrackById(),
@@ -138,8 +138,8 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest
this.isRetainAssignments(),
this.isRetainVolumeGroups(),
this.getPosition(),
- this.getPauseInstantiation(),
- this.getOriginalName()
+ this.getPauseInstantiation(),
+ this.getOriginalName()
);
}
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
index d72dc7a23..c10f45023 100644
--- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
@@ -4,7 +4,7 @@
"source": "VID",
"requestorId": "az2016",
"instanceName": "PST-VfMod-Replace-5-Vfmod",
- "suppressRollback": true
+ "suppressRollback": false
},
"relatedInstanceList": [{
"relatedInstance": {