import org.onap.aai.esr.entity.aai.EsrEmsDetail;
import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail;
import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
+import org.onap.aai.esr.entity.aai.EsrNfvoDetail;
import org.onap.aai.esr.exception.ExtsysException;
import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
public class ExternalSystemProxy {
- public static boolean isTest = false;
- private static IExternalSystem externalSystemproxy;
+ private static IExternalSystem externalSystem, externalSystemV16;
private static String transactionId = "9999";
private static String fromAppId = "esr-server";
private static String authorization = AaiCommon.getAuthenticationCredentials();
static {
ClientConfig config = new ClientConfig();
- externalSystemproxy =
+ externalSystem =
ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+ externalSystemV16 =
+ ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddrV16(), config, IExternalSystem.class);
+ }
+
+ public void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
+ ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
+ IExternalSystem registerVnfmServiceproxy =
+ ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+ try {
+ registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId, esrVnfmDetail);
+ } catch (Exception e) {
+ throw new ExtsysException("PUT VNFM to A&AI failed.", e);
+ }
}
- public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
- if (isTest) {
-
- } else {
- ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
- IExternalSystem registerVnfmServiceproxy =
- ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
- try {
- registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId, esrVnfmDetail);
- } catch (Exception e) {
- throw new ExtsysException("PUT VNFM to A&AI failed.", e);
- }
+ public String queryVnfmDetail(String vnfmId) throws ExtsysException {
+ try {
+ return externalSystem.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+ } catch (Exception e) {
+ throw new ExtsysException("Query VNFM detail from A&AI failed.", e);
}
}
- public static String queryVnfmDetail(String vnfmId) throws ExtsysException {
- if (isTest) {
- String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\"," + "\"vim-id\":\"987654\","
- + "\"certificate-url\":\"http://11.22.33.44:5000/v3\"," + "\"esr-system-info-list\":{"
- + "\"esr-system-info\":[{" + "\"esr-system-info-id\":\"qwerty\"," + "\"system-name\":\"ONAP VNFM\","
- + "\"type\":\"vnfm\"," + "\"vendor\":\"zte\"," + "\"version\":\"v1\","
- + "\"service-url\":\"http://10.11.22.33:8000\"," + "\"user-name\":\"onap\","
- + "\"password\":\"987654\"," + "\"system-type\":\"VNFM\"}]}}";
- return esrVnfmDetailStr;
+ public String queryVnfmList() throws ExtsysException {
+ try {
+ return externalSystem.queryVNFMList(transactionId, fromAppId, authorization);
+ } catch (Exception e) {
+ throw new ExtsysException("Query VNFM list from A&AI failed.", e);
}
+ }
+
+ public void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
try {
- return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+ externalSystem.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
} catch (Exception e) {
- throw new ExtsysException("Query VNFM detail from A&AI failed.", e);
+ throw new ExtsysException("Delete VNFM from A&AI failed.", e);
}
}
- public static String queryVnfmList() throws ExtsysException {
- if (isTest) {
- String vnfmListStr = "{\"esr-vnfm\": " + "[{\"vnfm-id\": \"123456\"," + "\"vim-id\": \"987654\","
- + "\"certificate-url\": \"http://11.22.33.44:5000/v3\"," + "\"resource-version\": \"1\"}]}";
- return vnfmListStr;
+ public void registerNfvo(String nfvoId, EsrNfvoDetail esrNfvoDetail) throws ExtsysException {
+ ClientConfig config = new ClientConfig(new NfvoRegisterProvider());
+ IExternalSystem registerNfvoServiceproxy =
+ ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddrV16(), config, IExternalSystem.class);
+ try {
+ registerNfvoServiceproxy.registerNFVO(transactionId, fromAppId, authorization, nfvoId, esrNfvoDetail);
+ } catch (Exception e) {
+ throw new ExtsysException("PUT NFVO to A&AI failed.", e);
}
+ }
+
+ public String queryNfvoDetail(String nfvoId) throws ExtsysException {
try {
- return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
+ return externalSystemV16.queryNFVODetail(transactionId, fromAppId, authorization, nfvoId);
} catch (Exception e) {
- throw new ExtsysException("Query VNFM list from A&AI failed.", e);
+ throw new ExtsysException("Query NFVO detail from A&AI failed.", e);
}
}
- public static void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
- if (!isTest) {
- try {
- externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
- } catch (Exception e) {
- throw new ExtsysException("Delete VNFM from A&AI failed.", e);
- }
+ public String queryNfvoList() throws ExtsysException {
+ try {
+ return externalSystemV16.queryNFVOList(transactionId, fromAppId, authorization);
+ } catch (Exception e) {
+ throw new ExtsysException("Query NFVO list from A&AI failed.", e);
}
}
- public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail)
- throws ExtsysException {
- if (!isTest) {
- ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
- IExternalSystem registerSdncServiceproxy =
- ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
- try {
- registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization,
- thirdpartySdncId, esrSdncDetail);
- } catch (Exception e) {
- throw new ExtsysException("PUT thirdparty SDNC to A&AI failed.", e);
- }
+ public void deleteNfvo(String nfvoId, String resourceVersion) throws ExtsysException {
+ try {
+ externalSystemV16.deleteNFVO(transactionId, fromAppId, authorization, nfvoId, resourceVersion);
+ } catch (Exception e) {
+ throw new ExtsysException("Delete NFVO from A&AI failed.", e);
}
}
- public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
- if (isTest) {
- String sdncDetail = "{\"thirdparty-sdnc-id\":\"123456\"," + "\"location\":\"edge\","
- + "\"product-name\":\"thirdparty SDNC\"," + "\"esr-system-info-list\":{" + "\"esr-system-info\":"
- + "[{\"esr-system-info-id\":\"987654\"," + "\"system-name\":\"SDNC_TEST\"," + "\"type\":\"SDNC\","
- + "\"vendor\":\"zte\"," + "\"version\":\"v1\"," + "\"service-url\":\"http://127.0.0.1:8000\","
- + "\"user-name\":\"nancy\"," + "\"password\":\"123987\"," + "\"system-type\":\"thirdparty_SDNC\","
- + "\"protocol\":\"protocol\"}]}}";
- return sdncDetail;
+
+
+
+
+ public void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws ExtsysException {
+ ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
+ IExternalSystem registerSdncServiceproxy =
+ ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+ try {
+ registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
+ esrSdncDetail);
+ } catch (Exception e) {
+ throw new ExtsysException("PUT thirdparty SDNC to A&AI failed.", e);
}
+ }
+
+ public String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
try {
- return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization,
+ return externalSystem.queryThirdpartySdncDetail(transactionId, fromAppId, authorization,
thirdpartySdncId);
} catch (Exception e) {
throw new ExtsysException("Query thirdparty SDNC detail from A&AI failed.", e);
}
}
- public static String querySdncList() throws ExtsysException {
- if (isTest) {
- String sdncList =
- "{\"esr-thirdparty-sdnc\": " + "[{\"thirdparty-sdnc-id\": \"123456\"," + "\"location\": \"edge\","
- + "\"product-name\": \"thirdparty SDNC\"," + "\"resource-version\": \"1\"}]}";
- return sdncList;
- }
+ public String querySdncList() throws ExtsysException {
try {
- return externalSystemproxy.queryThirdpartySdncList(transactionId, fromAppId, authorization);
+ return externalSystem.queryThirdpartySdncList(transactionId, fromAppId, authorization);
} catch (Exception e) {
throw new ExtsysException("Query thirdparty SDNC list from A&AI failed.", e);
}
}
- public static void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
- if (!isTest) {
- try {
- externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId,
- resourceVersion);
- } catch (Exception e) {
- throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
- }
+ public void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
+ try {
+ externalSystem.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+ } catch (Exception e) {
+ throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
}
}
- public static void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
- if (!isTest) {
- ClientConfig config = new ClientConfig(new EmsRegisterProvider());
- IExternalSystem registerEmsServiceproxy =
- ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
- try {
- registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId, emsDetail);
- } catch (Exception e) {
- throw new ExtsysException("PUT EMS to A&AI failed.", e);
- }
+ public void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
+ ClientConfig config = new ClientConfig(new EmsRegisterProvider());
+ IExternalSystem registerEmsServiceproxy =
+ ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+ try {
+ registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId, emsDetail);
+ } catch (Exception e) {
+ throw new ExtsysException("PUT EMS to A&AI failed.", e);
}
}
- public static String queryEmsDetail(String emsId) throws ExtsysException {
- if (isTest) {
- String emsDetailStr = "{\"ems-id\":\"123456\"," + "\"esr-system-info-list\":" + "{\"esr-system-info\":"
- + "[{\"esr-system-info-id\":\"234567\"," + "\"system-name\":\"EMS_TEST\"," + "\"type\":\"sftp\","
- + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\"," + "\"user-name\":\"nancy\"," + "\"password\":\"asdf\","
- + "\"system-type\":\"EMS_RESOUCE\"," + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\","
- + "\"passive\":true," + "\"remote-path\":\"/home/per\"}," + "{\"esr-system-info-id\":\"345678\","
- + "\"system-name\":\"EMS_TEST\"," + "\"type\":\"sftp\"," + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\","
- + "\"user-name\":\"nancy\"," + "\"password\":\"asdf\"," + "\"system-type\":\"EMS_PERFORMANCE\","
- + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\"," + "\"passive\":true,"
- + "\"remote-path\":\"/home/per\"}," + "{\"esr-system-info-id\":\"456789\","
- + "\"system-name\":\"EMS_TEST\"," + "\"vendor\":\"ZTE\"," + "\"version\":\"V1\","
- + "\"user-name\":\"nancy\"," + "\"password\":\"987654\"," + "\"system-type\":\"EMS_ALARM\","
- + "\"ip-address\":\"127.0.0.1\"," + "\"port\":\"5000\"}]}}";
- return emsDetailStr;
- }
+ public String queryEmsDetail(String emsId) throws ExtsysException {
try {
- return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
+ return externalSystem.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
} catch (Exception e) {
throw new ExtsysException("Query EMS detail from A&AI failed.", e);
}
}
- public static String queryEmsList() throws ExtsysException {
- if (isTest) {
- return "{\"esr-ems\": [ {\"ems-id\": \"123456\",\"resource-version\": \"1\"}]}";
- }
+ public String queryEmsList() throws ExtsysException {
try {
- return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
+ return externalSystem.queryEMSList(transactionId, fromAppId, authorization);
} catch (Exception e) {
throw new ExtsysException("Query EMS list from A&AI failed.", e);
}
}
- public static void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
- if (!isTest) {
- try {
- externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
- } catch (Exception e) {
- throw new ExtsysException("Delete EMS from A&AI failed.", e);
- }
+ public void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
+ try {
+ externalSystem.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+ } catch (Exception e) {
+ throw new ExtsysException("Delete EMS from A&AI failed.", e);
}
}
}
Code Review / aai / esr-server.git / blobdiff