aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandre.schmid <andre.schmid@est.tech>2021-11-19 12:58:28 +0000
committerMichael Morris <michael.morris@est.tech>2021-11-25 09:50:14 +0000
commit5a92b1a1a74db13771947f3175682095bd91b7e3 (patch)
tree6d3437b646c8be9fc3ffdead42379447975eb001
parentf0d4dd5c846f1c56d8b2641934c028b8151b31b3 (diff)
Fix incorrect vsp version id in upgrade
During the upgrade of a VF through a VSP, the VSP version id passed to the backend is always the current VF version id, not the one to upgrade. Even passing the correct VSP version id, the backend was not persisting the latest version id in the metadata, keeping always the previous one. Change-Id: Ife2b92789d47a63ba5358c6ed8db8279db94ed46 Issue-ID: SDC-3790 Signed-off-by: andre.schmid <andre.schmid@est.tech> Signed-off-by: krupa.nagabhushan <krupa.nagabhushan@est.tech>
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java3
-rw-r--r--catalog-ui/src/app/utils/component-factory.ts1
2 files changed, 1 insertions, 3 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
index f7beca6200..666529986c 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
@@ -3640,9 +3640,6 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
if (oldResource.getCsarUUID() != null) {
newResource.setCsarUUID(oldResource.getCsarUUID());
}
- if (oldResource.getCsarVersionId() != null) {
- newResource.setCsarVersionId(oldResource.getCsarVersionId());
- }
if (oldResource.getImportedToscaChecksum() != null) {
newResource.setImportedToscaChecksum(oldResource.getImportedToscaChecksum());
}
diff --git a/catalog-ui/src/app/utils/component-factory.ts b/catalog-ui/src/app/utils/component-factory.ts
index 2ff2af983e..f2128cb271 100644
--- a/catalog-ui/src/app/utils/component-factory.ts
+++ b/catalog-ui/src/app/utils/component-factory.ts
@@ -84,6 +84,7 @@ export class ComponentFactory {
oldComponent.csarUUID = csarComponent.csarUUID;
oldComponent.csarPackageType = csarComponent.csarPackageType;
oldComponent.csarVersion = csarComponent.csarVersion;
+ oldComponent.csarVersionId = csarComponent.csarVersionId;
oldComponent.packageId = csarComponent.packageId;
oldComponent.description = csarComponent.description;
oldComponent.filterTerm = oldComponent.name + ' ' + oldComponent.description + ' ' + oldComponent.vendorName + ' ' + oldComponent.csarVersion;