diff options
author | Denes Nemeth <denes.nemeth@nokia.com> | 2018-04-10 22:48:30 +0200 |
---|---|---|
committer | Denes Nemeth <denes.nemeth@nokia.com> | 2018-04-11 00:05:42 +0200 |
commit | 20297ddd0487602208bd98d89b8acbf940952e7b (patch) | |
tree | 5f0b9e8af04e2b3685f6da47a4bcac7a9b14377e /nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm | |
parent | a995e82e01a3315940051ca55133c9cb14eccc6b (diff) |
Fix automatic package conversion
Issue-ID: VFC-728
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Change-Id: Ie015f2e5406329f16e74ab8abd44060dfc44148a
Diffstat (limited to 'nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm')
5 files changed, 10 insertions, 17 deletions
diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/NokiaSvnfmApplication.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/NokiaSvnfmApplication.java index ceb0335d..23c2e4bf 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/NokiaSvnfmApplication.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/NokiaSvnfmApplication.java @@ -18,14 +18,10 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.core.SelfRegistrationManager; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.SystemFunctions; import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.JobManager; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; @@ -71,7 +67,7 @@ public class NokiaSvnfmApplication { private ExecutorService executorService = newCachedThreadPool(); @Autowired - SelfRegistrationTrigger(SelfRegistrationManager selfRegistrationManager, JobManager jobManager){ + SelfRegistrationTrigger(SelfRegistrationManager selfRegistrationManager, JobManager jobManager) { this.jobManager = jobManager; this.selfRegistrationManager = selfRegistrationManager; } @@ -90,13 +86,12 @@ public class NokiaSvnfmApplication { return true; }; executorService.submit(() -> { - while(!jobManager.isPreparingForShutDown()){ - try{ + while (!jobManager.isPreparingForShutDown()) { + try { executorService.submit(singleRegistration).get(); //registration successful return; - } - catch (Exception e){ + } catch (Exception e) { logger.warn("Unable to execute self registration process", e); } systemFunctions().sleep(5000); @@ -117,7 +112,7 @@ public class NokiaSvnfmApplication { private final JobManager jobManager; @Autowired - SelfDeRegistrationTrigger(SelfRegistrationManager selfRegistrationManager, JobManager jobManager){ + SelfDeRegistrationTrigger(SelfRegistrationManager selfRegistrationManager, JobManager jobManager) { this.jobManager = jobManager; this.selfRegistrationManager = selfRegistrationManager; } diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/OnapVnfPackageBuilder.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/OnapVnfPackageBuilder.java index 00977e4a..2a058777 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/OnapVnfPackageBuilder.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/OnapVnfPackageBuilder.java @@ -71,11 +71,9 @@ public class OnapVnfPackageBuilder { out.putNextEntry(new ZipEntry("MainServiceTemplate.yaml")); out.write(onapVnfd.getBytes()); out.closeEntry(); - out.putNextEntry(new ZipEntry("Definitions/MainServiceTemplate.yaml")); - out.write(onapVnfd.getBytes()); out.closeEntry(); - out.putNextEntry(new ZipEntry("MainServiceTemplate.meta")); - out.write(systemFunctions().loadFile("MainServiceTemplate.meta")); + out.putNextEntry(new ZipEntry("MainServiceTemplate.mf")); + out.write(systemFunctions().loadFile("MainServiceTemplate.mf")); out.closeEntry(); out.close(); return result.toByteArray(); diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/ConverterApi.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/ConverterApi.java index 7ae05f5e..da07ef25 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/ConverterApi.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/ConverterApi.java @@ -59,7 +59,7 @@ public class ConverterApi { logger.info("REST: convert package"); byte[] content; try { - Part part = request.getParts().iterator().next(); + Part part = request.getPart("fileToUpload"); content = ByteStreams.toByteArray(part.getInputStream()); } catch (Exception e) { throw buildFatalFailure(logger, "Unable to extract package from REST parameters", e); diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/SystemFunctions.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/SystemFunctions.java index 87a4d56d..468761c3 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/SystemFunctions.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/SystemFunctions.java @@ -166,7 +166,7 @@ public class SystemFunctions { * @param clazz the main source of the Spring application * @return a new Spring application */ - public SpringApplication newSpringApplication(Class clazz){ + public SpringApplication newSpringApplication(Class clazz) { return new SpringApplication(clazz); } }
\ No newline at end of file diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java index e97f634d..5624327b 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/JobManager.java @@ -100,7 +100,7 @@ public class JobManager { /** * @return is the component preparing for shutdown */ - public boolean isPreparingForShutDown(){ + public boolean isPreparingForShutDown() { return preparingForShutDown; } |