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 --- .../nfvo/ns/lcm/bpmn/flows/extclients/aai/AaiPropertiesImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'so-etsi-nfvo/so-etsi-nfvo-ns-lcm') diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/bpmn/flows/extclients/aai/AaiPropertiesImpl.java b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/bpmn/flows/extclients/aai/AaiPropertiesImpl.java index 0aa14c711f..25a43a86d0 100644 --- a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/bpmn/flows/extclients/aai/AaiPropertiesImpl.java +++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/src/main/java/org/onap/so/etsi/nfvo/ns/lcm/bpmn/flows/extclients/aai/AaiPropertiesImpl.java @@ -35,6 +35,7 @@ public class AaiPropertiesImpl implements AAIProperties { private final String encryptionKey; private final String aaiVersion; private final Long readTimeout; + private final Long connectionTimeout; private final boolean enableCaching; private final Long cacheMaxAge; @@ -44,7 +45,8 @@ public class AaiPropertiesImpl implements AAIProperties { this.encryptedBasicAuth = context.getEnvironment().getProperty("aai.auth"); this.encryptionKey = context.getEnvironment().getProperty("mso.key"); this.aaiVersion = context.getEnvironment().getProperty("aai.version"); - 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); } @@ -85,6 +87,11 @@ public class AaiPropertiesImpl implements AAIProperties { return this.readTimeout; } + @Override + public Long getConnectionTimeout() { + return this.connectionTimeout; + } + @Override public boolean isCachingEnabled() { return this.enableCaching; -- cgit 1.2.3-korg