From df1c5a7a3d1c6f1f4b98604707d48a7d93f3fbb8 Mon Sep 17 00:00:00 2001
From: "Kajur, Harish (vk250x)" <vk250x@att.com>
Date: Tue, 16 Jul 2019 21:52:42 -0400
Subject: Add the dsl timeout properties for traversal

Issue-ID: AAI-2509
Change-Id: Ie45f31686259f6d5e6dcc5948003df8c0b624874
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
---
 .../resources/config/aaiconfig.properties          | 13 +++++++++++++
 components/aai-traversal/values.yaml               | 22 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/components/aai-traversal/resources/config/aaiconfig.properties b/components/aai-traversal/resources/config/aaiconfig.properties
index 3859590..0f23eda 100644
--- a/components/aai-traversal/resources/config/aaiconfig.properties
+++ b/components/aai-traversal/resources/config/aaiconfig.properties
@@ -79,3 +79,16 @@ aai.traversal.timeout.appspecific={{ .Values.config.timeout.appspecific }}
 
 #default timeout limit added for traversal if not overridden (in ms)
 aai.traversal.timeoutlimit={{ .Values.config.timeout.limit | int }}
+
+#timeout for traversal dsl enabled flag
+aai.traversal.dsl.timeoutenabled={{ .Values.config.dsl.timeout.enabled }}
+
+#timeout app specific -1 to bypass for that app id, a whole number to override the timeout with that value (in ms)
+aai.traversal.dsl.timeout.appspecific={{ .Values.config.dsl.timeout.appspecific | join "|" }}
+
+#default timeout limit added for traversal dsl if not overridden (in ms)
+aai.traversal.dsl.timeoutlimit={{ .Values.config.dsl.timeout.limit | int }}
+
+# Threshold for margin of error (in ms) for resources_with_sot format to derive the most recent http method performed
+aai.resource.formatter.threshold=10
+aai.dsl.override={{ .Values.config.dslOverride }}
diff --git a/components/aai-traversal/values.yaml b/components/aai-traversal/values.yaml
index c2c9924..c2450ac 100644
--- a/components/aai-traversal/values.yaml
+++ b/components/aai-traversal/values.yaml
@@ -42,6 +42,28 @@ config:
   # Disables the updateQueryData script to run as part of traversal
   disableUpdateQuery: true
 
+  # Override of the DSL Timeout Limit
+  dslOverride: 'ZV4V7E3N77SKIB6MR9MHQ6M4P6Q99Z7M76RBODA'
+
+  dsl:
+    # Dsl timeout configuration
+    timeout:
+      # Whether or not the dsl is enabled
+      enabled: true
+      # Default time limit of the DSL query
+      limit: 150000
+      # App Specific Timeout Limit for each of the X-FromAppId
+      appspecific:
+        - JUNITTESTAPP1,1
+        - JUNITTESTAPP2,-1
+        - AAI-TOOLS,-1
+        - DCAE-CCS,1200000
+        - DCAES,1200000
+        - VPESAT,-1
+        - AAI-CACHER,-1
+        - VidAaiController,300000
+        - AAI-UI,180000
+
 persistence:
   mountPath: /dockerdata-nfs
   mountSubPath: aai/aai-traversal
-- 
cgit 1.2.3-korg