diff options
Diffstat (limited to 'vid-app-common/src')
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java | 11 | ||||
| -rw-r--r-- | vid-app-common/src/test/resources/WEB-INF/conf/system.properties | 20 |
2 files changed, 12 insertions, 19 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java b/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java index 84e83e8b..b7f22640 100644 --- a/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java +++ b/vid-app-common/src/main/java/org/onap/vid/client/SyncRestClient.java @@ -23,6 +23,7 @@ package org.onap.vid.client; import io.joshworks.restclient.http.HttpResponse; import io.joshworks.restclient.http.JsonNode; import io.joshworks.restclient.http.RestClient; +import io.joshworks.restclient.http.exceptions.RestClientException; import io.joshworks.restclient.http.mapper.ObjectMapper; import org.apache.http.impl.client.CloseableHttpClient; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; @@ -39,7 +40,7 @@ import java.security.UnrecoverableKeyException; import java.security.NoSuchAlgorithmException; import java.security.KeyManagementException; import java.security.cert.CertificateException; -import javax.net.ssl.SSLHandshakeException; +import javax.net.ssl.SSLException; import java.security.KeyStoreException; import java.text.SimpleDateFormat; import javax.net.ssl.SSLContext; @@ -150,13 +151,13 @@ public class SyncRestClient implements SyncRestClientInterface { @SneakyThrows private <T> HttpResponse<T> callWithRetryOverHttp(String url, - CheckedFunction1<String, HttpResponse<T>> httpRequest) { + CheckedFunction1<String, HttpResponse<T>> httpRequest) { try { return httpRequest.apply(url); - } catch (Exception e) { - if (e.getCause() instanceof SSLHandshakeException) { + } catch (RestClientException e) { + if (e.getCause() instanceof SSLException) { logger.warn(EELFLoggerDelegate.debugLogger, - DATE_FORMAT.format(new Date()) + TRY_TO_CALL_OVER_HTTP, e); + DATE_FORMAT.format(new Date()) + TRY_TO_CALL_OVER_HTTP, e); return httpRequest.apply(url.replaceFirst(HTTPS_SCHEMA, HTTP_SCHEMA)); } throw e; diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties index fff5456f..6a8a1a37 100644 --- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties +++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties @@ -73,18 +73,12 @@ element_map_icon_path = app/fusionapp/icons/ #aai related properties #dev server -#aai.server.url.base=https://mtanjv9aaas40.aic.cip.att.com:8443/aai/ -#aai.server.url=https://mtanjv9aaas40.aic.cip.att.com:8443/aai/v10/ -#aai.oldserver.url.base=https://mtanjv9aaas40.aic.cip.att.com:8443/aai/servers/ -#aai.oldserver.url=https://mtanjv9aaas40.aic.cip.att.com:8443/aai/servers/v3/ #ist servers -aai.server.url.base=https://aai-ext1.test.att.com:8443/aai/ -#aai.server.url=https://aai-ext1.test.att.com:8443/aai/v12/ +aai.server.url.base=http://localhost:8080/vidSimulator/aai/ aai.server.url=http://localhost:8080/vidSimulator/aai/v12/ #aai.server.url=http://localhost:1080/aai -#aai.server.url=https://aai-int2.test.att.com:8443/aai/v12/ -aai.vid.username=VID -aai.vid.passwd.x=OBF:1jm91i0v1jl9 +aai.vid.username=vid@vid.onap.org +aai.vid.passwd.x=OBF:1fia1ju61l871lfe18xp18xr18xt1lc41l531jrk1fek @@ -93,12 +87,10 @@ aai.vid.passwd.x=OBF:1jm91i0v1jl9 -aai.oldserver.url.base=https://aai-ext1.test.att.com:8443/aai/servers/ -aai.oldserver.url=https://aai-ext1.test.att.com:8443/aai/servers/v3/ aai.truststore.filename=tomcat_keystore -aai.truststore.passwd.x=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o +aai.truststore.passwd.x=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp aai.keystore.filename=aai-client-cert.p12 -aai.keystore.passwd.x=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o +aai.keystore.passwd.x=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp aai.use.client.cert=false aai.vnf.provstatus=PREPROV,NVTPROV,PROV,CAPPED @@ -167,7 +159,7 @@ vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks mso.dme2.client.timeout=30000 mso.dme2.client.read.timeout=120000 -scheduler.server.url=http://mtanjv9sdlg10.aic.cip.att.com:8989/scheduler +scheduler.server.url= scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/ scheduler.get.time.slots=/v1/ChangeManagement/schedules/ scheduler.get.schedules=/v1/ChangeManagement/schedules/scheduleDetails/ |