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;
return;
}
- try {
- handleAaiMsbServiceInfo();
- } catch (RouteException e) {
- logger.error("handleAaiMsbServiceInfo error", e);
- }
+ adaptorEnv.setAaiApiUriFront(adaptorEnv.getMsbApiUriFront());
+ adaptorEnv.setLcmApiUriFront(adaptorEnv.getMsbApiUriFront());
+ adaptorEnv.setCatalogApiUriFront(adaptorEnv.getMsbApiUriFront());
- try {
- handLcmMsbServiceInfo();
- } catch (RouteException e) {
- logger.error("handLcmMsbServiceInfo error", e);
- }
-
- try {
- handCatalogMsbServiceInfo();
- } catch (RouteException e) {
- logger.error("handCatalogMsbServiceInfo error", e);
- }
+// try {
+// handleAaiMsbServiceInfo();
+// } catch (Exception e) {
+// logger.error("handleAaiMsbServiceInfo error", e);
+// }
+//
+// try {
+// handleLcmMsbServiceInfo();
+// } catch (Exception e) {
+// logger.error("handleLcmMsbServiceInfo error", e);
+// }
+//
+// try {
+// handleCatalogMsbServiceInfo();
+// } catch (Exception e) {
+// logger.error("handleCatalogMsbServiceInfo error", e);
+// }
}
- private void handleAaiMsbServiceInfo() throws RouteException {
- String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndPort(adaptorEnv.getAaiServiceNameInMsb(), adaptorEnv.getAaiVersionInMsb());
+ private void handleAaiMsbServiceInfo() throws ClientProtocolException, IOException {
+ String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getAaiServiceNameInMsb(), adaptorEnv.getAaiVersionInMsb());
adaptorEnv.setAaiUrlInMsb(urlInMsb);
adaptorEnv.setAaiApiUriFront(generateApiUriFront(urlInMsb));
}
private String generateApiUriFront(String urlInMsb) {
- return CommonConstants.SCHEMA_HTTP + "://" + adaptorEnv.getMsbIp() + ":" + adaptorEnv.getMsbPort() + urlInMsb;
+ return generateMsbApiUriFront() + urlInMsb;
+ }
+
+ private String generateMsbApiUriFront()
+ {
+ return CommonConstants.SCHEMA_HTTP + "://" + adaptorEnv.getMsbIp() + ":" + adaptorEnv.getMsbPort();
}
- private void handLcmMsbServiceInfo() throws RouteException {
- String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndPort(adaptorEnv.getLcmServiceNameInMsb(), adaptorEnv.getLcmVersionInMsb());
+ private void handleLcmMsbServiceInfo() throws ClientProtocolException, IOException {
+ String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getLcmServiceNameInMsb(), adaptorEnv.getLcmVersionInMsb());
adaptorEnv.setLcmUrlInMsb(urlInMsb);
adaptorEnv.setLcmApiUriFront(generateApiUriFront(urlInMsb));
}
- private void handCatalogMsbServiceInfo() throws RouteException {
- String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndPort(adaptorEnv.getCatalogServiceNameInMsb(), adaptorEnv.getCatalogVersionInMsb());
+ private void handleCatalogMsbServiceInfo() throws ClientProtocolException, IOException {
+ String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getCatalogServiceNameInMsb(), adaptorEnv.getCatalogVersionInMsb());
adaptorEnv.setCatalogUrlInMsb(urlInMsb);
adaptorEnv.setCatalogApiUriFront(generateApiUriFront(urlInMsb));
}
adaptorEnv.setMsbIp(msb_ip);
adaptorEnv.setMsbPort(msb_port);
+ adaptorEnv.setMsbApiUriFront(generateMsbApiUriFront());
}
private String readMsbInfoFromJsonFile() throws IOException {