From 104df2c5a55ea57201038531b4f318590f04d7ed Mon Sep 17 00:00:00 2001 From: Joseph Chou Date: Fri, 13 Mar 2020 14:15:35 -0400 Subject: ONAP server pool code update Fix server-pool junit hang due to hardcoded IP Issue-ID: POLICY-2425 Change-Id: Icaf54c0bbd81fa755a031df91ee6cf5cdee98f27 Signed-off-by: Joseph Chou --- .../src/main/feature/config/feature-server-pool.properties | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'feature-server-pool/src/main') diff --git a/feature-server-pool/src/main/feature/config/feature-server-pool.properties b/feature-server-pool/src/main/feature/config/feature-server-pool.properties index 7be2167f..00380294 100644 --- a/feature-server-pool/src/main/feature/config/feature-server-pool.properties +++ b/feature-server-pool/src/main/feature/config/feature-server-pool.properties @@ -22,8 +22,8 @@ # server binds to. The default will bind to all interfaces on the host, # and choose a port number at random. -server.pool.server.ipAddress=0.0.0.0 -server.pool.server.port=${envd:SERVER_POOL_PORT} +server.pool.server.ipAddress=${envd:SERVER_POOL_SERVER_IP} +server.pool.server.port=${envd:SERVER_POOL_PORT:20000} # The following properties determine whether HTTPS is used -- note that HTTPS # also requires that the 'java.net.ssl.*' parameters in 'system.properties' be @@ -76,7 +76,8 @@ server.pool.server.threads.keepAliveTime=5000 # keeps this channel open long-term. server.pool.discovery.servers=${envd:SERVER_POOL_DISCOVERY_SERVERS} -server.pool.discovery.topic=${envd:SERVER_POOL_DISCOVERY_TOPIC} +server.pool.discovery.port=${envd:SERVER_POOL_DISCOVERY_PORT:3904} +server.pool.discovery.topic=${envd:SERVER_POOL_DISCOVERY_TOPIC:DISCOVERY-TOPIC} server.pool.discovery.username=${envd:SERVER_POOL_DISCOVERY_USERNAME} server.pool.discovery.password=${envd:SERVER_POOL_DISCOVERY_PASSWORD} server.pool.discovery.https=${envd:DMAAP_USE_HTTPS} @@ -116,11 +117,14 @@ keyword.path=requestID,CommonHeader.RequestID,body.output.common-header.request- # by '.' that are used to locate the keyword # (e.g. 'method1().field2.method3()') +keyword.java.lang.String.lookup=toString() keyword.org.onap.policy.m2.base.Transaction.lookup=getRequestID() keyword.org.onap.policy.controlloop.ControlLoopEvent.lookup=requestID keyword.org.onap.policy.appclcm.LcmRequestWrapper.lookup=getBody().getCommonHeader().getRequestId() keyword.org.onap.policy.appclcm.LcmResponseWrapper.lookup=getBody().getCommonHeader().getRequestId() keyword.org.onap.policy.drools.serverpool.TargetLock.lookup=getOwnerKey() +keyword.org.onap.policy.drools.serverpooltest.TestDroolsObject.lookup=getKey() +keyword.org.onap.policy.drools.serverpooltest.Test1$KeywordWrapper.lookup=key # The following properties affect distributed 'TargetLock' behavior. # -- cgit 1.2.3-korg