Upgrade SDC from Titan to Janus Graph

[sdc.git] / catalog-model / src / test / java / org / openecomp / sdc / be / model / jsonjanusgraph / operations / InterfaceOperationTest.java

diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/InterfaceOperationTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InterfaceOperationTest.java
similarity index 93%
rename from catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/InterfaceOperationTest.java
rename to catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InterfaceOperationTest.java
index fe2ea20..31d3f86 100644 (file)
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsontitan/operations/InterfaceOperationTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/jsonjanusgraph/operations/InterfaceOperationTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.be.model.jsontitan.operations;
+package org.openecomp.sdc.be.model.jsonjanusgraph.operations;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
@@ -17,11 +17,11 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;
 import org.openecomp.sdc.be.dao.jsongraph.GraphVertex;
-import org.openecomp.sdc.be.dao.jsongraph.TitanDao;
+import org.openecomp.sdc.be.dao.jsongraph.JanusGraphDao;
 import org.openecomp.sdc.be.dao.jsongraph.types.EdgeLabelEnum;
 import org.openecomp.sdc.be.dao.jsongraph.types.VertexTypeEnum;
-import org.openecomp.sdc.be.dao.titan.TitanOperationStatus;
 import org.openecomp.sdc.be.datatypes.elements.MapDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.MapPropertiesDataDefinition;
 import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
@@ -38,9 +38,9 @@ import org.openecomp.sdc.be.model.Operation;
 import org.openecomp.sdc.be.model.Service;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.NodeType;
-import org.openecomp.sdc.be.model.jsontitan.datamodel.TopologyTemplate;
-import org.openecomp.sdc.be.model.jsontitan.utils.GraphTestUtils;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.NodeType;
+import org.openecomp.sdc.be.model.jsonjanusgraph.datamodel.TopologyTemplate;
+import org.openecomp.sdc.be.model.jsonjanusgraph.utils.GraphTestUtils;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.UniqueIdBuilder;
 import org.openecomp.sdc.common.util.ValidationUtils;
