Gizmo to use the new edge rule label format

Some unit tests still used the old style label and they needed to be
fixed.

IssueID: AAI-465
Change-Id: I6d669c93d00c32dacf3ed923c28a110fd6f4630d
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>

diff --git a/src/main/java/org/openecomp/crud/service/AaiResourceService.java b/src/main/java/org/openecomp/crud/service/AaiResourceService.java
index b8ac158..9c6565a 100644 (file)
--- a/src/main/java/org/openecomp/crud/service/AaiResourceService.java
+++ b/src/main/java/org/openecomp/crud/service/AaiResourceService.java
@@ -46,11 +46,11 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;\r
 import javax.ws.rs.core.Response.Status;\r
 \r
-import org.openecomp.aai.exceptions.AAIException;\r
-import org.openecomp.aai.serialization.db.EdgeProperty;\r
-import org.openecomp.aai.serialization.db.EdgeRule;\r
-import org.openecomp.aai.serialization.db.EdgeRules;\r
-import org.openecomp.aai.serialization.db.EdgeType;\r
+import org.onap.aai.exceptions.AAIException;\r
+import org.onap.aai.serialization.db.EdgeProperty;\r
+import org.onap.aai.serialization.db.EdgeRule;\r
+import org.onap.aai.serialization.db.EdgeRules;\r
+import org.onap.aai.serialization.db.EdgeType;\r
 import org.openecomp.auth.Auth;\r
 import org.openecomp.cl.api.Logger;\r
 import org.openecomp.cl.eelf.LoggerFactory;\r

diff --git a/src/test/java/org/openecomp/schema/AaiResourceServiceTest.java b/src/test/java/org/openecomp/schema/AaiResourceServiceTest.java
index 5aafb7c..16db6d2 100644 (file)
--- a/src/test/java/org/openecomp/schema/AaiResourceServiceTest.java
+++ b/src/test/java/org/openecomp/schema/AaiResourceServiceTest.java
@@ -7,11 +7,11 @@ import java.util.Map;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.openecomp.aai.exceptions.AAIException;\r
-import org.openecomp.aai.serialization.db.EdgeProperty;\r
-import org.openecomp.aai.serialization.db.EdgeRule;\r
-import org.openecomp.aai.serialization.db.EdgeRules;\r
-import org.openecomp.aai.serialization.db.EdgeType;\r
+import org.onap.aai.exceptions.AAIException;\r
+import org.onap.aai.serialization.db.EdgeProperty;\r
+import org.onap.aai.serialization.db.EdgeRule;\r
+import org.onap.aai.serialization.db.EdgeRules;\r
+import org.onap.aai.serialization.db.EdgeType;\r
 import org.openecomp.crud.exception.CrudException;\r
 import org.openecomp.crud.service.AaiResourceService;\r
 import org.openecomp.crud.service.EdgePayload;\r

diff --git a/src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java b/src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java
index 85ef2fe..ccd3c72 100644 (file)
--- a/src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java
+++ b/src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java
@@ -41,7 +41,7 @@ public class RelationshipSchemaLoaderTest {
         RelationshipSchemaLoader.loadModels("v11");
         String version = RelationshipSchemaLoader.getLatestSchemaVersion();
         RelationshipSchema g = RelationshipSchemaLoader.getSchemaForVersion(version);
-        assertNotNull(g.lookupRelationType("has"));
+        assertNotNull(g.lookupRelationType("org.onap.relationships.inventory.BelongsTo"));
     }
 
     @Test