Process multi-OXM files

Gizmo service uses common OXM consumer to process multi-OXM files

Issue-ID: AAI-1196

Change-Id: If6dd50413a914984948272cd6bd98e2eeeaecedb
Signed-off-by: Sotiropoulos, Ioannis (is948x) <Ioannis.Sotiropoulos@amdocs.com>

2 files changed, 65 insertions, 5 deletions

diff --git a/src/test/java/org/onap/schema/OxmModelLoaderTest.java b/src/test/java/org/onap/schema/OxmModelLoaderTest.java
new file mode 100644
index 0000000..c4437fa
--- /dev/null
+++ b/src/test/java/org/onap/schema/OxmModelLoaderTest.java
@@ -0,0 +1,59 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * 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.schema;
+
+import org.eclipse.persistence.dynamic.DynamicType;
+import org.eclipse.persistence.internal.helper.DatabaseField;
+import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
+import org.eclipse.persistence.mappings.DatabaseMapping;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class OxmModelLoaderTest {
+
+    @Test
+    public void testLoadingMultipleOxmFiles() throws Exception {
+        OxmModelLoader.loadModels();
+
+        DynamicJAXBContext jaxbContext = OxmModelLoader.getContextForVersion(OxmModelLoader.getLatestVersion());
+
+        DynamicType pserver = jaxbContext.getDynamicType("Pserver");
+        DynamicType genericVnf = jaxbContext.getDynamicType("GenericVnf");
+
+        Assert.assertNotNull(pserver);
+        Assert.assertNotNull(genericVnf);
+
+        DatabaseMapping mapping = pserver.getDescriptor().getMappings().firstElement();
+        if (mapping.isAbstractDirectMapping()) {
+            DatabaseField f = mapping.getField();
+            String keyName = f.getName().substring(0, f.getName().indexOf("/"));
+            Assert.assertEquals(keyName, "hostname");
+        }
+
+        mapping = genericVnf.getDescriptor().getMappings().firstElement();
+        if (mapping.isAbstractDirectMapping()) {
+            DatabaseField f = mapping.getField();
+            String keyName = f.getName().substring(0, f.getName().indexOf("/"));
+            Assert.assertEquals(keyName, "vnf-id");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java b/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java
index 4e6590d..feeb1c4 100644
--- a/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java
+++ b/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java
@@ -23,7 +23,8 @@ package org.onap.schema;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -34,10 +35,10 @@ import org.onap.crud.exception.CrudException;
 public class RelationshipSchemaLoaderTest {
 
     @Before
-    public void init() {
-        ClassLoader classLoader = getClass().getClassLoader();
-        File dir = new File(classLoader.getResource( "model").getFile());
-        System.setProperty("CONFIG_HOME", dir.getParent());
+    public void init() throws Exception {
+        Path resourcePath = Paths.get(ClassLoader.getSystemResource("model").toURI());
+        Path parentPath = resourcePath.getParent();
+        System.setProperty("CONFIG_HOME", parentPath.toString());
         RelationshipSchemaLoader.resetVersionContextMap();
     }