@@ -60,7 +60,7 @@ public class InterfaceOperationTest extends ModelTestBase {
     private final Service service = createService();
     private final org.openecomp.sdc.be.model.Resource resource = createResource();
     @Resource
-    protected TitanDao titanDao;
+    protected JanusGraphDao janusGraphDao;
     @Resource
     protected NodeTypeOperation nodeTypeOperation;
     @Resource
@@ -78,11 +78,11 @@ public class InterfaceOperationTest extends ModelTestBase {
 
     @Before
     public void setupBefore() {
-        GraphTestUtils.clearGraph(titanDao);
+        GraphTestUtils.clearGraph(janusGraphDao);
         createUsers();
         createResourceCategory();
         createServiceCategory();
-        GraphTestUtils.createRootCatalogVertex(titanDao);
+        GraphTestUtils.createRootCatalogVertex(janusGraphDao);
         createRootNodeType();
         createNodeType("resource", RESOURCE_ID);
         createNodeType("service", SERVICE_ID);
@@ -100,7 +100,7 @@ public class InterfaceOperationTest extends ModelTestBase {
         ownerV.setMetadataProperties(metadataProperties);
         ownerV.updateMetadataJsonWithCurrentMetadataProperties();
         ownerV.setJson(new HashMap<>());
-        Either<GraphVertex, TitanOperationStatus> createUserRes = titanDao.createVertex(ownerV);
+        Either<GraphVertex, JanusGraphOperationStatus> createUserRes = janusGraphDao.createVertex(ownerV);
 
         ownerVertex = createUserRes.left().value();
 
@@ -114,7 +114,7 @@ public class InterfaceOperationTest extends ModelTestBase {
         modifierV.setMetadataProperties(metadataProperties);
         modifierV.updateMetadataJsonWithCurrentMetadataProperties();
         modifierV.setJson(new HashMap<>());
-        createUserRes = titanDao.createVertex(modifierV);
+        createUserRes = janusGraphDao.createVertex(modifierV);
         createUserRes.left().value();
 
         lifecycleOperation.findUser(ownerVertex.getUniqueId());
@@ -145,9 +145,9 @@ public class InterfaceOperationTest extends ModelTestBase {
         subCat.setMetadataProperties(metadataProperties);
         subCat.updateMetadataJsonWithCurrentMetadataProperties();
 
-        Either<GraphVertex, TitanOperationStatus> catRes = titanDao.createVertex(cat);
-        Either<GraphVertex, TitanOperationStatus> subCatRes = titanDao.createVertex(subCat);
-        titanDao.createEdge(catRes.left().value().getVertex(), subCatRes.left().value().getVertex(),
+        Either<GraphVertex, JanusGraphOperationStatus> catRes = janusGraphDao.createVertex(cat);
+        Either<GraphVertex, JanusGraphOperationStatus> subCatRes = janusGraphDao.createVertex(subCat);
+        janusGraphDao.createEdge(catRes.left().value().getVertex(), subCatRes.left().value().getVertex(),
                 EdgeLabelEnum.SUB_CATEGORY, new HashMap<>());
     }
 
@@ -163,7 +163,7 @@ public class InterfaceOperationTest extends ModelTestBase {
                 .put(GraphPropertyEnum.NORMALIZED_NAME, ValidationUtils.normalizeCategoryName4Uniqueness(categoryName));
         cat.setMetadataProperties(metadataProperties);
         cat.updateMetadataJsonWithCurrentMetadataProperties();
-        titanDao.createVertex(cat);
+        janusGraphDao.createVertex(cat);
     }
 
     private void createRootNodeType() {
@@ -215,8 +215,8 @@ public class InterfaceOperationTest extends ModelTestBase {
         vf.setComponentType(ComponentTypeEnum.RESOURCE);
         Either<NodeType, StorageOperationStatus> createVFRes = nodeTypeOperation.createNodeType(vf);
 
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes =
-                titanDao.getVertexById(createVFRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes =
+                janusGraphDao.getVertexById(createVFRes.left().value().getUniqueId());
         getNodeTyeRes.left().value();
     }
 
@@ -259,8 +259,8 @@ public class InterfaceOperationTest extends ModelTestBase {
         addProperties.add(prop22);
 
         Either<NodeType, StorageOperationStatus> createVFRes = nodeTypeOperation.createNodeType(vf);
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes =
-                titanDao.getVertexById(createVFRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes =
+                janusGraphDao.getVertexById(createVFRes.left().value().getUniqueId());
         GraphVertex vfVertex = getNodeTyeRes.left().value();
         StorageOperationStatus status = nodeTypeOperation.addToscaDataToToscaElement(vfVertex, EdgeLabelEnum.PROPERTIES,
                 VertexTypeEnum.PROPERTIES, addProperties, JsonPresentationFields.NAME);
@@ -322,15 +322,15 @@ public class InterfaceOperationTest extends ModelTestBase {
         service.setComponentType(ComponentTypeEnum.SERVICE);
         Either<TopologyTemplate, StorageOperationStatus> createRes =
                 topologyTemplateOperation.createTopologyTemplate(service);
-        Either<GraphVertex, TitanOperationStatus> getNodeTyeRes =
-                titanDao.getVertexById(createRes.left().value().getUniqueId());
+        Either<GraphVertex, JanusGraphOperationStatus> getNodeTyeRes =
+                janusGraphDao.getVertexById(createRes.left().value().getUniqueId());
 
         getNodeTyeRes.left().value();
     }
 
     @After
     public void cleanAfter() {
-        GraphTestUtils.clearGraph(titanDao);
+        GraphTestUtils.clearGraph(janusGraphDao);
     }
 
     @Test
@@ -491,7 +491,7 @@ public class InterfaceOperationTest extends ModelTestBase {
 
     @After
     public void teardown() {
-        GraphTestUtils.clearGraph(titanDao);
+        GraphTestUtils.clearGraph(janusGraphDao);
     }
 
 }