summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshrikantawachar <shrikant.awachar@amdocs.com>2018-03-21 15:58:45 +0530
committerOren Kleks <orenkle@amdocs.com>2018-03-21 12:19:21 +0000
commitbe00af7a2e0dc8dc2d5f8fbf03d778a8f632c4fb (patch)
tree649280b8ef953c521a75c7260372dfd6d48cca7e
parent48a84705a78038606f1bd162b826f074b7085e7c (diff)
Healing issue
Attachment screen is opened for certified vsp Change-Id: I4ebd1a4b9f720e92441d887f0fc326a553b9e42e Issue-ID: SDC-1155 Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>
-rw-r--r--openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java
index 37804ff865..8fdfd2fbd5 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/VendorSoftwareProductsImpl.java
@@ -235,7 +235,7 @@ public class VendorSoftwareProductsImpl implements VendorSoftwareProducts {
VspDetailsDto vspDetailsDto =
new MapVspDetailsToDto().applyMapping(vspDetails, VspDetailsDto.class);
- addNetworkPackageInfo(vspId, version, vspDetailsDto);
+ addNetworkPackageInfo(vspId, vspDetails.getVersion(), vspDetailsDto);
return Response.ok(vspDetailsDto).build();
}
@@ -596,7 +596,8 @@ public class VendorSoftwareProductsImpl implements VendorSoftwareProducts {
} else {
OrchestrationTemplateEntity orchestrationTemplateInfo =
vendorSoftwareProductManager.getOrchestrationTemplateInfo(vspId, version);
- if (Objects.nonNull(orchestrationTemplateInfo)) {
+ if (Objects.nonNull(orchestrationTemplateInfo) && Objects.nonNull(orchestrationTemplateInfo
+ .getFileSuffix())) {
vspDetailsDto.setValidationData(orchestrationTemplateInfo.getValidationDataStructure());
vspDetailsDto.setNetworkPackageName(orchestrationTemplateInfo.getFileName());
vspDetailsDto.setOnboardingOrigin(orchestrationTemplateInfo.getFileSuffix());