1 files changed, 31 insertions, 25 deletions

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
index e89eabe1..74fb4395 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
@@ -18,6 +18,8 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.impl;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.apache.http.client.ClientProtocolException;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv;
@@ -35,6 +37,9 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 
 @Component
 public class MsbMgmrImpl implements IMsbMgmr {
@@ -82,32 +87,31 @@ public class MsbMgmrImpl implements IMsbMgmr {
 
 	private String readVfcAdaptorInfoFromJsonFile() throws IOException {
 		String filePath = "/etc/adapterInfo/vnfmadapterinfo.json";
-		String fileContent = CommonUtil.getJsonStrFromFile(filePath);
-
+		String fileContent = CommonUtil.getJsonStrFromFile(filePath);	
 		return fileContent;
 	}
 
 	@Override
 	public void unregister() {
-		try {
-			String url = adaptorEnv.getMsbApiUriFront() + String.format(CommonConstants.MSB_UNREGISTER_SERVICE_PATH);
-
-			HttpResult httpResult = httpClientProcessor.process(url, RequestMethod.DELETE, null, null);
-			String responseStr = httpResult.getContent();
-
-			logger.info("MsbMgmrImpl -> unregister, responseStr is " + responseStr);
-			if(httpResult.getStatusCode() == 204)
-			{
-				logger.info("MsbMgmrImpl -> register, Successfully ");
-			}
-			else
-			{
-				logger.error("MsbMgmrImpl -> register Error, statusCode = " + httpResult.getStatusCode());
-			}
-
-		} catch (Exception e) {
-			logger.error("IOException Failed to unregister nokia vnfm driver! ", e);
-		}
+//		try {
+//			String url = adaptorEnv.getMsbApiUriFront() + String.format(CommonConstants.MSB_UNREGISTER_SERVICE_PATH);
+//
+//			HttpResult httpResult = httpClientProcessor.process(url, RequestMethod.DELETE, null, null);
+//			String responseStr = httpResult.getContent();
+//
+//			logger.info("MsbMgmrImpl -> unregister, responseStr is " + responseStr);
+//			if(httpResult.getStatusCode() == 204)
+//			{
+//				logger.info("MsbMgmrImpl -> register, Successfully ");
+//			}
+//			else
+//			{
+//				logger.error("MsbMgmrImpl -> register Error, statusCode = " + httpResult.getStatusCode());
+//			}
+//
+//		} catch (Exception e) {
+//			logger.error("IOException Failed to unregister nokia vnfm driver! ", e);
+//		}
 
 	}
 
@@ -142,9 +146,11 @@ public class MsbMgmrImpl implements IMsbMgmr {
 		this.adaptorEnv = env;
 	}
 
-	public static final void main(String[] args) {
-		MsbMgmrImpl impl = new MsbMgmrImpl();
-		impl.register();
-	}
+//	public static final void main(String[] args) {
+////		MsbMgmrImpl impl = new MsbMgmrImpl();
+////		impl.register();
+//		System.setProperty("catalina.base", "D:\\Install\\apache-tomcat-9.0.0.M26");
+//		System.out.println(System.getProperty("catalina.base"));
+//	}
 
 }