aai-common support for v20

Issue-ID: AAI-2904
Change-Id: I6dca2f785882b38ca2b2474a11affaa0328c003a
Signed-off-by: LaMont, William(wl2432) <wl2432@att.com>

7 files changed, 199 insertions, 63 deletions

diff --git a/aai-core/src/test/java/org/onap/aai/logging/CustomLogPatternLayoutTest.java b/aai-core/src/test/java/org/onap/aai/logging/CustomLogPatternLayoutTest.java
deleted file mode 100644
index 250cdda8..00000000
--- a/aai-core/src/test/java/org/onap/aai/logging/CustomLogPatternLayoutTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.aai.logging;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class CustomLogPatternLayoutTest {
-
-    /**
-     * Test null when defaultConverterMap doesn't have corresponding entry.
-     */
-    @Test
-    public void testNull() {
-        String s = CustomLogPatternLayout.defaultConverterMap.get("z");
-        assertFalse("Entry not found for key 'z'", CNName.class.getName().equals(s));
-    }
-
-    /**
-     * Test defaultConverterMap when valid entry exists.
-     */
-    @Test
-    public void testEntryFor_Z() {
-        CustomLogPatternLayout layout = new CustomLogPatternLayout();
-        String s = CustomLogPatternLayout.defaultConverterMap.get("z");
-        assertTrue("Entry not found for key 'z'", CNName.class.getName().equals(s));
-    }
-
-}
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java
index dd4454d5..511b2118 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java
@@ -616,13 +616,30 @@ public class DbSerializerTest extends AAISetup {
     public void getVertexPropertiesTest() throws AAIException, UnsupportedEncodingException {
         engine.startTransaction();
 
-        Vertex cr =
-                engine.tx().addVertex("aai-node-type", "cloud-region", "cloud-owner", "me", "cloud-region-id", "123");
+        Vertex gvnf = engine.tx().addVertex("aai-node-type", "generic-vnf", "vnf-id", "myvnf", "aai-uri",
+            "/network/generic-vnfs/generic-vnf/myvnf",
+            AAIProperties.AAI_UUID, UUID.randomUUID().toString(),
+            AAIProperties.CREATED_TS, 123L,
+            AAIProperties.SOURCE_OF_TRUTH, "sot",
+            AAIProperties.RESOURCE_VERSION, "123",
+            AAIProperties.LAST_MOD_SOURCE_OF_TRUTH, "lmsot",
+            AAIProperties.LAST_MOD_TS, 333L);
+        Vertex vnfc = engine.tx().addVertex("aai-node-type", "vnfc", "vnfc-name", "a-name", "aai-uri",
+            "/network/vnfcs/vnfc/a-name",
+            AAIProperties.AAI_UUID, UUID.randomUUID().toString(),
+            AAIProperties.CREATED_TS, 123L,
+            AAIProperties.SOURCE_OF_TRUTH, "sot",
+            AAIProperties.RESOURCE_VERSION, "123",
+            AAIProperties.LAST_MOD_SOURCE_OF_TRUTH, "lmsot",
+            AAIProperties.LAST_MOD_TS, 333L);
+
+        edgeSer.addEdge(engine.tx().traversal(), gvnf, vnfc);
+
+        Introspector vnf = dbser.getVertexProperties(gvnf);
+        assertEquals("generic-vnf", vnf.getDbName());
+        assertEquals("myvnf", vnf.getValue("vnf-id"));
 
-        Introspector crIntro = dbser.getVertexProperties(cr);
-        assertEquals("cloud-region", crIntro.getDbName());
-        assertEquals("me", crIntro.getValue("cloud-owner"));
-        assertEquals("123", crIntro.getValue("cloud-region-id"));
+        assertFalse(vnf.marshal(false).contains("relationship-list"));
 
     }
 
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java
index a59b1147..0904ceb3 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/MultiFormatTest.java
@@ -80,8 +80,8 @@ public class MultiFormatTest extends AAISetup {
             "{\"path\":[{\"resource-type\":\"generic-vnf\"},{\"resource-type\":\"vserver\"},{\"resource-type\":\"pserver\"},{\"resource-type\":\"complex\"}]}")
             .getAsJsonObject();
     private JsonObject expectedAsTreeWithResourceFormat = new JsonParser().parse(
-        "{\"results\":[{\"generic-vnf\":{\"vnf-id\":\"vnf-id-1\",\"vnf-name\":\"vnf-name-1\",\"related-nodes\":[{\"vserver\":{\"vserver-id\":\"vserver-id-1\",\"vserver-name\":\"vserver-name-1\",\"related-nodes\":[{\"pserver\":{\"hostname\":\"hostname-1\"}}]}},{\"pserver\":{\"hostname\":\"hostname-2\",\"related-nodes\":[{\"complex\":{\"physical-location-id\":\"physical-location-id-2\",\"country\":\"US\"}}]}}]}}]}")
-        .getAsJsonObject();
+                "{\"results\":[{\"generic-vnf\":{\"vnf-id\":\"vnf-id-1\",\"vnf-name\":\"vnf-name-1\",\"related-nodes\":[{\"vserver\":{\"vserver-id\":\"vserver-id-1\",\"vserver-name\":\"vserver-name-1\",\"related-nodes\":[{\"pserver\":{\"hostname\":\"hostname-1\"}}]}},{\"pserver\":{\"hostname\":\"hostname-2\",\"related-nodes\":[{\"complex\":{\"physical-location-id\":\"physical-location-id-2\",\"country\":\"US\"}}]}}]}}]}")
+            .getAsJsonObject();
     private JsonObject expectedAsTreeWithSimpleFormat = new JsonParser().parse(
         "{\"results\":[{\"id\":\"0\",\"node-type\":\"generic-vnf\",\"url\":null,\"properties\":{\"vnf-id\":\"vnf-id-1\",\"vnf-name\":\"vnf-name-1\"},\"related-to\":[{\"id\":\"1\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"vserver\",\"url\":null},{\"id\":\"5\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"pserver\",\"url\":null}],\"related-nodes\":[{\"id\":\"1\",\"node-type\":\"vserver\",\"url\":null,\"properties\":{\"vserver-id\":\"vserver-id-1\",\"vserver-name\":\"vserver-name-1\"},\"related-to\":[{\"id\":\"0\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"generic-vnf\",\"url\":null},{\"id\":\"2\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"pserver\",\"url\":null}],\"related-nodes\":[{\"id\":\"2\",\"node-type\":\"pserver\",\"url\":null,\"properties\":{\"hostname\":\"hostname-1\"},\"related-to\":[{\"id\":\"1\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"vserver\",\"url\":null},{\"id\":\"3\",\"relationship-label\":\"org.onap.relationships.inventory.LocatedIn\",\"node-type\":\"complex\",\"url\":null}]}]},{\"id\":\"5\",\"node-type\":\"pserver\",\"url\":null,\"properties\":{\"hostname\":\"hostname-2\"},\"related-to\":[{\"id\":\"0\",\"relationship-label\":\"tosca.relationships.HostedOn\",\"node-type\":\"generic-vnf\",\"url\":null},{\"id\":\"6\",\"relationship-label\":\"org.onap.relationships.inventory.LocatedIn\",\"node-type\":\"complex\",\"url\":null}],\"related-nodes\":[{\"id\":\"6\",\"node-type\":\"complex\",\"url\":null,\"properties\":{\"physical-location-id\":\"physical-location-id-2\",\"country\":\"US\"},\"related-to\":[{\"id\":\"5\",\"relationship-label\":\"org.onap.relationships.inventory.LocatedIn\",\"node-type\":\"pserver\",\"url\":null}]}]}]}]}")
         .getAsJsonObject();
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java
new file mode 100644
index 00000000..199939ed
--- /dev/null
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/PathedURLTest.java
@@ -0,0 +1,167 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.aai.serialization.queryformats;
+
+import com.google.gson.JsonObject;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.onap.aai.AAISetup;
+import org.onap.aai.exceptions.AAIException;
+import org.onap.aai.introspection.Loader;
+import org.onap.aai.introspection.ModelType;
+import org.onap.aai.serialization.db.DBSerializer;
+import org.onap.aai.serialization.db.EdgeSerializer;
+import org.onap.aai.serialization.engines.JanusGraphDBEngine;
+import org.onap.aai.serialization.engines.QueryStyle;
+import org.onap.aai.serialization.engines.TransactionalGraphEngine;
+import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
+import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
+import org.onap.aai.setup.SchemaVersion;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.annotation.DirtiesContext;
+
+import java.util.Optional;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
+public class PathedURLTest extends AAISetup {
+
+    @Mock
+    private UrlBuilder urlBuilder;
+
+    private Graph graph;
+    private TransactionalGraphEngine dbEngine;
+    private Loader loader;
+    private PathedURL pathedURL;
+    private final ModelType factoryType = ModelType.MOXY;
+
+    @Autowired
+    private EdgeSerializer rules;
+
+    private SchemaVersion version;
+    private Vertex pserver;
+    private Vertex complex;
+    private DBSerializer serializer;
+
+    @Before
+    public void setUp() throws Exception {
+
+        version = schemaVersions.getDefaultVersion();
+
+        MockitoAnnotations.initMocks(this);
+
+        graph = TinkerGraph.open();
+
+        Vertex pserver1 =
+            graph.addVertex(
+                T.label, "pserver",
+                T.id, "2",
+                "aai-node-type", "pserver",
+                "hostname", "hostname-1",
+                "resource-version", System.currentTimeMillis()
+            );
+
+        Vertex complex1 = graph.addVertex(T.label, "complex", T.id, "3", "aai-node-type", "complex",
+            "physical-location-id", "physical-location-id-1", "country", "US");
+
+        GraphTraversalSource g = graph.traversal();
+        rules.addEdge(g, pserver1, complex1);
+
+        pserver = pserver1;
+        complex = complex1;
+
+        System.setProperty("AJSC_HOME", ".");
+        System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
+
+        createLoaderEngineSetup();
+    }
+
+    private void createLoaderEngineSetup() throws AAIException {
+
+        if (loader == null) {
+            loader = loaderFactory.createLoaderForVersion(factoryType, version);
+            dbEngine = spy(new JanusGraphDBEngine(QueryStyle.TRAVERSAL, loader));
+            serializer = new DBSerializer(version, dbEngine, factoryType, "Junit");
+
+            TransactionalGraphEngine.Admin spyAdmin = spy(dbEngine.asAdmin());
+
+            when(dbEngine.tx()).thenReturn(graph);
+            when(dbEngine.asAdmin()).thenReturn(spyAdmin);
+
+            when(spyAdmin.getReadOnlyTraversalSource())
+                .thenReturn(graph.traversal().withStrategies(ReadOnlyStrategy.instance()));
+            when(spyAdmin.getTraversalSource()).thenReturn(graph.traversal());
+        }
+    }
+
+    @Test
+    public void testPathedUrlReturnsResourceVersionWhenSet() throws AAIFormatVertexException, AAIException {
+
+        pathedURL = new PathedURL.Builder(loader, serializer, urlBuilder).includeUrl().build();
+        when(urlBuilder.pathed(pserver)).thenReturn("/aai/v14/cloud-infrastructure/pservers/pserver/hostname-1");
+        Optional<JsonObject> jsonObjectOptional = pathedURL.getJsonFromVertex(pserver);
+
+        if(!jsonObjectOptional.isPresent()){
+            fail("Expecting an json object returned from pathed url but returned none");
+        }
+
+        JsonObject pserverObject = jsonObjectOptional.get();
+
+        assertNotNull("Expecting the pserver object to contain resource type", pserverObject.get("resource-type"));
+        assertThat(pserverObject.get("resource-type").getAsString(), CoreMatchers.is("pserver"));
+        assertNotNull("Expecting the pserver object to contain resource link", pserverObject.get("resource-link"));
+        assertThat(pserverObject.get("resource-link").getAsString(), CoreMatchers.is("/aai/v14/cloud-infrastructure/pservers/pserver/hostname-1"));
+        assertNotNull("Expecting the pserver object to contain resource version", pserverObject.get("resource-version"));
+    }
+
+    @Test
+    public void testPathedUrlReturnsResourceVersionWhenIncludeUrlIsNotSet() throws AAIFormatVertexException, AAIException {
+
+        pathedURL = new PathedURL.Builder(loader, serializer, urlBuilder).build();
+        when(urlBuilder.pathed(pserver)).thenReturn("/aai/v14/cloud-infrastructure/pservers/pserver/hostname-1");
+        Optional<JsonObject> jsonObjectOptional = pathedURL.getJsonFromVertex(pserver);
+
+        if(!jsonObjectOptional.isPresent()){
+            fail("Expecting an json object returned from pathed url but returned none");
+        }
+
+        JsonObject pserverObject = jsonObjectOptional.get();
+
+        assertNotNull("Expecting the pserver object to contain resource type", pserverObject.get("resource-type"));
+        assertThat(pserverObject.get("resource-type").getAsString(), CoreMatchers.is("pserver"));
+        assertNotNull("Expecting the pserver object to contain resource link", pserverObject.get("resource-link"));
+        assertThat(pserverObject.get("resource-link").getAsString(), CoreMatchers.is("/aai/v14/cloud-infrastructure/pservers/pserver/hostname-1"));
+        assertNull("Expecting the pserver object to not contain resource version", pserverObject.get("resource-version"));
+    }
+}
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java
index a891230c..781656e1 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceFormatTest.java
@@ -126,7 +126,7 @@ public class ResourceFormatTest extends AAISetup {
         createLoaderEngineSetup();
         serializer = new DBSerializer(schemaVersions.getAppRootVersion(), dbEngine, factoryType, "Junit");
 
-        FormatFactory ff = new FormatFactory(loader, serializer, schemaVersions, basePath);
+        FormatFactory ff = new FormatFactory(loader, serializer, schemaVersions, basePath, "https://localhost:8447/aai/");
         MultivaluedMap mvm = new MultivaluedHashMap();
         mvm.add("depth", "0");
         Formatter formatter = ff.get(Format.resource, mvm);
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
index 886a660b..3b356178 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/SimpleFormatTest.java
@@ -131,7 +131,7 @@ public class SimpleFormatTest extends AAISetup {
         createLoaderEngineSetup();
         serializer = new DBSerializer(schemaVersions.getRelatedLinkVersion(), dbEngine, factoryType, "Junit");
 
-        FormatFactory ff = new FormatFactory(loader, serializer, schemaVersions, basePath);
+        FormatFactory ff = new FormatFactory(loader, serializer, schemaVersions, basePath, "https://localhost:8447/aai/");
         MultivaluedMap mvm = new MultivaluedHashMap();
         mvm.add("depth", "0");
         Formatter formatter = ff.get(Format.simple, mvm);
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java
index 08d29cd3..d19ed1a7 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java
@@ -34,6 +34,7 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.aai.AAISetup;
+import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.serialization.db.DBSerializer;
 import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
 import org.onap.aai.setup.SchemaVersion;
@@ -58,7 +59,7 @@ public class UrlBuilderTest extends AAISetup {
     }
 
     @Test
-    public void v11Pathed() throws AAIFormatVertexException {
+    public void v11Pathed() throws AAIFormatVertexException, AAIException {
         SchemaVersion version = new SchemaVersion("v11");
         UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost, schemaVersions, basePath);
         String result = builder.pathed(v);
@@ -68,7 +69,7 @@ public class UrlBuilderTest extends AAISetup {
     }
 
     @Test
-    public void v11Id() {
+    public void v11Id() throws AAIException {
         SchemaVersion version = new SchemaVersion("v11");
         UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost, schemaVersions, basePath);
         String result = builder.id(v);
@@ -78,7 +79,7 @@ public class UrlBuilderTest extends AAISetup {
     }
 
     @Test
-    public void beforeV11Pathed() throws AAIFormatVertexException {
+    public void beforeV11Pathed() throws AAIFormatVertexException, AAIException {
         SchemaVersion version = new SchemaVersion("v10");
         UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost, schemaVersions, basePath);
         String result = builder.pathed(v);
@@ -88,7 +89,7 @@ public class UrlBuilderTest extends AAISetup {
     }
 
     @Test
-    public void beforeV11Id() {
+    public void beforeV11Id() throws AAIException {
         SchemaVersion version = new SchemaVersion("v10");
         UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost, schemaVersions, basePath);
         String result = builder.id(v);