Update the graphadmin to remove ti

Issue-ID: AAI-1469
Change-Id: Id4ff4ee813e7b2c749538bf34290111003cc5df0
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

diff --git a/pom.xml b/pom.xml
index 46d6d0b..2f5d69f 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,8 @@
         <gremlin.version>3.2.2</gremlin.version>
         <!-- End of Database Related Properties -->
 
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+
         <activemq.version>5.14.3</activemq.version>
         <logback.version>1.2.3</logback.version>
         <mockito.version>1.10.19</mockito.version>

diff --git a/src/main/resources/etc/appprops/aaiconfig.properties b/src/main/resources/etc/appprops/aaiconfig.properties
index 8613d93..d2cf54b 100644 (file)
--- 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\r
 \r
 #timeout app specific -1 to bypass for that app id, a whole number to override the timeout with that value (in ms)\r
-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\r
+aai.graphadmin.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1\r
 \r
 #default timeout limit added for graphadmin if not overridden (in ms)\r
 aai.graphadmin.timeoutlimit=180000\r

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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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":[]
-  }
-}