From 84dfa0fcb6f12e1d2eac68bc519d9c563a1c7208 Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Mon, 13 Aug 2018 14:38:47 -0400 Subject: Update the graphadmin to remove ti Issue-ID: AAI-1469 Change-Id: Id4ff4ee813e7b2c749538bf34290111003cc5df0 Signed-off-by: Kajur, Harish (vk250x) --- .../scriptdata/tenant_isolation/inputFilters.json | 104 --------------------- .../tenant_isolation/inputFiltersAllzones.json | 78 ---------------- .../tenant_isolation/inputFilters_E2E.json | 78 ---------------- .../tenant_isolation/inputFilters_IST.json | 78 ---------------- .../tenant_isolation/inputFilters_PROD.json | 78 ---------------- .../etc/scriptdata/tenant_isolation/nodes.json | 26 ------ .../scriptdata/tenant_isolation/nodesAZCloud.json | 22 ----- .../tenant_isolation/nodesIncremental.json | 10 -- .../etc/scriptdata/tenant_isolation/nodesNoAZ.json | 14 --- 9 files changed, 488 deletions(-) delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/inputFilters.json delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/inputFiltersAllzones.json delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_E2E.json delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_IST.json delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/inputFilters_PROD.json delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/nodes.json delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/nodesAZCloud.json delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/nodesIncremental.json delete mode 100644 src/main/resources/etc/scriptdata/tenant_isolation/nodesNoAZ.json (limited to 'src/main/resources/etc/scriptdata/tenant_isolation') 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":[] - } -} -- cgit 1.2.3-korg