[AAI-244] grep scan

Issue-ID:AAI-244
Change-Id: Ibc51a8c72c411cff9ffc5b58bd40439ff3d703be
Signed-off-by: arul.nambi <arul.nambi@amdocs.com>

5 files changed, 20 insertions, 20 deletions

diff --git a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java b/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java
index 24cb405..483c792 100644
--- a/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java
+++ b/src/test/java/org/openecomp/sparky/dal/aai/config/ActiveInventoryConfigTest.java
@@ -51,7 +51,7 @@ public class ActiveInventoryConfigTest {
     props.put("aai.rest.cache.storageFolderOverride","");
     props.put("aai.rest.cache.maxTimeToLiveInMs","-1");
     
-    props.put("aai.rest.shallowEntities","cloud-region,complex,vnf-image,att-aic,image");
+    props.put("aai.rest.shallowEntities","cloud-region,complex,vnf-image,image");
     
     props.put("aai.ssl.truststore.filename","synchronizer.jks");
     props.put("aai.ssl.truststore.type","jks");
diff --git a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java b/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
index fa3d463..e665bc2 100644
--- a/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
+++ b/src/test/java/org/openecomp/sparky/dal/sas/entity/SearchAbstractionEntityBuilder.java
@@ -42,7 +42,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "example-vnf-id-val-4394");
     doc.addContent("entityType",            "vpe");
     doc.addContent("searchTags",            "example-vnf-id-val-4394;example-vnf-name-val-4394;example-vnf-name2-val-4394");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/vpes/vpe/example-vnf-id-val-4394");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/vpes/vpe/example-vnf-id-val-4394");
     doc.addContent("searchTagIDs",          "0;1;2");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:20:48.072-0400");
 
@@ -65,7 +65,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "vpe-vnf-id-team4-11");
     doc.addContent("entityType",            "vpe");
     doc.addContent("searchTags",            "vpe-vnf-id-team4-11;example-vnf-name-val-9512;example-vnf-name2-val-9512");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/vpes/vpe/vpe-vnf-id-team4-11");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/vpes/vpe/vpe-vnf-id-team4-11");
     doc.addContent("searchTagIDs",          "0;1;2");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:20:48.175-0400");
 
@@ -88,7 +88,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "example-vnf-id-val-6176");
     doc.addContent("entityType",            "generic-vnf");
     doc.addContent("searchTags",            "example-vnf-id-val-6176;example-vnf-name-val-6176;example-vnf-name2-val-6176");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/generic-vnfs/generic-vnf/example-vnf-id-val-6176");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/generic-vnfs/generic-vnf/example-vnf-id-val-6176");
     doc.addContent("searchTagIDs",          "0;1;2");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:29:39.889-0400");
 
@@ -111,7 +111,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "vnf-id-team4-11");
     doc.addContent("entityType",            "newvce");
     doc.addContent("searchTags",            "vnf-id-team4-11;example-vnf-name-val-5313;example-vnf-name2-val-5313");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/newvces/newvce/vnf-id-team4-11");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/newvces/newvce/vnf-id-team4-11");
     doc.addContent("searchTagIDs",          "0;1;2");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:21:08.142-0400");
 
@@ -134,7 +134,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "example-vnf-id2-val-9501");
     doc.addContent("entityType",            "newvce");
     doc.addContent("searchTags",            "example-vnf-id2-val-9501;example-vnf-name-val-9501;example-vnf-name2-val-9501");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/newvces/newvce/example-vnf-id2-val-9501");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/newvces/newvce/example-vnf-id2-val-9501");
     doc.addContent("searchTagIDs",          "0;1;2");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:21:23.323-0400");
 
@@ -157,7 +157,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "vnf-id-dm-auto-10");
     doc.addContent("entityType",            "vce");
     doc.addContent("searchTags",            "vpe-id-dm-auto-10;vnf-id-dm-auto-10;vnf-name-dm-auto-10;vnf-name2-dm-auto-10");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/vces/vce/vnf-id-dm-auto-10");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/vces/vce/vnf-id-dm-auto-10");
     doc.addContent("searchTagIDs",          "0;1;2;3");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:24:57.209-0400");
 
