diff options
Diffstat (limited to 'src/main')
11 files changed, 1 insertions, 490 deletions
diff --git a/src/main/resources/etc/appprops/aaiconfig.properties b/src/main/resources/etc/appprops/aaiconfig.properties index 8613d93..d2cf54b 100644 --- a/src/main/resources/etc/appprops/aaiconfig.properties +++ b/src/main/resources/etc/appprops/aaiconfig.properties @@ -126,7 +126,7 @@ aai.datagrooming.fvalue=10 aai.graphadmin.timeoutenabled=true
#timeout app specific -1 to bypass for that app id, a whole number to override the timeout with that value (in ms)
-aai.graphadmin.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,-1|AAI-FILEGEN-GFPIP,-1|FitNesse-Test-PS2418,-1|FitNesse-Test-jenkins,-1|FitNesse-Test-ps2418,-1|FitNesse-Relationship-Test-PS2418,-1|FitNesse-Relationship-Test-ps2418,-1|FitNesse-Relationship-Test-jenkins,-1|VPESAT,-1|AAIRctFeed,-1|NewvceCreator,-1|IANewvceCreator,-1|AAI-CSIOVALS,-1
+aai.graphadmin.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1
#default timeout limit added for graphadmin if not overridden (in ms)
aai.graphadmin.timeoutlimit=180000
diff --git a/src/main/resources/etc/scriptdata/addmanualdata/tenant_isolation/README b/src/main/resources/etc/scriptdata/addmanualdata/tenant_isolation/README deleted file mode 100644 index 16510a0..0000000 --- a/src/main/resources/etc/scriptdata/addmanualdata/tenant_isolation/README +++ /dev/null @@ -1 +0,0 @@ -The tenant_isolation directory is used to store the payload files created by the dynamic payload generator. diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters.json b/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters.json deleted file mode 100644 index 07ee9c4..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "cloud-region" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - }, - "complex" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - }, - "availability-zone" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - }, - "pserver" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - }, - "zone" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - }, - "tenant" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - } -}
\ No newline at end of file diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/inputFiltersAllzones.json b/src/main/resources/etc/scriptdata/tenant_isolation/inputFiltersAllzones.json deleted file mode 100644 index 026759d..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/inputFiltersAllzones.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "cloud-region" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0" - }, - { - "property": "cloud-region-id", - "regex": "m.*" - } - ] - }, - "complex" : { - "filtered-node-type": "complex", - "filters": [] - }, - "availability-zone" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0" - }, - { - "property": "cloud-region-id", - "regex": "m.*" - } - ] - }, - "pserver" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0" - }, - { - "property": "cloud-region-id", - "regex": "m.*" - } - ] - }, - "zone" : { - "filtered-node-type": "zone", - "filters": [] - }, - "tenant" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "2.5|3.0" - }, - { - "property": "cloud-region-id", - "regex": "m.*" - } - ] - } -} diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_E2E.json b/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_E2E.json deleted file mode 100644 index 24ee80d..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_E2E.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "cloud-region" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "RDM3|RDM5a|RDM5b|RDM6a|RDM6b|DPA2a|DPA2b" - } - ] - }, - "complex" : { - "filtered-node-type": "complex", - "filters": [] - }, - "availability-zone" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "RDM3|RDM5a|RDM5b|RDM6a|RDM6b|DPA2a|DPA2b" - } - ] - }, - "pserver" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "RDM3|RDM5a|RDM5b|RDM6a|RDM6b|DPA2a|DPA2b" - } - ] - }, - "zone" : { - "filtered-node-type": "zone", - "filters": [] - }, - "tenant" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "RDM3|RDM5a|RDM5b|RDM6a|RDM6b|DPA2a|DPA2b" - } - ] - } -} diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_IST.json b/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_IST.json deleted file mode 100644 index 8ebbf6c..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_IST.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "cloud-region" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - }, - "complex" : { - "filtered-node-type": "complex", - "filters": [] - }, - "availability-zone" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - }, - "pserver" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - }, - "zone" : { - "filtered-node-type": "zone", - "filters": [] - }, - "tenant" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "dyh1b|DHY1A|mtn23a|mtn23b|mdt25b|mtn6|au7tx" - } - ] - } -} diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_PROD.json b/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_PROD.json deleted file mode 100644 index 24ee80d..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_PROD.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "cloud-region" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "RDM3|RDM5a|RDM5b|RDM6a|RDM6b|DPA2a|DPA2b" - } - ] - }, - "complex" : { - "filtered-node-type": "complex", - "filters": [] - }, - "availability-zone" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "RDM3|RDM5a|RDM5b|RDM6a|RDM6b|DPA2a|DPA2b" - } - ] - }, - "pserver" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "RDM3|RDM5a|RDM5b|RDM6a|RDM6b|DPA2a|DPA2b" - } - ] - }, - "zone" : { - "filtered-node-type": "zone", - "filters": [] - }, - "tenant" : { - "filtered-node-type": "cloud-region", - "filters": [ - { - "property": "cloud-owner", - "regex": "att-aic" - }, - { - "property": "cloud-region-version", - "regex": "3.0|aic3.0|3.6" - }, - { - "property": "cloud-region-id", - "regex": "RDM3|RDM5a|RDM5b|RDM6a|RDM6b|DPA2a|DPA2b" - } - ] - } -} diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/nodes.json b/src/main/resources/etc/scriptdata/tenant_isolation/nodes.json deleted file mode 100644 index 1bfc62b..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/nodes.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "cloud-region": { - "cousins" : ["complex","zone"], - "parents" : [] - }, - "availability-zone": { - "cousins" : ["complex"], - "parents":["cloud-region"] - }, - "pserver" : { - "cousins" : ["zone", "complex", "availability-zone","cloud-region"], - "parents":[] - }, - "complex" : { - "cousins":[], - "parents":[] - }, - "tenant" : { - "cousins":[], - "parents":["cloud-region"] - }, - "zone" : { - "cousins":["complex"], - "parents":[] - } -} diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/nodesAZCloud.json b/src/main/resources/etc/scriptdata/tenant_isolation/nodesAZCloud.json deleted file mode 100644 index b955757..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/nodesAZCloud.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "cloud-region": { - "cousins" : [], - "parents":[] - }, - "availability-zone": { - "cousins" : [], - "parents":["cloud-region"] - }, - "pserver" : { - "cousins" : ["zone", "complex", "availability-zone"], - "parents":[] - }, - "complex" : { - "cousins":[], - "parents":[] - }, - "zone" : { - "cousins":["complex"], - "parents":[] - } -} diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/nodesIncremental.json b/src/main/resources/etc/scriptdata/tenant_isolation/nodesIncremental.json deleted file mode 100644 index 0816bc4..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/nodesIncremental.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "pserver" : { - "cousins" : ["zone", "complex", "availability-zone","cloud-region"], - "parents":[] - }, - "tenant" : { - "cousins":[], - "parents":["cloud-region"] - } -} diff --git a/src/main/resources/etc/scriptdata/tenant_isolation/nodesNoAZ.json b/src/main/resources/etc/scriptdata/tenant_isolation/nodesNoAZ.json deleted file mode 100644 index a0dfae5..0000000 --- a/src/main/resources/etc/scriptdata/tenant_isolation/nodesNoAZ.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pserver" : { - "cousins" : ["zone", "complex"], - "parents":[] - }, - "complex" : { - "cousins":[], - "parents":[] - }, - "zone" : { - "cousins":["complex"], - "parents":[] - } -} |