From 8dd94f5ef470840a9f58db22c38349914ff27d5f Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Mon, 28 Aug 2017 14:08:13 -0400 Subject: [AAI-217 Amsterdam] Remove the att references in the schema and core files Change-Id: Id1b3469ba298b2137665e8ad16b4d74121d434a2 Signed-off-by: Venkata Harish K Kajur --- .../org/openecomp/aai/dbgen/SchemaGenerator.java | 22 ---------------------- .../openecomp/aai/util/StoreNotificationEvent.java | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) (limited to 'aai-core/src/main') diff --git a/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java b/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java index c3f55cdd..9f85d029 100644 --- a/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java +++ b/aai-core/src/main/java/org/openecomp/aai/dbgen/SchemaGenerator.java @@ -186,28 +186,6 @@ public class SchemaGenerator{ LOGGER.info(imsg); graphMgmt.commit(); - if (addDefaultCR) { - if (!graph.traversal().V().has("cloud-owner", "att-aic").has("cloud-region-id", "AAIAIC25").hasNext()) { - imsg = "Adding default cloud region to graph..."; - System.out.println(imsg); - LOGGER.info(imsg); - final Vertex cloudRegion = graph.addVertex(); - - final String ts = String.valueOf(System.currentTimeMillis() / 1000L); - - cloudRegion.property("aai-node-type", "cloud-region"); - cloudRegion.property("cloud-owner", "att-aic"); - cloudRegion.property("cloud-region-id", "AAIAIC25"); - cloudRegion.property("cloud-region-version", "2.5"); - cloudRegion.property("complex-name", "AAIAIC25"); - cloudRegion.property("aai-created-ts", ts); - cloudRegion.property("resource-version", ts); - cloudRegion.property("source-of-truth", "aai-schema-loader"); - cloudRegion.property("last-mod-source-of-truth", "aai-schema-loader"); - cloudRegion.property(AAIProperties.AAI_URI, "/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25"); - graph.tx().commit(); - } - } }// End of loadSchemaIntoTitan() } diff --git a/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java b/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java index 2d47d38a..29fa69dc 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java +++ b/aai-core/src/main/java/org/openecomp/aai/util/StoreNotificationEvent.java @@ -147,7 +147,7 @@ public class StoreNotificationEvent { throw new AAIException("AAI_7350"); } - DynamicEntity notificationEvent = notificationJaxbContext.getDynamicType("inventory.aai.att.com." + notificationVersion + ".NotificationEvent").newDynamicEntity(); + DynamicEntity notificationEvent = notificationJaxbContext.getDynamicType("inventory.aai.onap.org." + notificationVersion + ".NotificationEvent").newDynamicEntity(); if (eventHeader.get("id") == null) { eventHeader.set("id", genDate2() + "-" + UUID.randomUUID().toString()); -- cgit 1.2.3-korg