From 48f249950e178b30653f020c3ea0f845cf84c0c5 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Mon, 26 Feb 2018 11:15:42 +0530 Subject: Improve coverage of res mgr hw Issue-ID: VFC-764 Change-Id: I26052d87054fb447fa5c0da0d22dd90e1b69cbf5 Signed-off-by: Kanagaraj Manickam k00365106 --- .../service/adapter/impl/ResmgrAdapterMgrService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'ResmanagementService/service/src/main/java') diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java index 12e4061..606ce50 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java @@ -82,14 +82,19 @@ public class ResmgrAdapterMgrService implements IResmgrAdapterMgrService { * @throws IOException */ public static String readVimAdapterInfoFromJson() throws IOException { - String fileContent = ""; - String fileName = SystemEnvVariablesFactory.getInstance().getAppRoot() + System.getProperty("file.separator") + "etc" + System.getProperty("file.separator") + "adapterInfo" + System.getProperty("file.separator") + RESMGRADAPTERINFO; - try (InputStream ins = new FileInputStream(fileName)) { - try(BufferedInputStream bins = new BufferedInputStream(ins)) { + return readJson(fileName); + } + + public static String readJson(String fileName) throws IOException { + String fileContent = ""; + + try (InputStream ins = new FileInputStream(fileName)){ + try(BufferedInputStream bins = new BufferedInputStream(ins)){ + byte[] contentByte = new byte[ins.available()]; int num = bins.read(contentByte); @@ -104,6 +109,7 @@ public class ResmgrAdapterMgrService implements IResmgrAdapterMgrService { return fileContent; } + private static class RegisterResmgrThread implements Runnable { private IResmgrAdapter2MSBManager adapter2MSBMgr = new ResmgrAdapter2MSBManager(); -- cgit 1.2.3-korg