@@ -180,7 +180,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "e3e59c5b-ad48-44d0-b3e4-80eacdcee4c7");
     doc.addContent("entityType",            "generic-vnf");
     doc.addContent("searchTags",            "e3e59c5b-ad48-44d0-b3e4-80eacdcee4c7;VNF_Test_vNF_modules_01");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/generic-vnfs/generic-vnf/e3e59c5b-ad48-44d0-b3e4-80eacdcee4c7");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/generic-vnfs/generic-vnf/e3e59c5b-ad48-44d0-b3e4-80eacdcee4c7");
     doc.addContent("searchTagIDs",          "0;1");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:26:34.603-0400");
 
@@ -203,7 +203,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "fusion-jitsi-vnf-001");
     doc.addContent("entityType",            "generic-vnf");
     doc.addContent("searchTags",            "fusion-jitsi-vnf-001;fusion-jitsi-vnf");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/generic-vnfs/generic-vnf/fusion-jitsi-vnf-001");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/generic-vnfs/generic-vnf/fusion-jitsi-vnf-001");
     doc.addContent("searchTagIDs",          "0;1");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:28:14.293-0400");
 
@@ -226,7 +226,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "vnfm0003v");
     doc.addContent("entityType",            "generic-vnf");
     doc.addContent("searchTags",            "vnfm0003v;vnfm0003v");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/generic-vnfs/generic-vnf/vnfm0003v");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/generic-vnfs/generic-vnf/vnfm0003v");
     doc.addContent("searchTagIDs",          "0;1");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:29:39.594-0400");
 
