X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fexternalservice%2Faai%2FExternalSystemProxy.java;h=e5b49d650cc909c24b4fd5f50208bc8d590d562f;hp=caec4bc4fcfff5b853e133272a8897a8cbd9141f;hb=refs%2Ftags%2F4.0.0-ONAP;hpb=a9c5b27687df9f1d72c58fa64899b6783f6aef5a diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java index caec4bc..e5b49d6 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java @@ -16,108 +16,117 @@ package org.onap.aai.esr.externalservice.aai; import org.glassfish.jersey.client.ClientConfig; -import org.onap.aai.esr.common.IsTest; import org.onap.aai.esr.common.MsbConfig; 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 { - 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 static IsTest test = new IsTest(false); - public void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException { - if (!test.getIsTest()){ - 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); - } + 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 { - if (test.getIsTest()) { - String esrVnfmDetailStr = "{\"vnfm-id\":\"123456\",\"vim-id\":\"987654\"," - + "\"certificate-url\":\"http://ip: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://ip:8000\",\"user-name\":\"onap\"," - + "\"password\":\"987654\",\"system-type\":\"VNFM\"}]}}"; - return esrVnfmDetailStr; - } try { - return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId); + return externalSystem.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId); } catch (Exception e) { throw new ExtsysException("Query VNFM detail from A&AI failed.", e); } } public String queryVnfmList() throws ExtsysException { - if (test.getIsTest()) { - String vnfmListStr = "{\"esr-vnfm\": [{\"vnfm-id\": \"123456\",\"vim-id\": \"987654\"," - + "\"certificate-url\": \"http://ip:5000/v3\",\"resource-version\": \"1\"}]}"; - return vnfmListStr; - } try { - return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization); + 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 { - if (!test.getIsTest()) { - try { - externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion); - } catch (Exception e) { - throw new ExtsysException("Delete VNFM from A&AI failed.", e); - } + try { + externalSystem.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion); + } catch (Exception e) { + throw new ExtsysException("Delete VNFM from A&AI failed.", e); } } - public void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) - throws ExtsysException { - if (!test.getIsTest()) { - 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 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 queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException { - if (test.getIsTest()) { - 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://ip:8000\"," - + "\"user-name\":\"nancy\",\"password\":\"123987\",\"system-type\":\"thirdparty_SDNC\"," - + "\"protocol\":\"protocol\"}]}}"; - return sdncDetail; + public String queryNfvoDetail(String nfvoId) throws ExtsysException { + try { + return externalSystemV16.queryNFVODetail(transactionId, fromAppId, authorization, nfvoId); + } catch (Exception e) { + throw new ExtsysException("Query NFVO detail 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 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 void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws ExtsysException { + ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider()); + IExternalSystem registerSdncServiceproxy = + ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class); try { - return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization, + 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 externalSystem.queryThirdpartySdncDetail(transactionId, fromAppId, authorization, thirdpartySdncId); } catch (Exception e) { throw new ExtsysException("Query thirdparty SDNC detail from A&AI failed.", e); @@ -125,84 +134,53 @@ public class ExternalSystemProxy { } public String querySdncList() throws ExtsysException { - if (test.getIsTest()) { - String sdncList = - "{\"esr-thirdparty-sdnc\": [{\"thirdparty-sdnc-id\": \"123456\",\"location\": \"edge\"," - + "\"product-name\": \"thirdparty SDNC\",\"resource-version\": \"1\"}]}"; - return sdncList; - } 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 void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException { - if (!test.getIsTest()) { - try { - externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, - resourceVersion); - } catch (Exception e) { - throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e); - } + try { + externalSystem.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion); + } catch (Exception e) { + throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e); } } public void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException { - if (!test.getIsTest()) { - 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); - } + 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 String queryEmsDetail(String emsId) throws ExtsysException { - if (test.getIsTest()) { - 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\":\"ip\",\"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\":\"ip\",\"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\":\"ip\",\"port\":\"5000\"}]}}"; - return emsDetailStr; - } - try { - return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId); + try { + return externalSystem.queryEMSDetail(transactionId, fromAppId, authorization, emsId); } catch (Exception e) { throw new ExtsysException("Query EMS detail from A&AI failed.", e); } } public String queryEmsList() throws ExtsysException { - if (test.getIsTest()) { - return "{\"esr-ems\": [ {\"ems-id\": \"123456\",\"resource-version\": \"1\"}]}"; - } 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 void deleteEms(String emsId, String resourceVersion) throws ExtsysException { - if (!test.getIsTest()) { - try { - externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion); - } catch (Exception e) { - throw new ExtsysException("Delete EMS from A&AI failed.", e); - } + try { + externalSystem.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion); + } catch (Exception e) { + throw new ExtsysException("Delete EMS from A&AI failed.", e); } } }