1 files changed, 18 insertions, 20 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
index 57f6b672be..d5d5c8045b 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java
@@ -16,6 +16,11 @@
 
 package org.openecomp.sdc.vendorsoftwareproduct.impl;
 
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
@@ -34,19 +39,14 @@ import org.openecomp.sdc.vendorsoftwareproduct.impl.orchestration.OrchestrationT
 import org.openecomp.sdc.vendorsoftwareproduct.impl.orchestration.OrchestrationUploadFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.impl.orchestration.process.OrchestrationProcessFactory;
 import org.openecomp.sdc.vendorsoftwareproduct.services.filedatastructuremodule.CandidateService;
+import org.openecomp.sdc.vendorsoftwareproduct.types.OnboardPackage;
+import org.openecomp.sdc.vendorsoftwareproduct.types.OnboardPackageInfo;
 import org.openecomp.sdc.vendorsoftwareproduct.types.OrchestrationTemplateActionResponse;
 import org.openecomp.sdc.vendorsoftwareproduct.types.UploadFileResponse;
 import org.openecomp.sdc.vendorsoftwareproduct.types.ValidationResponse;
 import org.openecomp.sdc.vendorsoftwareproduct.types.candidateheat.FilesDataStructure;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 public class OrchestrationTemplateCandidateManagerImpl
     implements OrchestrationTemplateCandidateManager {
 
@@ -61,18 +61,16 @@ public class OrchestrationTemplateCandidateManagerImpl
   }
 
   @Override
-  public UploadFileResponse upload(String vspId, Version version, InputStream fileToUpload,
-                                   String fileSuffix, String networkPackageName) {
-    OrchestrationTemplateFileHandler orchestrationTemplateFileHandler =
-        OrchestrationUploadFactory.createOrchestrationTemplateFileHandler(fileSuffix);
-
-    VspDetails vspDetails = getVspDetails(vspId, version);
-
-    UploadFileResponse uploadResponse = orchestrationTemplateFileHandler
-        .upload(vspDetails, fileToUpload, fileSuffix, networkPackageName, candidateService);
-
-    uploadResponse.setNetworkPackageName(networkPackageName);
-    return uploadResponse;
+  public UploadFileResponse upload(final VspDetails vspDetails,
+                                   final OnboardPackageInfo onboardPackageInfo) {
+    final OnboardPackage onboardPackage = onboardPackageInfo.getOnboardPackage();
+    final OrchestrationTemplateFileHandler orchestrationTemplateFileHandler =
+        OrchestrationUploadFactory.createOrchestrationTemplateFileHandler(onboardPackage.getFileExtension());
+
+    final UploadFileResponse uploadFileResponse =
+        orchestrationTemplateFileHandler.upload(vspDetails, onboardPackageInfo, candidateService);
+    uploadFileResponse.setNetworkPackageName(onboardPackage.getFilename());
+    return uploadFileResponse;
   }
 
   @Override
@@ -153,4 +151,4 @@ public class OrchestrationTemplateCandidateManagerImpl
   private VspDetails getVspDetails(String vspId, Version version) {
     return vspInfoDao.get(new VspDetails(vspId, version));
   }
-}
+}
+\ No newline at end of file