Healing issue

Attachment screen is opened for certified vsp

Change-Id: I4ebd1a4b9f720e92441d887f0fc326a553b9e42e
Issue-ID: SDC-1155
Signed-off-by: shrikantawachar <shrikant.awachar@amdocs.com>

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 37804ff..8fdfd2f 100644 (file)
--- 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());