From 8a2287b64038441ee20b18191c57e8b8720bbeb7 Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Thu, 19 Oct 2017 09:01:06 +0800 Subject: remove msb dependency in pom Change-Id: I4f4e794a04e768a11e26337deb74c9db02712025 Issue-ID: VFC-54 Signed-off-by: yufei_zhou --- nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml | 11 ----------- .../driver/vnfm/svnfm/init/EnvVariablesInitialization.java | 7 +++---- .../org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/inf/IMsbMgmr.java | 3 +-- 3 files changed, 4 insertions(+), 17 deletions(-) (limited to 'nokia/vnfmdriver') diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml index 3bdebb80..89b06760 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml @@ -110,17 +110,6 @@ org.json json - - com.alibaba - fastjson - 1.2.39 - - - - org.onap.msb.java-sdk - msb-java-sdk - 1.0.0-SNAPSHOT - io.dropwizard dropwizard-core diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/init/EnvVariablesInitialization.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/init/EnvVariablesInitialization.java index 7e756219..eddc51a5 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/init/EnvVariablesInitialization.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/init/EnvVariablesInitialization.java @@ -21,7 +21,6 @@ import java.io.IOException; import org.apache.http.client.ClientProtocolException; import org.json.JSONException; import org.json.JSONObject; -import org.onap.msb.sdk.discovery.common.RouteException; import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.bo.AdaptorEnv; import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.util.CommonUtil; import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonConstants; @@ -72,7 +71,7 @@ public class EnvVariablesInitialization implements ApplicationRunner { } - private void handleAaiMsbServiceInfo() throws RouteException, ClientProtocolException, IOException { + private void handleAaiMsbServiceInfo() throws ClientProtocolException, IOException { String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getAaiServiceNameInMsb(), adaptorEnv.getAaiVersionInMsb()); adaptorEnv.setAaiUrlInMsb(urlInMsb); adaptorEnv.setAaiApiUriFront(generateApiUriFront(urlInMsb)); @@ -87,13 +86,13 @@ public class EnvVariablesInitialization implements ApplicationRunner { return CommonConstants.SCHEMA_HTTP + "://" + adaptorEnv.getMsbIp() + ":" + adaptorEnv.getMsbPort(); } - private void handLcmMsbServiceInfo() throws RouteException, ClientProtocolException, IOException { + private void handLcmMsbServiceInfo() throws ClientProtocolException, IOException { String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getLcmServiceNameInMsb(), adaptorEnv.getLcmVersionInMsb()); adaptorEnv.setLcmUrlInMsb(urlInMsb); adaptorEnv.setLcmApiUriFront(generateApiUriFront(urlInMsb)); } - private void handCatalogMsbServiceInfo() throws RouteException, ClientProtocolException, IOException { + private void handCatalogMsbServiceInfo() throws ClientProtocolException, IOException { String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getCatalogServiceNameInMsb(), adaptorEnv.getCatalogVersionInMsb()); adaptorEnv.setCatalogUrlInMsb(urlInMsb); adaptorEnv.setCatalogApiUriFront(generateApiUriFront(urlInMsb)); diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/inf/IMsbMgmr.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/inf/IMsbMgmr.java index d860e398..be9043e6 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/inf/IMsbMgmr.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/inf/IMsbMgmr.java @@ -19,10 +19,9 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.msb.inf; import java.io.IOException; import org.apache.http.client.ClientProtocolException; -import org.onap.msb.sdk.discovery.common.RouteException; public interface IMsbMgmr { public void register(); public void unregister(); - public String getServiceUrlInMsbBySeriveNameAndVersion(String serviceName, String version) throws RouteException, ClientProtocolException, IOException; + public String getServiceUrlInMsbBySeriveNameAndVersion(String serviceName, String version) throws ClientProtocolException, IOException; } -- cgit 1.2.3-korg