summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsblimkie <steven.blimkie@amdocs.com>2017-11-15 21:48:20 +0200
committersblimkie <steven.blimkie@amdocs.com>2017-11-15 21:49:59 +0200
commiteff2052b4a77690b4e2e67c8a5b438457657c99f (patch)
tree7ea3d56bb0c7ad3b6855abdb380fb20ca9d54469
parenteec8ab503c1b61ad51676ac037a5d612cd146d0e (diff)
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>
-rw-r--r--src/main/java/org/openecomp/crud/service/AaiResourceService.java10
-rw-r--r--src/test/java/org/openecomp/schema/AaiResourceServiceTest.java10
-rw-r--r--src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java2
3 files changed, 11 insertions, 11 deletions
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
--- 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;
import javax.ws.rs.core.Response.Status;
-import org.openecomp.aai.exceptions.AAIException;
-import org.openecomp.aai.serialization.db.EdgeProperty;
-import org.openecomp.aai.serialization.db.EdgeRule;
-import org.openecomp.aai.serialization.db.EdgeRules;
-import org.openecomp.aai.serialization.db.EdgeType;
+import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.serialization.db.EdgeProperty;
+import org.onap.aai.serialization.db.EdgeRule;
+import org.onap.aai.serialization.db.EdgeRules;
+import org.onap.aai.serialization.db.EdgeType;
import org.openecomp.auth.Auth;
import org.openecomp.cl.api.Logger;
import org.openecomp.cl.eelf.LoggerFactory;
diff --git a/src/test/java/org/openecomp/schema/AaiResourceServiceTest.java b/src/test/java/org/openecomp/schema/AaiResourceServiceTest.java
index 5aafb7c..16db6d2 100644
--- 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;
import org.junit.Before;
import org.junit.Test;
-import org.openecomp.aai.exceptions.AAIException;
-import org.openecomp.aai.serialization.db.EdgeProperty;
-import org.openecomp.aai.serialization.db.EdgeRule;
-import org.openecomp.aai.serialization.db.EdgeRules;
-import org.openecomp.aai.serialization.db.EdgeType;
+import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.serialization.db.EdgeProperty;
+import org.onap.aai.serialization.db.EdgeRule;
+import org.onap.aai.serialization.db.EdgeRules;
+import org.onap.aai.serialization.db.EdgeType;
import org.openecomp.crud.exception.CrudException;
import org.openecomp.crud.service.AaiResourceService;
import org.openecomp.crud.service.EdgePayload;
diff --git a/src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java b/src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java
index 85ef2fe..ccd3c72 100644
--- 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