Update recipes to add default values for

timeout and the query smart limit to false
Found that the smart limit on random
scenario will cause the db to return a factor
of 2000 vertexes instead of all when smart
limit is set to true

Issue-ID: AAI-493
Change-Id: I0d05f9d5a30372745946b937eefaaf41b7984906
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiconfig.properties b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiconfig.properties
index df77ecf..493e077 100644 (file)
--- a/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiconfig.properties
+++ b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/aaiconfig.properties
@@ -83,3 +83,12 @@ aai.bulkconsumer.payloadlimit=30
 #uncomment and use header X-OverrideLimit with the value to override the bulk api limit
 #aai.bulkconsumer.payloadoverride=AAI-OVERRIDE-KEY
 aai.bulkconsumer.payloadoverride=false
+
+#timeout for crud enabled flag
+aai.crud.timeoutenabled=true
+
+#timeout app specific
+aai.crud.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,-1|AAI-FILEGEN-GFPIP,-1
+
+#default timeout limit added for traversal if not overridden (in ms)
+aai.crud.timeoutlimit=180000

diff --git a/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties
index 2691adf..ca2e6c5 100644 (file)
--- a/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties
+++ b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-cached.properties
@@ -1,5 +1,6 @@
 # the following parameters are not reloaded automatically and require a manual bounce
 query.fast-property=true
+query.smart-limit=false
 storage.backend=<%= @STORAGE_BACKEND %>
 storage.hostname=<%= @STORAGE_HOSTNAME %>
 #schema.default=none

diff --git a/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties
index b8c6168..0f8f55e 100644 (file)
--- a/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties
+++ b/cookbooks/aai-resources/aai-resources-config/templates/default/aai-resources-config/titan-realtime.properties
@@ -1,5 +1,6 @@
 # the following parameters are not reloaded automatically and require a manual bounce
 query.fast-property=true
+query.smart-limit=false
 storage.backend=<%= @STORAGE_BACKEND %>
 storage.hostname=<%= @STORAGE_HOSTNAME %>
 #schema.default=none

diff --git a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiconfig.properties b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiconfig.properties
index eadc72a..2c0f004 100644 (file)
--- a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiconfig.properties
+++ b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/aaiconfig.properties
@@ -73,3 +73,11 @@ aai.transaction.logging.get=false
 aai.transaction.logging.post=false
 
 
+#timeout for crud enabled flag
+aai.traversal.timeoutenabled=true
+
+#timeout app specific
+aai.traversal.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,-1|AAI-FILEGEN-GFPIP,-1
+
+#default timeout limit added for traversal if not overridden (in ms)
+aai.traversal.timeoutlimit=180000

diff --git a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties
index 2691adf..ca2e6c5 100644 (file)
--- a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties
+++ b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-cached.properties
@@ -1,5 +1,6 @@
 # the following parameters are not reloaded automatically and require a manual bounce
 query.fast-property=true
+query.smart-limit=false
 storage.backend=<%= @STORAGE_BACKEND %>
 storage.hostname=<%= @STORAGE_HOSTNAME %>
 #schema.default=none

diff --git a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties
index b8c6168..0f8f55e 100644 (file)
--- a/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties
+++ b/cookbooks/aai-traversal/aai-traversal-config/templates/default/aai-traversal-app-config/titan-realtime.properties
@@ -1,5 +1,6 @@
 # the following parameters are not reloaded automatically and require a manual bounce
 query.fast-property=true
+query.smart-limit=false
 storage.backend=<%= @STORAGE_BACKEND %>
 storage.hostname=<%= @STORAGE_HOSTNAME %>
 #schema.default=none