From b8b0464aa8a05a345115264084b08229f35c8413 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Sat, 23 Jan 2021 16:07:59 -0500 Subject: set connection timeout as well as read timeout set connection timeout as well as read timeout correct dependency version in openstack pom limit timeout test to a single retry add connection timeout property for A&AI client Issue-ID: SO-3491 Signed-off-by: Benjamin, Max (mb388a) Change-Id: I576c143822ba45fc79648fd0a1edb6ccd3aff8b2 --- .../apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mso-api-handlers') diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java index 1492baf1cd..e330d2116c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/AaiClientPropertiesImpl.java @@ -34,6 +34,7 @@ public class AaiClientPropertiesImpl implements AAIProperties { private String auth; private String key; private Long readTimeout; + private Long connectionTimeout; private boolean enableCaching; private Long cacheMaxAge; @@ -43,7 +44,8 @@ public class AaiClientPropertiesImpl implements AAIProperties { aaiEndpoint = context.getEnvironment().getProperty("mso.aai.endpoint"); this.auth = context.getEnvironment().getProperty("aai.auth"); this.key = context.getEnvironment().getProperty("mso.msoKey"); - this.readTimeout = context.getEnvironment().getProperty("aai.readTimeout", Long.class, new Long(60000)); + this.readTimeout = context.getEnvironment().getProperty("aai.readTimeout", Long.class, 60000L); + this.connectionTimeout = context.getEnvironment().getProperty("aai.connectionTimeout", Long.class, 60000L); this.enableCaching = context.getEnvironment().getProperty("aai.caching.enabled", Boolean.class, false); this.cacheMaxAge = context.getEnvironment().getProperty("aai.caching.maxAge", Long.class, 60000L); } @@ -78,6 +80,11 @@ public class AaiClientPropertiesImpl implements AAIProperties { return this.readTimeout; } + @Override + public Long getConnectionTimeout() { + return this.connectionTimeout; + } + @Override public boolean isCachingEnabled() { return this.enableCaching; -- cgit 1.2.3-korg