@@ -249,7 +249,7 @@ public class SearchAbstractionEntityBuilder {
     doc.addContent("entityPrimaryKeyValue", "amist456vnf");
     doc.addContent("entityType",            "generic-vnf");
     doc.addContent("searchTags",            "amist456vnf;amist456vnf");
-    doc.addContent("link",                  "https://aai-ext1.test.att.com:8443/aai/v9/network/generic-vnfs/generic-vnf/amist456vnf");
+    doc.addContent("link",                  "https://aai-hostname:8443/aai/v9/network/generic-vnfs/generic-vnf/amist456vnf");
     doc.addContent("searchTagIDs",          "0;1");
     doc.addContent("lastmodTimestamp",      "2017-04-18T17:28:28.163-0400");
 
diff --git a/src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java b/src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java
index 45c272b..e09e08a 100644
--- a/src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java
+++ b/src/test/java/org/openecomp/sparky/synchronizer/SyncControllerBuilder.java
@@ -69,7 +69,7 @@ public class SyncControllerBuilder {
           new ElasticSearchAdapter(nonCachingRestProvider, esConfig);
 
       String payload =
-          "{ \"entityType\": \"complex\", \"pkey\": \"MORRISTOWN0075\", \"location\": { \"lat\": \"40.793414\", \"lon\": \"-74.480432\" }, \"selfLink\": \"https://aai-int1.test.att.com:8443/aai/v8/cloud-infrastructure/complexes/complex/MORRISTOWN0075?nodes-only\" }\n";
+          "{ \"entityType\": \"complex\", \"pkey\": \"MORRISTOWN0075\", \"location\": { \"lat\": \"40.793414\", \"lon\": \"-74.480432\" }, \"selfLink\": \"https://aai-hostname:8443/aai/v8/cloud-infrastructure/complexes/complex/MORRISTOWN0075?nodes-only\" }\n";
 
       String updateRequest = elasticSearchDataProvider.buildBulkImportOperationRequest(
           "topographysearchindex-localhost", "default",
diff --git a/src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java b/src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java
index 23d9df3..c3c7f7f 100644
--- a/src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java
+++ b/src/test/java/org/openecomp/sparky/util/NodeUtilsTest.java
@@ -51,15 +51,15 @@ public class NodeUtilsTest {
 
 
   private static final String TEST_LINK1 =
-      "https://aai-ext1.test.att.com:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list/155.196.36.1/";
+      "https://aai-hostname:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list/155.196.36.1/";
   private static final String TEST_LINK2 =
-      "https://aai-ext1.test.att.com:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list/155.196.36.1";
+      "https://aai-hostname:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list/155.196.36.1";
   private static final String TEST_LINK3 =
-      "https://aai-ext1.test.att.com:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list/ge-0%2f1%2f0";
+      "https://aai-hostname:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list/ge-0%2f1%2f0";
   private static final String TEST_LINK4 =
-      "https://aai-ext1.test.att.com:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list/ge-%bad%wolf%timelord";
+      "https://aai-hostname:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list/ge-%bad%wolf%timelord";
   private static final String TEST_LINK5_NO_RESOURCE_ID =
-      "https://aai-ext1.test.att.com:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list//";
+      "https://aai-hostname:9292/aai/v7/network/generic-vnfs/generic-vnf/cafaeb02-b54d-4918-bd06-85406dad19e7/l-interfaces/l-interface/WAN1_1123_GAMMA2016.04_PWT/l3-interface-ipv4-address-list//";
   private static final int NODE_UTILS_TAB_WIDTH = 3;
 
   /**
diff --git a/src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java b/src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java
index bdacfe9..d976dee 100644
--- a/src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java
+++ b/src/test/java/org/openecomp/sparky/viewandinspect/ActiveInventoryNodeTester.java
@@ -88,7 +88,7 @@ public class ActiveInventoryNodeTester {
   }
 
   private String selfLinkFormat =
-      "https://aai-ext1.test.att.com:9292/aai/v7/network/generic-vnfs/%s/%s";
+      "https://aai-hostname:9292/aai/v7/network/generic-vnfs/%s/%s";
 
 
   /**
@@ -197,9 +197,9 @@ public class ActiveInventoryNodeTester {
   }
 
   public static String DIRECT_COMPLEX_SELF_LINK_JSON_RESPONSE =
-      "{\"complex\":{\"physical-location-id\":\"MJ-1604-COMPLEX\",\"data-center-code\":\"DAYTONNJ\",\"complex-name\":\"complex-name-MDTWNJ23A4\",\"resource-version\":\"1470195143\",\"physical-location-type\":\"SBC/VHO and Mega Pop\",\"street1\":\"451 Western Ave\",\"street2\":\"CU-212\",\"city\":\"dayton\",\"state\":\"NJ\",\"postal-code\":\"08852\",\"country\":\"USA\",\"region\":\"Northeast\",\"latitude\":\"40.3896\",\"longitude\":\"-74.5463\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"pserver\",\"related-link\":\"https://aai-int1.test.att.com:8443/aai/v8/cloud-infrastructure/pservers/pserver/MJ-1604-PSERVER/\",\"relationship-data\":[{\"relationship-key\":\"pserver.hostname\",\"relationship-value\":\"MJ-1604-PSERVER\"}],\"related-to-property\":[{\"property-key\":\"pserver.pserver-name2\",\"property-value\":\"MJ-1604-PSERVER\"}]}]}}}";
+      "{\"complex\":{\"physical-location-id\":\"MJ-1604-COMPLEX\",\"data-center-code\":\"DAYTONNJ\",\"complex-name\":\"complex-name-MDTWNJ23A4\",\"resource-version\":\"1470195143\",\"physical-location-type\":\"SBC/VHO and Mega Pop\",\"street1\":\"451 Western Ave\",\"street2\":\"CU-212\",\"city\":\"dayton\",\"state\":\"NJ\",\"postal-code\":\"08852\",\"country\":\"USA\",\"region\":\"Northeast\",\"latitude\":\"40.3896\",\"longitude\":\"-74.5463\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"pserver\",\"related-link\":\"https://aai-hostname:8443/aai/v8/cloud-infrastructure/pservers/pserver/MJ-1604-PSERVER/\",\"relationship-data\":[{\"relationship-key\":\"pserver.hostname\",\"relationship-value\":\"MJ-1604-PSERVER\"}],\"related-to-property\":[{\"property-key\":\"pserver.pserver-name2\",\"property-value\":\"MJ-1604-PSERVER\"}]}]}}}";
   public static String DIRECT_PSERVER_SELF_LINK_JSON_RESPONSE =
-      "{\"pserver\":{\"hostname\":\"MJ-1604-PSERVER\",\"equip-type\":\"JUNIPER UCPE\",\"equip-vendor\":\"JUNIPER\",\"equip-model\":\"QFX5100-24P-AA\",\"ipv4-oam-address\":\"10.402.143.1\",\"serial-number\":\"VX371521MAHI\",\"pserver-id\":\"1C2B8D47-AVAE-4721-0110-E2C41A07MAHI\",\"in-maint\":false,\"resource-version\":\"1456765026\",\"pserver-name2\":\"MJ-1604-PSERVER\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"complex\",\"related-link\":\"https://aai-int1.test.att.com:8443/aai/v8/cloud-infrastructure/complexes/complex/MJ-1604-COMPLEX/\",\"relationship-data\":[{\"relationship-key\":\"complex.physical-location-id\",\"relationship-value\":\"MJ-1604-COMPLEX\"}]}]},\"p-interfaces\":{\"p-interface\":[{\"interface-name\":\"ge-0/2/0\",\"speed-value\":\"1\",\"speed-units\":\"GBPS\",\"resource-version\":\"1456723241\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"physical-link\",\"related-link\":\"https://aai-int1.test.att.com:8443/aai/v8/network/physical-links/physical-link/BBEC.112430..ATI/\",\"relationship-data\":[{\"relationship-key\":\"physical-link.link-name\",\"relationship-value\":\"BBEC.112430..ATI\"}]}]}},{\"interface-name\":\"ge-0/2/1\",\"speed-value\":\"1\",\"speed-units\":\"GBPS\",\"resource-version\":\"1456723241\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"physical-link\",\"related-link\":\"https://aai-int1.test.att.com:8443/aai/v8/network/physical-links/physical-link/BBEC.112431..ATI/\",\"relationship-data\":[{\"relationship-key\":\"physical-link.link-name\",\"relationship-value\":\"BBEC.112431..ATI\"}]}]}}]}}}";
+      "{\"pserver\":{\"hostname\":\"MJ-1604-PSERVER\",\"equip-type\":\"JUNIPER UCPE\",\"equip-vendor\":\"JUNIPER\",\"equip-model\":\"QFX5100-24P-AA\",\"ipv4-oam-address\":\"10.402.143.1\",\"serial-number\":\"VX371521MAHI\",\"pserver-id\":\"1C2B8D47-AVAE-4721-0110-E2C41A07MAHI\",\"in-maint\":false,\"resource-version\":\"1456765026\",\"pserver-name2\":\"MJ-1604-PSERVER\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"complex\",\"related-link\":\"https://aai-hostname:8443/aai/v8/cloud-infrastructure/complexes/complex/MJ-1604-COMPLEX/\",\"relationship-data\":[{\"relationship-key\":\"complex.physical-location-id\",\"relationship-value\":\"MJ-1604-COMPLEX\"}]}]},\"p-interfaces\":{\"p-interface\":[{\"interface-name\":\"ge-0/2/0\",\"speed-value\":\"1\",\"speed-units\":\"GBPS\",\"resource-version\":\"1456723241\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"physical-link\",\"related-link\":\"https://aai-hostname:8443/aai/v8/network/physical-links/physical-link/BBEC.112430..ATI/\",\"relationship-data\":[{\"relationship-key\":\"physical-link.link-name\",\"relationship-value\":\"BBEC.112430..ATI\"}]}]}},{\"interface-name\":\"ge-0/2/1\",\"speed-value\":\"1\",\"speed-units\":\"GBPS\",\"resource-version\":\"1456723241\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"physical-link\",\"related-link\":\"https://aai-hostname:8443/aai/v8/network/physical-links/physical-link/BBEC.112431..ATI/\",\"relationship-data\":[{\"relationship-key\":\"physical-link.link-name\",\"relationship-value\":\"BBEC.112431..ATI\"}]}]}}]}}}";
 
   /**
    * Parses the direct self link json response.