Merge "[AAI-2404]add aai-schema-abstraction library"

52 files changed, 15964 insertions, 0 deletions

diff --git a/aai-schema-abstraction/.gitignore b/aai-schema-abstraction/.gitignore
new file mode 100644
index 00000000..cdb17b6f
--- /dev/null
+++ b/aai-schema-abstraction/.gitignore
@@ -0,0 +1,4 @@
+.settings
+target/
+/.checkstyle
+/.classpath
diff --git a/aai-schema-abstraction/LICENSE.txt b/aai-schema-abstraction/LICENSE.txt
new file mode 100644
index 00000000..7d169752
--- /dev/null
+++ b/aai-schema-abstraction/LICENSE.txt
@@ -0,0 +1,18 @@
+============LICENSE_START=======================================================
+org.onap.aai
+================================================================================
+Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+Copyright © 2019 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=========================================================
diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
new file mode 100644
index 00000000..a5e55816
--- /dev/null
+++ b/aai-schema-abstraction/pom.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+    Copyright © 2019 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=========================================================
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.aai.aai-common</groupId>
+    <artifactId>aai-common</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>aai-schema-abstraction</artifactId>
+  <name>aai-schema-abstraction</name>
+  <version>1.6.0-SNAPSHOT</version>
+
+  <properties>
+    <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+    <logback.version>1.2.3</logback.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.aai.aai-common</groupId>
+      <artifactId>aai-schema-ingest</artifactId>
+      <version>1.4.3</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.powermock</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.onap.aai.logging-service</groupId>
+      <artifactId>common-logging</artifactId>
+      <version>1.2.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.onap.aai.logging-service</groupId>
+      <artifactId>logging-api</artifactId>
+      <version>1.2.2</version>
+    </dependency>
+
+    <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+        <version>${logback.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>${logback.version}</version>
+    </dependency>
+    <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-access</artifactId>
+        <version>${logback.version}</version>
+    </dependency>
+
+    <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-core-asl</artifactId>
+        <version>1.9.13</version>
+    </dependency>
+    <dependency>
+        <groupId>org.codehaus.jackson</groupId>
+        <artifactId>jackson-mapper-asl</artifactId>
+        <version>1.9.13</version>
+    </dependency>
+    <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>2.9.4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.onap.aai</groupId>
+      <artifactId>rest-client</artifactId>
+      <version>1.2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.15.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <!-- license plugin -->
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.3</version>
+      </plugin>
+
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProvider.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProvider.java
new file mode 100644
index 00000000..1e798196
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProvider.java
@@ -0,0 +1,97 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.onap.aai.schemaif.definitions.EdgeSchema;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+
+public interface SchemaProvider {
+    
+    /**
+     * Load the schema into memory
+     */
+    public void loadSchema() throws SchemaProviderException;
+    
+    /**
+     * Get the identifier for the more recent version of the schema
+     *
+     * @return The schema version identifier
+     */
+    public String getLatestSchemaVersion() throws SchemaProviderException;
+    
+    /**
+     * Get the schema definition for a vertex
+     *
+     * @param vertexName - Name of the vertex
+     * @param schemaVersion - Version of the schema to use
+     * 
+     * @return The vertex schema definition
+     */
+    public VertexSchema getVertexSchema(String vertexName, String schemaVersion) throws SchemaProviderException;
+    
+    /**
+     * Get the schema definition for an edge
+     *
+     * @param edgeType - Type of the edge
+     * @param sourceVertex - The source vertex for the edge
+     * @param targetVertex - The target vertex for the edge
+     * @param schemaVersion - Version of the schema to use
+     * 
+     * @return The edge schema definition
+     */
+    public EdgeSchema getEdgeSchema(String edgeType, String sourceVertex, String targetVertex, String version) throws SchemaProviderException;
+
+    /**
+     * Get the list of edge definitions which are adjacent to the given vertex
+     *
+     * @param vertexType - Type of the vertex
+     * @param schemaVersion - Version of the schema to use
+     * 
+     * @return The list of edge schema definitions
+     */
+    public Set<EdgeSchema> getAdjacentEdgeSchema(String vertexType, String version) throws SchemaProviderException;
+    
+    /**
+     * Get the list of edge definitions which are valid for the given source and target
+     *
+     * @param sourceType - Type of the source vertex
+     * @param targetType - Type of the target vertex
+     * @param schemaVersion - Version of the schema to use
+     * 
+     * @return The list of edge schema definitions
+     */
+    public Set<EdgeSchema> getEdgeSchemaForSourceTarget(String sourceType, String targetType, String version) throws SchemaProviderException;
+
+    /**
+     * Get vertex map for a schema version
+     *
+     * @param schemaVersion - Version of the schema to use
+     * 
+     * @return The list of vertex types
+     */
+    public Map<String, VertexSchema> getVertexMap(String schemaVersion) throws SchemaProviderException;
+
+ }
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderException.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderException.java
new file mode 100644
index 00000000..9a95c337
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderException.java
@@ -0,0 +1,47 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif;
+
+
+public class SchemaProviderException extends Exception {
+
+    private static final long serialVersionUID = 8162385108397238865L;
+
+
+    public SchemaProviderException() {}
+
+    public SchemaProviderException(String message) {
+        super(message);
+    }
+
+    public SchemaProviderException(Throwable cause) {
+        super(cause);
+    }
+
+    public SchemaProviderException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public SchemaProviderException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java
new file mode 100644
index 00000000..9b2c1518
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/SchemaProviderMsgs.java
@@ -0,0 +1,37 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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=========================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
+package org.onap.aai.schemaif;
+
+import com.att.eelf.i18n.EELFResourceManager;
+import org.onap.aai.cl.eelf.LogMessageEnum;
+
+public enum SchemaProviderMsgs implements LogMessageEnum {
+    SCHEMA_LOAD_ERROR,
+    LOADED_SCHEMA_FILE,
+    LOADED_DB_RULE_FILE;
+    
+    static {
+        EELFResourceManager.loadMessageBundle("logging/SchemaProviderMsgs");
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/EdgeSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/EdgeSchema.java
new file mode 100644
index 00000000..07dd65d1
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/EdgeSchema.java
@@ -0,0 +1,116 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions;
+
+import java.util.Map;
+
+
+public class EdgeSchema {
+    protected String name;
+    protected String source;
+    protected String target;
+    protected Multiplicity multiplicity; 
+    protected Map<String,String> annotations;
+    protected Map<String,PropertySchema> properties;
+    
+    public enum Multiplicity {
+        MANY_2_MANY, 
+        MANY_2_ONE,
+        ONE_2_MANY,
+        ONE_2_ONE
+    }
+    
+    public String getName() {
+        return name;
+    }
+    
+    public String getSource() {
+        return source;
+    }
+    
+    public String getTarget() {
+        return target;
+    }
+
+    public Multiplicity getMultiplicity() {
+        return multiplicity;
+    }
+
+    public PropertySchema getPropertySchema(String propName) {
+        return properties.get(propName.toLowerCase());
+    }
+
+    public Map<String,PropertySchema> getPropertySchemaList() {
+        return properties;
+    }
+    
+    public String getAnnotationValue(String annotation) {
+        return annotations.get(annotation.toLowerCase());
+    }
+    
+    public Map<String,String> getAnnotations() {
+        return annotations;
+    }
+    
+    @Override
+    public int hashCode() {
+        String key = source + target + name;
+        return key.hashCode();
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        
+        EdgeSchema other = (EdgeSchema) obj;
+        
+        if ( (!source.equals(other.getSource())) || (!target.equals(other.getTarget())) || (!name.equals(other.getName())) ) {
+            return false;
+        }
+        
+        return true;
+    }
+    
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("edge: " + getSource() + " -> " + getTarget() + "\n");
+        sb.append("  type: " + getName() + "\n");
+        sb.append("  multiplicity: " + getMultiplicity() + "\n");
+        
+        sb.append("  annotations: " + "\n");
+        for (String annotation : annotations.keySet()) {
+            sb.append("    " + annotation + ": " + annotations.get(annotation) + "\n");
+        }
+        sb.append("  properties: " + "\n");
+        for (PropertySchema attrSchema : getPropertySchemaList().values()) {
+            sb.append(attrSchema.toString());
+        }
+        
+        return sb.toString();
+    }
+
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/PropertySchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/PropertySchema.java
new file mode 100644
index 00000000..a512da0b
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/PropertySchema.java
@@ -0,0 +1,100 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions;
+
+import java.util.Map;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.types.DataType;
+
+
+public class PropertySchema {
+    protected String name;
+    protected DataType dataType;
+    protected Boolean required;
+    protected String defaultValue;
+    protected Boolean unique;
+    protected Boolean isReserved;
+    protected Map<String,String> annotations;
+
+    public String getName() {
+        return name;
+    }
+
+    public DataType getDataType() {
+        return dataType;
+    }
+
+    public Boolean isRequired() {
+        return required;
+    }
+    
+    public Boolean isKey() {
+        return (unique && required);
+    }
+    
+    public Boolean isUnique() {
+        return unique;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+    
+    public Boolean isReserved() {
+        return isReserved;
+    }
+    
+    public String getAnnotationValue(String annotation) {
+        return annotations.get(annotation.toLowerCase());
+    }
+    
+    public Map<String, String> getAnnotations() {
+      return annotations;
+    }
+
+    public Object validateValue(String value) throws SchemaProviderException {
+        Object obj = dataType.validateValue(value);
+        if (obj == null) {
+            throw new SchemaProviderException("Invalid value for porperty '" + name + "': " + value);
+        }
+        
+        return obj; 
+    }
+    
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("    property: " + getName() + "\n");
+        sb.append("      datatype: " + dataType.toString() + "\n");
+        sb.append("      required: " + isRequired() + "\n");
+        sb.append("      key: " + isKey() + "\n");
+        sb.append("      reserved: " + isReserved() + "\n");
+        sb.append("      default: " + getDefaultValue() + "\n");
+        sb.append("      annotations: " + "\n");
+        
+        for (String annotation : annotations.keySet()) {
+            sb.append("        " + annotation + ": " + annotations.get(annotation) + "\n");
+        }
+                
+        return sb.toString();
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/VertexSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/VertexSchema.java
new file mode 100644
index 00000000..7ad1cfc6
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/VertexSchema.java
@@ -0,0 +1,65 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions;
+
+import java.util.Map;
+
+
+public class VertexSchema {
+    protected String name;
+    protected Map<String,PropertySchema> properties;
+    protected Map<String,String> annotations;
+
+    public String getName() {
+        return name;
+    }
+
+    public PropertySchema getPropertySchema(String propName) {
+        return properties.get(propName.toLowerCase());
+    }
+
+    public Map<String,PropertySchema> getPropertySchemaList() {
+        return properties;
+    }
+
+    public Map<String,String> getAnnotationSchemaList() {
+      return annotations;
+    }
+    
+    public String getAnnotationValue(String annotation) {
+        return annotations.get(annotation.toLowerCase());
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("vertex: " + getName() + "\n");
+        sb.append("  annotations: " + "\n");
+        for (String annotation : annotations.keySet()) {
+            sb.append("    " + annotation + ": " + annotations.get(annotation) + "\n");
+        }
+        sb.append("  properties: " + "\n");
+        for (PropertySchema attrSchema : getPropertySchemaList().values()) {
+            sb.append(attrSchema.toString());
+        }
+
+        return sb.toString();
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/BooleanDataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/BooleanDataType.java
new file mode 100644
index 00000000..52fb4ca5
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/BooleanDataType.java
@@ -0,0 +1,38 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+
+public class BooleanDataType extends DataType {    
+    public BooleanDataType() {
+        super(Type.BOOL);
+    }
+
+    @Override
+    public Object validateValue(String value) {
+        if (value.equalsIgnoreCase("true") || (value.equalsIgnoreCase("false"))) {
+            return Boolean.parseBoolean(value);
+        }
+        
+        return null;
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/ComplexDataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/ComplexDataType.java
new file mode 100644
index 00000000..e09c18fd
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/ComplexDataType.java
@@ -0,0 +1,58 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+import java.util.List;
+
+import org.onap.aai.schemaif.definitions.PropertySchema;
+
+public class ComplexDataType extends DataType {    
+    private List<PropertySchema> subProperties;
+    
+    public ComplexDataType(List<PropertySchema> subProperties) {
+        super(Type.COMPLEX);
+        this.subProperties = subProperties;
+    }
+
+    public List<PropertySchema> getSubProperties() {
+        return subProperties;
+    }
+    
+    @Override
+    public Object validateValue(String value) {
+        // TODO: Validate the complex type against the subProperties
+        return value;
+    }
+    
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("COMPLEX[ ");
+        
+        for (PropertySchema prop : getSubProperties()) {
+            sb.append(prop.getDataType().toString() + " ");
+        }
+        
+        sb.append("]");
+        
+        return sb.toString();
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/DataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/DataType.java
new file mode 100644
index 00000000..a0586037
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/DataType.java
@@ -0,0 +1,53 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+
+public abstract class DataType {
+    public enum Type {
+        STRING, 
+        BOOL,
+        INT,
+        LONG,
+        FLOAT,
+        LIST,
+        MAP,
+        COMPLEX
+    }
+    
+    private Type type;
+    
+    public DataType(Type type) {
+        this.type = type;
+    }
+
+    public Type getType() {
+        return type;
+    }
+    
+    public abstract Object validateValue(String value);
+    
+    public String toString() {
+        return getType().toString();
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/FloatDataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/FloatDataType.java
new file mode 100644
index 00000000..17fb9485
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/FloatDataType.java
@@ -0,0 +1,43 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+public class FloatDataType extends DataType {    
+    public FloatDataType() {
+        super(Type.FLOAT);
+    }
+
+    @Override
+    public Object validateValue(String value) {
+        // TODO:  In Tosca, you can impose constraints such as min/max value.
+        // In future we can add this type of validation
+        Float floatValue;
+        try {
+            floatValue = Float.parseFloat(value);
+        }
+        catch (NumberFormatException e) {
+            return null;
+        }
+        
+        return floatValue;
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/IntDataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/IntDataType.java
new file mode 100644
index 00000000..59eb788f
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/IntDataType.java
@@ -0,0 +1,54 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+import java.text.DecimalFormat;
+
+public class IntDataType extends DataType {    
+    public IntDataType() {
+        super(Type.INT);
+    }
+
+    @Override
+    public Object validateValue(String value) {
+        // TODO:  In Tosca, you can impose constraints such as min/max value.
+        // In future we can add this type of validation
+        Integer intValue;
+        try {
+            intValue = Integer.parseInt(value);
+        }
+        catch (NumberFormatException e) {
+            // There is an edge case where an int value is stored as "x.0" in champ.
+            // In that case, we just want to drop the ".0" and treat it as a proper
+            // integer
+            try {
+                DecimalFormat decimalFormat = new DecimalFormat("0.#");
+                intValue = Integer.parseInt(decimalFormat.format(Double.valueOf(value)));
+            }
+            catch (Exception ex)  {
+                return null;
+            }
+        }
+
+        return intValue;
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/ListDataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/ListDataType.java
new file mode 100644
index 00000000..84adefec
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/ListDataType.java
@@ -0,0 +1,45 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+public class ListDataType extends DataType {
+    private DataType listType;
+    
+    public ListDataType(DataType listType) {
+        super(Type.LIST);
+        this.listType = listType;
+    }
+
+    public DataType getListType() {
+        return listType;
+    }
+    
+    @Override
+    public Object validateValue(String value) {
+        // TODO: Break the string into a list and validate each element against the listType
+        return value;
+    }
+
+    public String toString() {
+        return "LIST[" + listType.toString() + "]";
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/LongDataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/LongDataType.java
new file mode 100644
index 00000000..38195f9c
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/LongDataType.java
@@ -0,0 +1,43 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+public class LongDataType extends DataType {    
+    public LongDataType() {
+        super(Type.LONG);
+    }
+
+    @Override
+    public Object validateValue(String value) {
+        // TODO:  In Tosca, you can impose constraints such as min/max value.
+        // In future we can add this type of validation
+        Long longInt;
+        try {
+            longInt = Long.parseLong(value);
+        }
+        catch (NumberFormatException e) {
+            return null;
+        }
+        
+        return longInt;
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/MapDataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/MapDataType.java
new file mode 100644
index 00000000..443f460e
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/MapDataType.java
@@ -0,0 +1,45 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+public class MapDataType extends DataType {
+    private DataType mapType;
+    
+    public MapDataType(DataType mapType) {
+        super(Type.MAP);
+        this.mapType = mapType;
+    }
+
+    public DataType getMapType() {
+        return mapType;
+    }
+    
+    @Override
+    public Object validateValue(String value) {
+        // TODO: Break the string into a map and validate each element against the mapType
+        return value;
+    }
+
+    public String toString() {
+        return "MAP[" + mapType.toString() + "]";
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/StringDataType.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/StringDataType.java
new file mode 100644
index 00000000..39487ea2
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/definitions/types/StringDataType.java
@@ -0,0 +1,35 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.definitions.types;
+
+public class StringDataType extends DataType {    
+    public StringDataType() {
+        super(Type.STRING);
+    }
+
+    @Override
+    public Object validateValue(String value) {
+        // TODO:  In Tosca, you can impose constraints such as string length, regex matches, valid values, 
+        // string length maximums, etc.  In future we can add this type of validation
+        return value;
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonEdgeSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonEdgeSchema.java
new file mode 100644
index 00000000..e3bc450b
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonEdgeSchema.java
@@ -0,0 +1,82 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.EdgeSchema;
+import org.onap.aai.schemaif.definitions.PropertySchema;
+import org.onap.aai.schemaif.json.definitions.JsonEdgeSchema;
+
+public class FromJsonEdgeSchema extends EdgeSchema {
+    public static final String WILDCARD_CHAR = "*";
+    
+    public FromJsonEdgeSchema() {
+    }
+    
+    public FromJsonEdgeSchema(EdgeSchema other) {
+        // A shallow copy should suffice, as edge definitions don't change.
+        name = other.getName();
+        source = other.getSource();
+        target = other.getTarget();
+        multiplicity = other.getMultiplicity();
+        properties = other.getPropertySchemaList();
+        annotations = other.getAnnotations();
+    }
+    
+    public void fromJson(JsonEdgeSchema jsonEdge) throws SchemaProviderException {
+
+        name = jsonEdge.getLabel();
+        source = jsonEdge.getFrom();
+        target = jsonEdge.getTo();
+        
+        // TODO:  At present, multiplicity isn't described in the JSON schema.  By default, make everything
+        // many-to-many
+        multiplicity = Multiplicity.MANY_2_MANY;
+  
+        // Populate annotation schema
+        annotations = new HashMap<String,String>();
+        if (jsonEdge.getAnnotations() != null) {
+            for (Map.Entry<String,String> entry : jsonEdge.getAnnotations().entrySet()) {
+                annotations.put(entry.getKey().toLowerCase(), entry.getValue());
+            }
+        }
+        
+        // Currently edge properties are not supported in the json schema
+        properties = new HashMap<String,PropertySchema>();
+    }
+
+    public void replaceWildcard(String vertexName) throws SchemaProviderException {
+        if (source.equals(WILDCARD_CHAR) && target.equals(WILDCARD_CHAR)) {
+            throw new SchemaProviderException("Edge definition with wildcard source and target: " + toString());
+        }
+        
+        if (source.equals(WILDCARD_CHAR)) {
+            source = vertexName;
+        }
+        
+        if (target.equals(WILDCARD_CHAR)) {
+            target = vertexName;
+        }
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonPropertySchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonPropertySchema.java
new file mode 100644
index 00000000..ea522191
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonPropertySchema.java
@@ -0,0 +1,116 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.PropertySchema;
+import org.onap.aai.schemaif.definitions.types.BooleanDataType;
+import org.onap.aai.schemaif.definitions.types.ComplexDataType;
+import org.onap.aai.schemaif.definitions.types.DataType;
+import org.onap.aai.schemaif.definitions.types.IntDataType;
+import org.onap.aai.schemaif.definitions.types.ListDataType;
+import org.onap.aai.schemaif.definitions.types.LongDataType;
+import org.onap.aai.schemaif.definitions.types.MapDataType;
+import org.onap.aai.schemaif.definitions.types.StringDataType;
+import org.onap.aai.schemaif.json.definitions.DataTypeDefinition;
+import org.onap.aai.schemaif.json.definitions.JsonPropertySchema;
+
+public class FromJsonPropertySchema extends PropertySchema {
+
+    public void fromJson(JsonPropertySchema pSchema, boolean reserved, List<DataTypeDefinition> dataTypes) throws SchemaProviderException {
+        name = pSchema.getName();
+        defaultValue = pSchema.getDefaultValue() == null ? "" : pSchema.getDefaultValue();
+        required = pSchema.getRequired() == null ? false : pSchema.getRequired();
+        unique = pSchema.getUnique() == null ? false : pSchema.getUnique();
+        isReserved = reserved;
+        dataType = resolveDataType(pSchema.getDataType(), dataTypes);
+
+        // Populate annotations
+        annotations = new HashMap<String,String>();
+        if (pSchema.getAnnotations() != null) {
+            for (Map.Entry<String,String> entry : pSchema.getAnnotations().entrySet()) {
+                annotations.put(entry.getKey().toLowerCase(), entry.getValue());
+            }
+        }
+    }
+    
+    private DataType resolveDataType(String typeString, List<DataTypeDefinition> dataTypes) throws SchemaProviderException {
+        if (typeString.equalsIgnoreCase("string")) { 
+            return new StringDataType();
+        }
+        
+        if (typeString.equalsIgnoreCase("integer")) {
+            return new IntDataType();
+        }
+
+        if (typeString.equalsIgnoreCase("long")) {
+          return new LongDataType();
+        }
+        
+        if (typeString.equalsIgnoreCase("boolean")) {
+            return new BooleanDataType();
+        }
+        
+        if (typeString.startsWith("list:")) {
+            String segments[] = typeString.split(":");
+            DataType subType = resolveDataType(segments[1], dataTypes);
+            return new ListDataType(subType);
+        }
+        
+        if (typeString.startsWith("map:")) {
+            String segments[] = typeString.split(":");
+            DataType subType = resolveDataType(segments[1], dataTypes);
+            return new MapDataType(subType);
+        }
+        
+        // Must be a complex type
+        return resolveComplexDataType(typeString, dataTypes);
+    }
+    
+    private DataType resolveComplexDataType(String typeString, List<DataTypeDefinition> dataTypes) throws SchemaProviderException {
+        // It must be a custom/complex type.
+        DataTypeDefinition dType = null;
+        for (DataTypeDefinition d : dataTypes) {
+            if ( (d.getName().equals(typeString)) ) {
+                dType = d;
+                break;
+            }
+        }
+        
+        if (dType == null) {
+            throw new SchemaProviderException("Invalid data type: " + typeString);
+        }
+        
+        List<PropertySchema> propList = new ArrayList<PropertySchema>();
+        for (JsonPropertySchema p : dType.getProperties()) {
+            FromJsonPropertySchema pSchema = new FromJsonPropertySchema();
+            pSchema.fromJson(p, false, dataTypes);
+            propList.add(pSchema);
+        }
+        
+        return new ComplexDataType(propList);
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonVertexSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonVertexSchema.java
new file mode 100644
index 00000000..7a3251f1
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/FromJsonVertexSchema.java
@@ -0,0 +1,132 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.PropertySchema;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+import org.onap.aai.schemaif.json.definitions.DataTypeDefinition;
+import org.onap.aai.schemaif.json.definitions.JsonPropertySchema;
+import org.onap.aai.schemaif.json.definitions.JsonVertexSchema;
+
+
+public class FromJsonVertexSchema extends VertexSchema {
+    public void fromJson(JsonVertexSchema jsonVertex, List<DataTypeDefinition> dataTypes, List<JsonPropertySchema> commonProps) throws SchemaProviderException {
+        name = jsonVertex.getName();
+        properties = new HashMap<String,PropertySchema>();
+        annotations = new HashMap<String,String>();
+
+        // Populate property schema
+        if (jsonVertex.getProperties() != null) {
+            for (JsonPropertySchema pSchema : jsonVertex.getProperties()) {
+                FromJsonPropertySchema propSchema = new FromJsonPropertySchema();
+                propSchema.fromJson(pSchema, false, dataTypes);
+                properties.put(propSchema.getName().toLowerCase(), propSchema);
+            }
+        }
+        
+        // Add common properties
+        if (commonProps != null) {
+            for (JsonPropertySchema pSchema : commonProps) {
+                FromJsonPropertySchema propSchema = new FromJsonPropertySchema();
+                propSchema.fromJson(pSchema, true, dataTypes);
+                properties.put(propSchema.getName().toLowerCase(), propSchema);
+            }
+        }
+        else {
+            // TODO:  This is a hack until the schema-service return the list of common props
+            addCommonProps();
+        }
+        
+        // Populate annotation schema
+        if (jsonVertex.getAnnotations() != null) {
+            for (Map.Entry<String,String> entry : jsonVertex.getAnnotations().entrySet()) {
+                annotations.put(entry.getKey().toLowerCase(), entry.getValue());
+            }
+        }
+        
+        // The searchable and indexed annotations, need to grab these from the property annotations 
+        // and store them at the vertex level as well (backwards compatibility with OXM)
+        StringBuilder searchableVal = new StringBuilder();
+        StringBuilder indexedVal = new StringBuilder();
+        for (PropertySchema pSchema : properties.values()) {
+            if ( (pSchema.getAnnotationValue("searchable") != null) 
+                    && (pSchema.getAnnotationValue("searchable").equalsIgnoreCase("true")) ) {
+                if (searchableVal.length() > 0) {
+                    searchableVal.append(",");
+                }
+                searchableVal.append(pSchema.getName());
+            }
+            if ( (pSchema.getAnnotationValue("indexed") != null) 
+                    && (pSchema.getAnnotationValue("indexed").equalsIgnoreCase("true")) ) {
+                if (indexedVal.length() > 0) {
+                    indexedVal.append(",");
+                }
+                indexedVal.append(pSchema.getName());
+            }
+        }
+        
+        if (searchableVal.length() > 0) {
+            annotations.put("searchable", searchableVal.toString());
+        }
+        if (indexedVal.length() > 0) {
+            annotations.put("indexedprops", indexedVal.toString());
+        }
+    }
+
+    private void addCommonProps() throws SchemaProviderException {
+        addCommonProperty("aai-uuid", false, true, "string", "true");
+        addCommonProperty("last-mod-source-of-truth", false, false, "string", "false");
+        addCommonProperty("aai-node-type", false, false, "string", "false");
+        addCommonProperty("aai-created-ts", false, false, "string", "false");
+        addCommonProperty("aai-unique-key", false, false, "string", "false");
+        addCommonProperty("aai-last-mod-ts", false, false, "string", "false");
+        addCommonProperty("source-of-truth", false, false, "string", "false");
+        addCommonProperty("aai-uri", false, false, "string", "false");
+        
+    }
+    
+    private void addCommonProperty(String name, boolean req, boolean unique, String type, String indexed) throws SchemaProviderException {
+        JsonPropertySchema pSchema = new JsonPropertySchema();
+        pSchema.setName(name);
+        pSchema.setRequired(req);
+        pSchema.setUnique(unique);
+        pSchema.setDataType(type);
+        pSchema.setDescription("");
+        pSchema.setDefaultValue("");
+        
+        Map<String,String> propAnnotations = new HashMap<String,String>();
+        propAnnotations.put("indexed", indexed);
+        propAnnotations.put("searchable", "false");
+        propAnnotations.put("source_of_truth_type", "AAI");
+
+        pSchema.setAnnotations(propAnnotations);
+        
+        FromJsonPropertySchema propSchema = new FromJsonPropertySchema();
+        propSchema.fromJson(pSchema, true, null);
+
+        properties.put(name, propSchema);
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java
new file mode 100644
index 00000000..a947eac4
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProvider.java
@@ -0,0 +1,235 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.zip.ZipEntry; 
+import java.util.zip.ZipInputStream;
+
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.schemaif.SchemaProvider;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.SchemaProviderMsgs;
+import org.onap.aai.schemaif.definitions.EdgeSchema;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+import org.onap.aai.schemaif.json.definitions.JsonEdgeSchema;
+import org.onap.aai.schemaif.json.definitions.JsonSchema;
+import org.onap.aai.schemaif.json.definitions.JsonVertexSchema;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+
+public class JsonSchemaProvider implements SchemaProvider {
+    Logger logger = LoggerFactory.getInstance().getLogger(JsonSchemaProvider.class.getName());
+    
+    private JsonSchemaProviderConfig config;
+    private Map<String,SchemaInstance> schemaCache = new ConcurrentHashMap<>();
+    private RestTemplate restTemplate = null;
+            
+    public JsonSchemaProvider(JsonSchemaProviderConfig config) {
+        this.config = config;
+
+        SecureClientHttpRequestFactory fac = new SecureClientHttpRequestFactory(config); 
+        fac.setBufferRequestBody(false);
+        this.restTemplate = new RestTemplate(fac);
+    }
+    
+    @Override
+    public void loadSchema() throws SchemaProviderException {
+        // Load the latest schema version
+        fetchSchemaVersion(getLatestSchemaVersion());
+    }
+        
+    @Override
+    public String getLatestSchemaVersion() throws SchemaProviderException {
+        return "v0";
+    }
+
+    @Override
+    public VertexSchema getVertexSchema(String vertexName, String schemaVersion) throws SchemaProviderException {
+        SchemaInstance inst = getSchemaVersion(schemaVersion);  
+        return inst.getVertexSchema(vertexName);
+    }
+
+    @Override
+    public EdgeSchema getEdgeSchema(String edgeType, String sourceVertex, String targetVertex, String version)
+            throws SchemaProviderException {
+        SchemaInstance inst = getSchemaVersion(version);
+        return inst.getEdgeSchema(sourceVertex, targetVertex, edgeType);
+    }
+    
+    @Override
+    public Set<EdgeSchema> getAdjacentEdgeSchema(String vertexType, String version) throws SchemaProviderException {
+        SchemaInstance inst = getSchemaVersion(version);
+        
+        Set<EdgeSchema> edgeList = inst.getEdgeSchema(vertexType);
+        if (edgeList == null) {
+            edgeList = new HashSet<EdgeSchema>();
+        }
+        
+        return edgeList;
+    }
+
+    @Override
+    public Set<EdgeSchema> getEdgeSchemaForSourceTarget(String sourceType, String targetType, String version)
+            throws SchemaProviderException {
+        SchemaInstance inst = getSchemaVersion(version);
+
+        if (inst == null) {
+            throw new SchemaProviderException("Unable to find schema version " + version);
+        }
+        
+        Set<EdgeSchema> edgeList = inst.getEdgeSchemas(sourceType, targetType);
+        if (edgeList == null) {
+            edgeList = new HashSet<EdgeSchema>();
+        }
+        
+        return edgeList;
+    }
+    
+    public void loadSchema(String payload, String version) throws SchemaProviderException {
+        JsonSchema jsonSchema = JsonSchema.fromJson(payload);
+        SchemaInstance schemaInst = new SchemaInstance();
+        
+        for (JsonVertexSchema jsonVertex : jsonSchema.getNodeTypes()) {
+            FromJsonVertexSchema vSchema = new FromJsonVertexSchema();
+            vSchema.fromJson(jsonVertex, jsonSchema.getDataTypes(), jsonSchema.getCommonProperties());
+            schemaInst.addVertex(vSchema);
+        }
+        
+        for (JsonEdgeSchema jsonEdge : jsonSchema.getRelationshipTypes()) {
+            FromJsonEdgeSchema eSchema = new FromJsonEdgeSchema();
+            eSchema.fromJson(jsonEdge);
+            schemaInst.addEdge(eSchema);
+        }
+        
+        schemaCache.put(version, schemaInst);
+    }
+    
+    private synchronized void fetchSchemaVersion(String version) throws SchemaProviderException {
+        if (schemaCache.get(version) != null) {
+            return;
+        }
+        
+
+        String url = config.getSchemaServiceBaseUrl() + "/" + version;
+        
+        HttpHeaders headers = new HttpHeaders();
+        headers.put("X-FromAppId", Arrays.asList(config.getServiceName()));
+        headers.put("X-TransactionId", Arrays.asList(java.util.UUID.randomUUID().toString()));
+        headers.setAccept(Arrays.asList(org.springframework.http.MediaType.APPLICATION_OCTET_STREAM));
+        
+        HttpEntity <String> entity = new HttpEntity<String>(headers);
+        
+        ResponseEntity<byte[]> response = restTemplate.exchange(url, HttpMethod.GET, entity, byte[].class);
+        
+        
+        if (response.getStatusCodeValue() == HttpStatus.NOT_FOUND.value()) {
+            logger.warn(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "version " + version + " not found");
+            throw new SchemaProviderException("Schema version " + version + " not found");
+        }
+        else if (response.getStatusCodeValue() != HttpStatus.OK.value()) {
+            logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "failed to load version " + version + ": " + response.getBody());
+            throw new SchemaProviderException("Error getting schema version " + version + ":" + response.getBody());
+        }
+
+        try {
+            SchemaServiceResponse resp = SchemaServiceResponse.fromJson(unzipAndGetJSONString(response));
+            loadSchema(resp.getData().toJson(), version);
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "failed to load version " + version + ": " 
+                    + response.getBody() + "\n" + writer.toString());
+            throw new SchemaProviderException("Error loading schema version " + version + ":" + ex.getMessage());
+
+        }
+
+        logger.info(SchemaProviderMsgs.LOADED_SCHEMA_FILE, version);
+    }
+    
+    private String unzipAndGetJSONString(ResponseEntity<byte[]> response) throws IOException {
+        StringBuffer sb = new StringBuffer("");
+
+        ZipInputStream zipStream = null;
+        try {
+
+            zipStream = new ZipInputStream(new ByteArrayInputStream(response.getBody()));
+            ZipEntry entry = null;
+            while ((entry = zipStream.getNextEntry()) != null) {
+                Scanner sc = new Scanner(zipStream);
+                while (sc.hasNextLine()) {
+                    sb.append(sc.nextLine());
+                }
+
+            }
+        } finally {
+            try {
+                zipStream.closeEntry();
+                zipStream.close();
+            } catch (Exception e) {
+                logger.warn(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, e.toString());
+
+            }
+        }
+
+        return sb.toString();
+    }
+
+    private SchemaInstance getSchemaVersion(String version) throws SchemaProviderException {
+        // TODO:  For now, we are only supporting a single version of the schema.  Load that
+        // version regardless of what the client asks for.
+        String versionToLoad = getLatestSchemaVersion();
+        SchemaInstance inst = schemaCache.get(versionToLoad);
+
+        if (inst == null) {
+            fetchSchemaVersion(versionToLoad);
+            inst = schemaCache.get(versionToLoad);
+            if (inst == null) {
+                throw new SchemaProviderException("Unable to find schema version " + versionToLoad);
+            }
+        }
+        
+        return inst;
+    }
+
+    @Override
+    public Map<String, VertexSchema> getVertexMap(String schemaVersion) throws SchemaProviderException {
+      return getSchemaVersion(schemaVersion).getVertexMap();
+    }
+    
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProviderConfig.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProviderConfig.java
new file mode 100644
index 00000000..3a235f63
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/JsonSchemaProviderConfig.java
@@ -0,0 +1,58 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json;
+
+
+public class JsonSchemaProviderConfig {
+    
+    private String schemaServiceBaseUrl;
+    private String schemaServiceCertFile;
+    private String schemaServiceCertPwd;
+    private String serviceName;
+    
+    public String getSchemaServiceBaseUrl() {
+        return schemaServiceBaseUrl;
+    }
+    public void setSchemaServiceBaseUrl(String schemaServiceBaseUrl) {
+        this.schemaServiceBaseUrl = schemaServiceBaseUrl;
+    }
+    
+    public String getSchemaServiceCertFile() {
+        return schemaServiceCertFile;
+    }
+    public void setSchemaServiceCertFile(String schemaServiceCertFile) {
+        this.schemaServiceCertFile = schemaServiceCertFile;
+    }
+    
+    public String getSchemaServiceCertPwd() {
+        return schemaServiceCertPwd;
+    }
+    public void setSchemaServiceCertPwd(String schemaServiceCertPwd) {
+        this.schemaServiceCertPwd = schemaServiceCertPwd;
+    }
+    
+    public String getServiceName() {
+        return serviceName;
+    }
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SchemaInstance.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SchemaInstance.java
new file mode 100644
index 00000000..77a1c56b
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SchemaInstance.java
@@ -0,0 +1,121 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.EdgeSchema;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+
+public class SchemaInstance {
+    // vertex-name -> vertex-schema
+    private Map<String, VertexSchema> vertexMap = new HashMap<>();
+    
+    // source:target:type -> edge-schema
+    private Map<String, EdgeSchema> edgeKeyMap = new HashMap<>();
+    
+    // source:target -> edge-schema
+    private Map<String, Set<EdgeSchema>> edgeSourceTargetMap = new HashMap<>();
+    
+    // vertex-name -> edge-schema
+    private Map<String, Set<EdgeSchema>> vertexEdgeMap = new HashMap<>();
+    
+    public VertexSchema getVertexSchema(String vertexName) {
+        return vertexMap.get(vertexName.toLowerCase());
+    }
+    
+    public EdgeSchema getEdgeSchema(String source, String target, String type) {
+        return edgeKeyMap.get(generateEdgeKey(source, target, type));
+    }
+    
+    public Set<EdgeSchema> getEdgeSchemas(String source, String target) {
+        return edgeSourceTargetMap.get(source.toLowerCase() + ":" + target.toLowerCase());
+    }
+    
+    public Set<EdgeSchema> getEdgeSchema(String vertexName) {
+        return vertexEdgeMap.get(vertexName.toLowerCase());
+    }
+    
+    public void addVertex(VertexSchema v) {
+        vertexMap.put(v.getName().toLowerCase(), v);
+    }
+    
+    public void addEdge(EdgeSchema e) throws SchemaProviderException {
+        if (e.getSource().equals(FromJsonEdgeSchema.WILDCARD_CHAR) || 
+                e.getTarget().equals(FromJsonEdgeSchema.WILDCARD_CHAR)) {
+            // Handle wildcard edges
+            for (VertexSchema vertex : vertexMap.values()) {
+                addWildcardEdge(e, vertex);
+            }
+        }
+        else {
+            addEdgeInternal(e);
+        }
+    }
+    
+    private void addWildcardEdge(EdgeSchema e, VertexSchema vertex) throws SchemaProviderException {
+        FromJsonEdgeSchema newEdge = new FromJsonEdgeSchema(e);
+        newEdge.replaceWildcard(vertex.getName());
+        addEdgeInternal(newEdge);
+    }
+
+    private void addEdgeInternal(EdgeSchema e) {
+        edgeKeyMap.put(generateEdgeKey(e.getSource(), e.getTarget(), e.getName()), e);
+        
+        Set<EdgeSchema> edgeListSource = vertexEdgeMap.get(e.getSource().toLowerCase());
+        Set<EdgeSchema> edgeListTarget = vertexEdgeMap.get(e.getTarget().toLowerCase());
+        
+        if (edgeListSource == null) {
+            edgeListSource = new HashSet<EdgeSchema>();
+        }
+        if (edgeListTarget == null) {
+            edgeListTarget = new HashSet<EdgeSchema>();
+        }
+        
+        edgeListSource.add(e);
+        edgeListTarget.add(e);
+        vertexEdgeMap.put(e.getSource().toLowerCase(), edgeListSource);
+        vertexEdgeMap.put(e.getTarget().toLowerCase(), edgeListTarget);
+        
+        String sourceTargetKey = e.getSource().toLowerCase() + ":" + e.getTarget().toLowerCase();
+        Set<EdgeSchema> edgeList = edgeSourceTargetMap.get(sourceTargetKey);
+        if (edgeList == null) {
+            edgeList = new HashSet<EdgeSchema>();
+        }
+        
+        edgeList.add(e);
+        edgeSourceTargetMap.put(sourceTargetKey, edgeList);
+    }
+    
+    private String generateEdgeKey(String source, String target, String type) {
+        String key = source + ":" + target + ":" + type;
+        return key.toLowerCase();
+    }
+
+    public Map<String, VertexSchema> getVertexMap() {
+      return vertexMap;
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SchemaServiceResponse.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SchemaServiceResponse.java
new file mode 100644
index 00000000..7fa123a5
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SchemaServiceResponse.java
@@ -0,0 +1,67 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.json.definitions.JsonSchema;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.SerializedName;
+
+public class SchemaServiceResponse {
+    public static final String SCHEMA_TYPE_OXM = "oxm";
+    public static final String SCHEMA_TYPE_JSON = "json";
+    
+    private static final Gson gson = new GsonBuilder().create();
+
+    @SerializedName("schema-version")
+    private String version;
+    
+    @SerializedName("schema-content")
+    private JsonSchema data;
+   
+    public String getVersion() {
+        return version;
+    }
+
+    public JsonSchema getData() {
+        return data;
+    }
+
+    public String toJson() {
+        return gson.toJson(this);
+    }
+
+    public static SchemaServiceResponse fromJson(String json) throws SchemaProviderException {
+        try {
+            if (json == null || json.isEmpty()) {
+                throw new SchemaProviderException("Empty schema-service response");
+            }
+            
+            return gson.fromJson(json, SchemaServiceResponse.class);
+        } catch (Exception ex) {
+            throw new SchemaProviderException("Invalid response from schema service: " + ex.getMessage());
+        }
+    }
+
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SecureClientHttpRequestFactory.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SecureClientHttpRequestFactory.java
new file mode 100644
index 00000000..0b48a36c
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/SecureClientHttpRequestFactory.java
@@ -0,0 +1,126 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
+ * ================================================================================
+ * 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.schemaif.json;
+
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.security.KeyStore;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+
+
+public class SecureClientHttpRequestFactory extends SimpleClientHttpRequestFactory {
+
+    private static final String SSL_PROTOCOL = "TLS";
+    private static final String KEYSTORE_ALGORITHM = "SunX509";
+    private static final String KEYSTORE_TYPE = "PKCS12";
+    private JsonSchemaProviderConfig config;
+   
+
+    public SecureClientHttpRequestFactory(JsonSchemaProviderConfig  config) {
+        super();
+        this.config = config;
+    }
+
+    @Override
+    protected void prepareConnection(final HttpURLConnection connection, final String httpMethod)
+        throws IOException {
+        if (connection instanceof HttpsURLConnection) {
+            ((HttpsURLConnection) connection)
+                .setSSLSocketFactory(getSSLContext().getSocketFactory());
+            ((HttpsURLConnection) connection).setHostnameVerifier(new HostnameVerifier() {
+                @Override
+                public boolean verify(String str, SSLSession sslSession) {
+                    return true;
+                }
+            });
+        } else {
+
+            throw new IOException();
+        }
+        super.prepareConnection(connection, httpMethod);
+    }
+
+    protected SSLContext getSSLContext() throws IOException {
+        try {
+            TrustManager[] trustAllCerts = null;
+
+            // We aren't validating certificates, so create a trust manager that
+            // does
+            // not validate certificate chains.
+            trustAllCerts = new TrustManager[] {new X509TrustManager() {
+                public X509Certificate[] getAcceptedIssuers() {
+                    return null;
+                }
+
+                public void checkClientTrusted(X509Certificate[] certs, String authType) {
+                }
+
+                public void checkServerTrusted(X509Certificate[] certs, String authType) {
+                }
+            }};
+
+            SSLContext ctx = SSLContext.getInstance(SSL_PROTOCOL);
+            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KEYSTORE_ALGORITHM);
+            KeyStore ks = KeyStore.getInstance(KEYSTORE_TYPE);
+
+            char[] pwd = null;
+            if (config.getSchemaServiceCertPwd()!= null) {
+                pwd = config.getSchemaServiceCertPwd().toCharArray();
+            }
+
+            if (config.getSchemaServiceCertFile() != null) {
+                FileInputStream fin =null;
+                try {
+                    fin = new FileInputStream(config.getSchemaServiceCertFile());
+    
+                    // Load the keystore and initialize the key manager factory.
+                    ks.load(fin, pwd);
+                    kmf.init(ks, pwd);
+    
+                    ctx.init(kmf.getKeyManagers(), trustAllCerts, null);
+                }finally {
+                        fin.close();
+                    }
+            } else {
+                ctx.init(null, trustAllCerts, null);
+            }
+
+            return ctx;
+        } catch (Exception e) {
+            throw new IOException("Problem with getting the SSL Context::" + e.getMessage(), e);
+        }
+
+    }
+
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/DataTypeDefinition.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/DataTypeDefinition.java
new file mode 100644
index 00000000..93c67bdc
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/DataTypeDefinition.java
@@ -0,0 +1,125 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json.definitions;
+
+import java.util.List;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class DataTypeDefinition {
+    private static final Gson gson = new GsonBuilder().create();
+    
+    private String name;
+    private String description;
+    private List<JsonPropertySchema> properties;
+    
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<JsonPropertySchema> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(List<JsonPropertySchema> properties) {
+        this.properties = properties;
+    }
+    
+    public void validate() throws SchemaProviderException {
+        if ( (getName() == null) || (getName().isEmpty()) ) {
+            throw new SchemaProviderException("Type definition missing a name");
+        }
+
+        if (getProperties() != null) {
+            for (JsonPropertySchema propSchema : getProperties()) {
+                propSchema.validate();
+            }
+        }
+    }
+    
+    public String toJson() {
+        return gson.toJson(this);
+    }
+    
+    public static DataTypeDefinition fromJson(String json) {
+        return gson.fromJson(json, DataTypeDefinition.class);
+    }
+
+    @Override
+    public String toString() {
+        return "DataTypeDefinition [name=" + name + ", description=" + description + ", properties="
+            + properties + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((description == null) ? 0 : description.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((properties == null) ? 0 : properties.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        DataTypeDefinition other = (DataTypeDefinition) obj;
+        if (description == null) {
+            if (other.description != null)
+                return false;
+        } else if (!description.equals(other.description))
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        if (properties == null) {
+            if (other.properties != null)
+                return false;
+        } else if (!properties.equals(other.properties))
+            return false;
+        return true;
+    }
+    
+    
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonEdgeSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonEdgeSchema.java
new file mode 100644
index 00000000..ffbc54de
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonEdgeSchema.java
@@ -0,0 +1,135 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json.definitions;
+
+
+import java.util.Map;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class JsonEdgeSchema {
+    private static final Gson gson = new GsonBuilder().create();
+    
+    private String from;
+    private String to;
+    private String label;
+    private Map<String,String> annotations;
+    
+    public String getFrom() {
+        return from;
+    }
+    public void setFrom(String from) {
+        this.from = from;
+    }
+    
+    public String getTo() {
+        return to;
+    }
+    public void setTo(String to) {
+        this.to = to;
+    }
+    
+    public String getLabel() {
+        return label;
+    }
+    public void setLabel(String label) {
+        this.label = label;
+    }
+    
+    public Map<String,String> getAnnotations() {
+        return annotations;
+    }
+    public void setAnnotations(Map<String,String> annotations) {
+        this.annotations = annotations;
+    }
+    
+    public void validate() throws SchemaProviderException {
+        if ( (getTo() == null) || (getTo().isEmpty()) ) {
+            throw new SchemaProviderException("Edge definition missing 'to'");
+        }
+        
+        if ( (getFrom() == null) || (getFrom().isEmpty()) ) {
+            throw new SchemaProviderException("Edge definition missing 'from'");
+        }
+        
+        if ( (getLabel() == null) || (getLabel().isEmpty()) ) {
+            throw new SchemaProviderException("Edge definition missing 'label'");
+        }
+    }
+    
+    public String toJson() {
+        return gson.toJson(this);
+    }
+    
+    public static JsonEdgeSchema fromJson(String json) {
+        return gson.fromJson(json, JsonEdgeSchema.class);
+    }
+    @Override
+    public String toString() {
+        return "JsonEdgeSchema [from=" + from + ", to=" + to + ", label=" + label + ", annotations="
+            + annotations + "]";
+    }
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((annotations == null) ? 0 : annotations.hashCode());
+        result = prime * result + ((from == null) ? 0 : from.hashCode());
+        result = prime * result + ((label == null) ? 0 : label.hashCode());
+        result = prime * result + ((to == null) ? 0 : to.hashCode());
+        return result;
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        JsonEdgeSchema other = (JsonEdgeSchema) obj;
+        if (annotations == null) {
+            if (other.annotations != null)
+                return false;
+        } else if (!annotations.equals(other.annotations))
+            return false;
+        if (from == null) {
+            if (other.from != null)
+                return false;
+        } else if (!from.equals(other.from))
+            return false;
+        if (label == null) {
+            if (other.label != null)
+                return false;
+        } else if (!label.equals(other.label))
+            return false;
+        if (to == null) {
+            if (other.to != null)
+                return false;
+        } else if (!to.equals(other.to))
+            return false;
+        return true;
+    }
+    
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonPropertySchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonPropertySchema.java
new file mode 100644
index 00000000..b6934eb8
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonPropertySchema.java
@@ -0,0 +1,192 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json.definitions;
+
+import java.util.Map;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.SerializedName;
+
+public class JsonPropertySchema {
+    private static final Gson gson = new GsonBuilder().create();
+    
+    private String name;
+    private Boolean required;
+    private Boolean unique;
+    
+    @SerializedName("type")
+    private String dataType;
+    
+    private String description;
+    
+    @SerializedName("default")
+    private String defaultValue;
+    
+    private Map<String,String> annotations;
+    
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Boolean getRequired() {
+        return required;
+    }
+
+    public void setRequired(Boolean required) {
+        this.required = required;
+    }
+
+    public Boolean getUnique() {
+        return unique;
+    }
+
+    public void setUnique(Boolean unique) {
+        this.unique = unique;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+    
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public void setDefaultValue(String defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    
+    public Map<String,String> getAnnotations() {
+        return annotations;
+    }
+
+    public void setAnnotations(Map<String,String> annotations) {
+        this.annotations = annotations;
+    }
+
+    public void validate() throws SchemaProviderException {
+        if ( (getName() == null) || (getName().isEmpty()) ) {
+            throw new SchemaProviderException(getName() + " property has no name");
+        }
+
+        if ( (getDataType() == null) || (getDataType().isEmpty()) ) {
+            throw new SchemaProviderException(getName() + " property has no type");
+        }
+    }
+
+
+    public String toJson() {
+        return gson.toJson(this);
+    }
+    
+    public static JsonVertexSchema fromJson(String json) {
+        return gson.fromJson(json, JsonVertexSchema.class);
+    }
+
+    @Override
+    public String toString() {
+        return "JsonPropertySchema [name=" + name + ", required=" + required + ", unique=" + unique
+            + ", dataType=" + dataType + ", description=" + description + ", defaultValue="
+            + defaultValue + ", annotations=" + annotations + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((annotations == null) ? 0 : annotations.hashCode());
+        result = prime * result + ((dataType == null) ? 0 : dataType.hashCode());
+        result = prime * result + ((defaultValue == null) ? 0 : defaultValue.hashCode());
+        result = prime * result + ((description == null) ? 0 : description.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((required == null) ? 0 : required.hashCode());
+        result = prime * result + ((unique == null) ? 0 : unique.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        JsonPropertySchema other = (JsonPropertySchema) obj;
+        if (annotations == null) {
+            if (other.annotations != null)
+                return false;
+        } else if (!annotations.equals(other.annotations))
+            return false;
+        if (dataType == null) {
+            if (other.dataType != null)
+                return false;
+        } else if (!dataType.equals(other.dataType))
+            return false;
+        if (defaultValue == null) {
+            if (other.defaultValue != null)
+                return false;
+        } else if (!defaultValue.equals(other.defaultValue))
+            return false;
+        if (description == null) {
+            if (other.description != null)
+                return false;
+        } else if (!description.equals(other.description))
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        if (required == null) {
+            if (other.required != null)
+                return false;
+        } else if (!required.equals(other.required))
+            return false;
+        if (unique == null) {
+            if (other.unique != null)
+                return false;
+        } else if (!unique.equals(other.unique))
+            return false;
+        return true;
+    }
+    
+    
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonSchema.java
new file mode 100644
index 00000000..b9cacb87
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonSchema.java
@@ -0,0 +1,167 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json.definitions;
+
+import java.util.List;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.SerializedName;
+
+public class JsonSchema {
+    private static final Gson gson = new GsonBuilder().create();
+
+    @SerializedName("relationship_types")
+    private List<JsonEdgeSchema> relationshipTypes;
+    
+    @SerializedName("node_types")
+    private List<JsonVertexSchema> nodeTypes;
+    
+    @SerializedName("data_types")
+    private List<DataTypeDefinition> dataTypes;
+    
+    @SerializedName("common_node_properties")
+    private List<JsonPropertySchema> commonNodeProps;
+
+    
+    public void setRelationshipTypes(List<JsonEdgeSchema> relationshipTypes) {
+		this.relationshipTypes = relationshipTypes;
+	}
+
+	public void setNodeTypes(List<JsonVertexSchema> nodeTypes) {
+		this.nodeTypes = nodeTypes;
+	}
+
+	public void setDataTypes(List<DataTypeDefinition> dataTypes) {
+		this.dataTypes = dataTypes;
+	}
+
+	public List<JsonEdgeSchema> getRelationshipTypes() {
+        return relationshipTypes;
+    }
+    
+    public List<JsonVertexSchema> getNodeTypes() {
+        return nodeTypes;
+    }
+    
+    public List<DataTypeDefinition> getDataTypes() {
+        return dataTypes;
+    }
+    
+    public List<JsonPropertySchema> getCommonProperties() {
+        return commonNodeProps;
+    }
+
+    public void setCommonProperties(List<JsonPropertySchema> properties) {
+        this.commonNodeProps = properties;
+    }
+    
+    public void validate() throws SchemaProviderException {
+        if (getNodeTypes() != null) {
+            for (JsonVertexSchema vertexSchema : getNodeTypes()) {
+                vertexSchema.validate();
+            }
+        }
+        
+        // Validate edges
+        if (getRelationshipTypes() != null) {
+            for (JsonEdgeSchema edgeSchema : getRelationshipTypes()) {
+                edgeSchema.validate();
+            }
+        }
+        
+        // Validate data types
+        if (getDataTypes() != null) {
+            for (DataTypeDefinition typeSchema : getDataTypes()) {
+                typeSchema.validate();
+            }
+        }
+    }
+    
+    public String toJson() {
+        return gson.toJson(this);
+    }
+
+    public static JsonSchema fromJson(String json) throws SchemaProviderException {
+        try {
+            if (json == null || json.isEmpty()) {
+                throw new SchemaProviderException("Empty schema definition");
+            }
+            
+            return gson.fromJson(json, JsonSchema.class);
+        } catch (Exception ex) {
+            throw new SchemaProviderException("Invalid json: " + ex.getMessage());
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "JsonSchema [relationshipTypes=" + relationshipTypes + ", nodeTypes=" + nodeTypes
+            + ", dataTypes=" + dataTypes + ", commonNodeProps=" + commonNodeProps + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((commonNodeProps == null) ? 0 : commonNodeProps.hashCode());
+        result = prime * result + ((dataTypes == null) ? 0 : dataTypes.hashCode());
+        result = prime * result + ((nodeTypes == null) ? 0 : nodeTypes.hashCode());
+        result = prime * result + ((relationshipTypes == null) ? 0 : relationshipTypes.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        JsonSchema other = (JsonSchema) obj;
+        if (commonNodeProps == null) {
+            if (other.commonNodeProps != null)
+                return false;
+        } else if (!commonNodeProps.equals(other.commonNodeProps))
+            return false;
+        if (dataTypes == null) {
+            if (other.dataTypes != null)
+                return false;
+        } else if (!dataTypes.equals(other.dataTypes))
+            return false;
+        if (nodeTypes == null) {
+            if (other.nodeTypes != null)
+                return false;
+        } else if (!nodeTypes.equals(other.nodeTypes))
+            return false;
+        if (relationshipTypes == null) {
+            if (other.relationshipTypes != null)
+                return false;
+        } else if (!relationshipTypes.equals(other.relationshipTypes))
+            return false;
+        return true;
+    }
+
+    
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonVertexSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonVertexSchema.java
new file mode 100644
index 00000000..87a1eac7
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/json/definitions/JsonVertexSchema.java
@@ -0,0 +1,141 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json.definitions;
+
+import java.util.List;
+import java.util.Map;
+
+import org.onap.aai.schemaif.SchemaProviderException;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class JsonVertexSchema {
+    private static final Gson gson = new GsonBuilder().create();
+    
+    private String name;
+    private String description;
+    private List<JsonPropertySchema> properties;
+    private Map<String,String> annotations;
+    
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<JsonPropertySchema> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(List<JsonPropertySchema> properties) {
+        this.properties = properties;
+    }
+    
+    public Map<String,String> getAnnotations() {
+        return annotations;
+    }
+
+    public void setAnnotations(Map<String,String> annotations) {
+        this.annotations = annotations;
+    }
+
+    public void validate() throws SchemaProviderException {
+        if ( (getName() == null) || (getName().isEmpty()) ) {
+            throw new SchemaProviderException("Node definition missing a name");
+        }
+
+        if (getProperties() != null) {
+            for (JsonPropertySchema propSchema : getProperties()) {
+                propSchema.validate();
+            }
+        }
+    }
+    
+    public String toJson() {
+        return gson.toJson(this);
+    }
+    
+    public static JsonVertexSchema fromJson(String json) {
+        return gson.fromJson(json, JsonVertexSchema.class);
+    }
+
+    @Override
+    public String toString() {
+        return "JsonVertexSchema [name=" + name + ", description=" + description + ", properties="
+            + properties + ", annotations=" + annotations + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((annotations == null) ? 0 : annotations.hashCode());
+        result = prime * result + ((description == null) ? 0 : description.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((properties == null) ? 0 : properties.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        JsonVertexSchema other = (JsonVertexSchema) obj;
+        if (annotations == null) {
+            if (other.annotations != null)
+                return false;
+        } else if (!annotations.equals(other.annotations))
+            return false;
+        if (description == null) {
+            if (other.description != null)
+                return false;
+        } else if (!description.equals(other.description))
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        if (properties == null) {
+            if (other.properties != null)
+                return false;
+        } else if (!properties.equals(other.properties))
+            return false;
+        return true;
+    }
+    
+    
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/EdgePropsConfiguration.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/EdgePropsConfiguration.java
new file mode 100644
index 00000000..bd30e77e
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/EdgePropsConfiguration.java
@@ -0,0 +1,42 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+@Component
+@PropertySource(value = "file:${edgeprops.ingest.file}", ignoreResourceNotFound = true)
+public class EdgePropsConfiguration {
+
+    @Value("${edgePropsDir}")
+    private String edgePropsDir;
+
+    public String getEdgePropsDir() {
+        return edgePropsDir;
+    }
+
+    public void setEdgePropsDir(String edgePropsDir) {
+        this.edgePropsDir = edgePropsDir;
+    }
+
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmEdgeSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmEdgeSchema.java
new file mode 100644
index 00000000..336b6d9e
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmEdgeSchema.java
@@ -0,0 +1,75 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+import java.util.HashMap;
+
+import org.onap.aai.edges.EdgeRule;
+import org.onap.aai.edges.enums.EdgeProperty;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.EdgeSchema;
+import org.onap.aai.schemaif.definitions.PropertySchema;
+import org.onap.aai.schemaif.definitions.types.DataType;
+
+
+public class FromOxmEdgeSchema extends EdgeSchema {
+
+    public void fromEdgeRule(EdgeRule edgeRule) throws SchemaProviderException {
+        name = edgeRule.getLabel();
+        source = edgeRule.getFrom();
+        target = edgeRule.getTo();
+        
+        switch (edgeRule.getMultiplicityRule()) {
+            case MANY2MANY:
+                multiplicity = Multiplicity.MANY_2_MANY;
+                break;
+            case MANY2ONE:
+                multiplicity = Multiplicity.MANY_2_ONE;
+                break;
+            case ONE2MANY:
+                multiplicity = Multiplicity.ONE_2_MANY;
+                break;
+            case ONE2ONE:
+                multiplicity = Multiplicity.ONE_2_ONE;
+                break;
+        }
+
+        annotations = new HashMap<String,String>();
+        properties = new HashMap<String,PropertySchema>();
+        
+        // TODO:  For now these are hard-coded ... should read them from a config file or something
+        annotations.put(EdgeProperty.CONTAINS.toString().toLowerCase(), edgeRule.getContains());
+        annotations.put(EdgeProperty.DELETE_OTHER_V.toString().toLowerCase(), edgeRule.getDeleteOtherV());
+        annotations.put(EdgeProperty.PREVENT_DELETE.toString().toLowerCase(), edgeRule.getPreventDelete());
+        
+        FromOxmPropertySchema pSchema = new FromOxmPropertySchema();
+        pSchema.fromRelationship(EdgeProperty.CONTAINS.toString(), DataType.Type.STRING);
+        properties.put(EdgeProperty.CONTAINS.toString().toLowerCase(), pSchema);
+        
+        pSchema = new FromOxmPropertySchema();
+        pSchema.fromRelationship(EdgeProperty.DELETE_OTHER_V.toString(), DataType.Type.STRING);
+        properties.put(EdgeProperty.DELETE_OTHER_V.toString().toLowerCase(), pSchema);
+        
+        pSchema = new FromOxmPropertySchema();
+        pSchema.fromRelationship(EdgeProperty.PREVENT_DELETE.toString(), DataType.Type.STRING);
+        properties.put(EdgeProperty.PREVENT_DELETE.toString().toLowerCase(), pSchema);
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmPropertySchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmPropertySchema.java
new file mode 100644
index 00000000..2174bce2
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmPropertySchema.java
@@ -0,0 +1,141 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.persistence.dynamic.DynamicType;
+import org.eclipse.persistence.internal.helper.DatabaseField;
+import org.eclipse.persistence.mappings.DatabaseMapping;
+import org.eclipse.persistence.oxm.XMLField;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.PropertySchema;
+import org.onap.aai.schemaif.definitions.types.BooleanDataType;
+import org.onap.aai.schemaif.definitions.types.DataType;
+import org.onap.aai.schemaif.definitions.types.FloatDataType;
+import org.onap.aai.schemaif.definitions.types.IntDataType;
+import org.onap.aai.schemaif.definitions.types.LongDataType;
+import org.onap.aai.schemaif.definitions.types.StringDataType;
+
+
+public class FromOxmPropertySchema extends PropertySchema {
+
+    // Handle vertex properties from OXM
+    public void fromOxm(DatabaseMapping mapping, DynamicType dynType, boolean reserved) throws SchemaProviderException {
+        DatabaseField field = mapping.getField();
+        if (field.getName().contains("/")) {
+            name = field.getName().substring(0, field.getName().indexOf("/"));
+        } else {
+            name = field.getName();
+        }
+
+        defaultValue = mapping.getProperties().get("defaultValue") == null ? ""
+                : mapping.getProperties().get("defaultValue").toString();
+
+        if (isPrimaryKeyOxm(name, dynType)) {
+            unique = true;
+            required = true;
+        }
+        else {
+            required = ((XMLField) field).isRequired();
+            unique = false;
+        }
+
+        isReserved = reserved;
+
+        String oxmType = ((XMLField) field).getTypeName() != null ? ((XMLField) field).getTypeName() : "";
+        if (!mapping.isAbstractDirectMapping()) {
+            // treat complex types as string blobs in oxm
+            dataType = new StringDataType();
+        } else {
+            if (oxmType.equalsIgnoreCase("java.lang.String")) {
+                dataType = new StringDataType();
+            } else if (oxmType.equalsIgnoreCase("java.lang.Long")) {
+                dataType = new LongDataType();
+            } else if (oxmType.equalsIgnoreCase("java.lang.Boolean")) {
+                dataType = new BooleanDataType();
+            } else if (oxmType.equalsIgnoreCase("java.lang.Integer")) {
+                dataType = new IntDataType();
+            } else if (oxmType.equalsIgnoreCase("java.lang.Float")) {
+                dataType = new FloatDataType();
+            } else {
+                throw new SchemaProviderException("Invalid OXM property type: " + oxmType);
+            }
+        }
+        
+        // Check annotations
+        annotations = new HashMap<String,String>();
+        Map<String, Object> oxmProps = mapping.getProperties();
+        for (Map.Entry<String, Object> entry : oxmProps.entrySet()) {
+            if (entry.getValue() instanceof String) {
+                annotations.put(entry.getKey().toLowerCase(), (String)entry.getValue());
+            }
+        }
+    }
+
+    // Handle edge properties from DBEdgeRules
+    public void fromRelationship(String propName, DataType.Type propDataType) throws SchemaProviderException {
+        name = propName;
+        required = false;
+        defaultValue = "";
+        unique = false;
+        annotations = new HashMap<String,String>();
+        
+        switch (propDataType) {
+            case STRING:
+                dataType = new StringDataType();
+                break;
+            case INT:
+                dataType = new IntDataType();
+                break;
+            case FLOAT:
+                dataType = new FloatDataType();
+                break;
+            case LONG:
+                dataType = new LongDataType();
+                break;
+            case BOOL:
+                dataType = new BooleanDataType();
+                break;
+            default:
+                throw new SchemaProviderException("Invalid EdgeRule property type: " + propDataType);    
+        }
+    }
+    
+    private boolean isPrimaryKeyOxm(String propName, DynamicType dynType) {
+        List<String> primaryKeyList = dynType.getDescriptor().getPrimaryKeyFieldNames();
+        if ( (primaryKeyList == null) || (primaryKeyList.size() == 0) ) {
+            return false;
+        }
+
+        for (String key : primaryKeyList) {
+            String keyName = key.substring(0, key.indexOf('/'));
+            if (keyName.equals(propName)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmVertexSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmVertexSchema.java
new file mode 100644
index 00000000..6083429b
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/FromOxmVertexSchema.java
@@ -0,0 +1,95 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.persistence.dynamic.DynamicType;
+import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
+import org.eclipse.persistence.mappings.DatabaseMapping;
+import org.eclipse.persistence.oxm.mappings.XMLAnyCollectionMapping;
+import org.eclipse.persistence.oxm.mappings.XMLAnyObjectMapping;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.PropertySchema;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+
+import com.google.common.base.CaseFormat;
+
+public class FromOxmVertexSchema extends VertexSchema {
+    public void fromOxm(String vertexType, DynamicJAXBContext jaxbContext, HashMap<String, DynamicType> xmlElementLookup) throws SchemaProviderException {
+        name = vertexType;
+        properties = new HashMap<String,PropertySchema>();
+        annotations = new HashMap<String,String>();
+
+        String javaTypeName = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, vertexType);
+        DynamicType modelObjectType = jaxbContext.getDynamicType(javaTypeName);
+
+        if (modelObjectType == null) {
+            // Try to lookup by xml root element by exact match
+            modelObjectType = xmlElementLookup.get(vertexType);
+        }
+
+        if (modelObjectType == null) {
+            // Try to lookup by xml root element by lowercase
+            modelObjectType = xmlElementLookup.get(vertexType.toLowerCase());
+        }
+
+        if (modelObjectType == null) {
+            // Direct lookup as java-type name
+            modelObjectType = jaxbContext.getDynamicType(vertexType);
+        }
+
+        if (modelObjectType == null) {
+            // Vertex isn't found in the OXM
+            throw new SchemaProviderException("Vertex " + vertexType + " not found in OXM");
+        }
+        
+        // Check annotations
+        Map<String, Object> oxmProps = modelObjectType.getDescriptor().getProperties();
+        for (Map.Entry<String, Object> entry : oxmProps.entrySet()) {
+            if (entry.getValue() instanceof String) {
+                annotations.put(entry.getKey().toLowerCase(), (String)entry.getValue());
+            }
+        }
+
+        // Regular props
+        for (DatabaseMapping mapping : modelObjectType.getDescriptor().getMappings()) {
+            if (mapping instanceof XMLAnyObjectMapping)
+              continue;
+            if(mapping instanceof XMLAnyCollectionMapping)
+              continue;
+            FromOxmPropertySchema propSchema = new FromOxmPropertySchema();
+            propSchema.fromOxm(mapping, modelObjectType, false);
+            properties.put(propSchema.getName().toLowerCase(), propSchema);
+        }
+
+        // Reserved Props
+        final DynamicType reservedType = jaxbContext.getDynamicType("ReservedPropNames");
+        for (DatabaseMapping mapping : reservedType.getDescriptor().getMappings()) {
+            if (mapping.isAbstractDirectMapping()) {
+                FromOxmPropertySchema propSchema = new FromOxmPropertySchema();
+                propSchema.fromOxm(mapping, reservedType, true);
+                properties.put(propSchema.getName().toLowerCase(), propSchema);
+            }
+        } 
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmEdgeRulesLoader.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmEdgeRulesLoader.java
new file mode 100644
index 00000000..39e7039f
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmEdgeRulesLoader.java
@@ -0,0 +1,246 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+import com.google.common.collect.Multimap;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import org.apache.commons.io.IOUtils;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.edges.EdgeIngestor;
+import org.onap.aai.edges.EdgeRule;
+import org.onap.aai.edges.exceptions.EdgeRuleNotFoundException;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.SchemaProviderMsgs;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.Translator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OxmEdgeRulesLoader {
+
+    private static Translator translator;
+    private static EdgeIngestor edgeIngestor;
+
+    private static EdgePropsConfiguration edgePropsConfiguration;
+
+    private static Map<String, RelationshipSchema> versionContextMap = new ConcurrentHashMap<>();
+
+    static final Pattern versionPattern = Pattern.compile("(?i)v(\\d*)");
+    static final String propsPrefix = "edge_properties_";
+    static final String propsSuffix = ".json";
+    final static Pattern propsFilePattern = Pattern.compile(propsPrefix + "(.*)" + propsSuffix);
+    final static Pattern propsVersionPattern = Pattern.compile("(?i)v\\d*");
+
+    private static org.onap.aai.cl.api.Logger logger =
+            LoggerFactory.getInstance().getLogger(OxmEdgeRulesLoader.class.getName());
+
+    private OxmEdgeRulesLoader() {}
+
+    /**
+     * This constructor presents an awkward marrying of Spring bean creation and static method use. This
+     * is technical debt that will need fixing.
+     *
+     * @param translator contains schema versions configuration
+     * @param edgeIngestor provides edge rules
+     * @param edgePropsConfiguration edge property validation configuration
+     */
+    @Autowired
+    public OxmEdgeRulesLoader(Translator translator, EdgeIngestor edgeIngestor,
+            EdgePropsConfiguration edgePropsConfiguration) {
+        OxmEdgeRulesLoader.translator = translator;
+        OxmEdgeRulesLoader.edgeIngestor = edgeIngestor;
+        OxmEdgeRulesLoader.edgePropsConfiguration = edgePropsConfiguration;
+    }
+
+    /**
+     * Finds all DB Edge Rules and Edge Properties files for all OXM models.
+     *
+     * @throws SchemaProviderException
+     * @throws SchemaProviderException 
+     */
+    public static synchronized void loadModels() throws SchemaProviderException {
+        Map<String, File> propFiles = edgePropertyFiles(edgePropsConfiguration);
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("Loading DB Edge Rules");
+        }
+
+        for (String version : OxmSchemaLoader.getLoadedOXMVersions()) {
+            try {
+                SchemaVersion schemaVersion = translator.getSchemaVersions().getVersions().stream()
+                        .filter(s -> s.toString().equalsIgnoreCase(version)).findAny().orElse(null);
+                loadModel(schemaVersion, edgeIngestor, propFiles);
+            } catch (IOException | EdgeRuleNotFoundException e) {
+                throw new SchemaProviderException(e.getMessage(), e);
+            }
+        }
+    }
+
+    /**
+     * Loads DB Edge Rules and Edge Properties for a given version.
+     *
+     * @throws SchemaProviderException
+     */
+
+    public static synchronized void loadModels(String v) throws SchemaProviderException {
+        Map<String, File> propFiles = edgePropertyFiles(edgePropsConfiguration);
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("Loading DB Edge Rules ");
+        }
+
+        try {
+            SchemaVersion schemaVersion = translator.getSchemaVersions().getVersions().stream()
+                    .filter(s -> s.toString().equalsIgnoreCase(v)).findAny().orElse(null);
+
+            loadModel(schemaVersion, edgeIngestor, propFiles);
+        } catch (IOException | EdgeRuleNotFoundException e) {
+            throw new SchemaProviderException(e.getMessage());
+        }
+    }
+
+    /**
+     * Retrieves the DB Edge Rule relationship schema for a given version.
+     *
+     * @param version - The OXM version that we want the DB Edge Rule for.
+     * @return - A RelationshipSchema of the DB Edge Rule for the OXM version.
+     * @throws SchemaProviderException
+     */
+    public static RelationshipSchema getSchemaForVersion(String version) throws SchemaProviderException {
+
+        // If we haven't already loaded in the available OXM models, then do so now.
+        if (versionContextMap == null || versionContextMap.isEmpty()) {
+            loadModels();
+        } else if (!versionContextMap.containsKey(version)) {
+            logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "Error loading DB Edge Rules for: " + version);
+            throw new SchemaProviderException("Error loading DB Edge Rules for: " + version);
+        }
+
+        return versionContextMap.get(version);
+    }
+
+    /**
+     * Retrieves the DB Edge Rule relationship schema for all loaded OXM versions.
+     *
+     * @return - A Map of the OXM version and it's corresponding RelationshipSchema of the DB Edge Rule.
+     * @throws SchemaProviderException
+     */
+    public static Map<String, RelationshipSchema> getSchemas() throws SchemaProviderException {
+
+        // If we haven't already loaded in the available OXM models, then do so now.
+        if (versionContextMap == null || versionContextMap.isEmpty()) {
+            loadModels();
+        }
+        return versionContextMap;
+    }
+
+    /**
+     * Returns the latest available DB Edge Rule version.
+     *
+     * @return - A Map of the OXM version and it's corresponding RelationshipSchema of the DB Edge Rule.
+     * @throws SchemaProviderException
+     */
+    public static String getLatestSchemaVersion() throws SchemaProviderException {
+
+        // If we haven't already loaded in the available OXM models, then do so now.
+        if (versionContextMap == null || versionContextMap.isEmpty()) {
+            loadModels();
+        }
+
+        // If there are still no models available, then there's not much we can do...
+        if (versionContextMap.isEmpty()) {
+            logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "No available DB Edge Rules to get latest version for.");
+            throw new SchemaProviderException("No available DB Edge Rules to get latest version for.");
+        }
+
+        // Iterate over the available model versions to determine which is the most
+        // recent.
+        Integer latestVersion = null;
+        String latestVersionStr = null;
+        for (String versionKey : versionContextMap.keySet()) {
+
+            Matcher matcher = versionPattern.matcher(versionKey);
+            if (matcher.find()) {
+
+                int currentVersion = Integer.parseInt(matcher.group(1));
+
+                if ((latestVersion == null) || (currentVersion > latestVersion)) {
+                    latestVersion = currentVersion;
+                    latestVersionStr = versionKey;
+                }
+            }
+        }
+
+        return latestVersionStr;
+    }
+
+    /**
+     * Reset the loaded DB Edge Rule schemas
+     *
+     */
+    public static void resetSchemaVersionContext() {
+        versionContextMap = new ConcurrentHashMap<>();
+    }
+
+    private static synchronized void loadModel(SchemaVersion version, EdgeIngestor edgeIngestor,
+            Map<String, File> props) throws IOException, SchemaProviderException, EdgeRuleNotFoundException {
+
+        Multimap<String, EdgeRule> edges = edgeIngestor.getAllRules(version);
+        String edgeProps;
+        if (props.get(version.toString().toLowerCase()) != null) {
+            edgeProps = IOUtils.toString(new FileInputStream(props.get(version.toString().toLowerCase())), "UTF-8");
+        } else {
+            throw new FileNotFoundException("The Edge Properties file for OXM version " + version + "was not found.");
+        }
+        if (edges != null) {
+            RelationshipSchema rs = new RelationshipSchema(edges, edgeProps);
+            versionContextMap.put(version.toString().toLowerCase(), rs);
+            logger.info(SchemaProviderMsgs.LOADED_DB_RULE_FILE, version.toString());
+        }
+    }
+
+    private static Map<String, File> edgePropertyFiles(EdgePropsConfiguration edgePropsConfiguration)
+            throws SchemaProviderException {
+        Map<String, File> propsFiles = Arrays
+                .stream(new File(edgePropsConfiguration.getEdgePropsDir())
+                        .listFiles((d, name) -> propsFilePattern.matcher(name).matches()))
+                .collect(Collectors.toMap(new Function<File, String>() {
+                    @Override
+                    public String apply(File f) {
+                        Matcher m1 = propsVersionPattern.matcher(f.getName());
+                        m1.find();
+                        return m1.group(0);
+                    }
+                }, f -> f));
+        return propsFiles;
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java
new file mode 100644
index 00000000..b3708b12
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaLoader.java
@@ -0,0 +1,236 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.persistence.dynamic.DynamicType;
+import org.eclipse.persistence.internal.oxm.mappings.Descriptor;
+import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.nodes.NodeIngestor;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.SchemaProviderMsgs;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.Translator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class contains all of the logic for importing OXM model schemas from the available OXM
+ * schema files.
+ */
+@Component
+public class OxmSchemaLoader {
+
+    private static Translator translator;
+    private static NodeIngestor nodeIngestor;
+
+    private static Map<String, DynamicJAXBContext> versionContextMap = new ConcurrentHashMap<>();
+    private static Map<String, HashMap<String, DynamicType>> xmlElementLookup = new ConcurrentHashMap<>();
+    private static Map<String, HashMap<String, VertexSchema>> vertexLookup = new ConcurrentHashMap<>();
+
+    final static Pattern versionPattern = Pattern.compile("(?i)v(\\d*)");
+
+    private static org.onap.aai.cl.api.Logger logger =
+            LoggerFactory.getInstance().getLogger(OxmSchemaLoader.class.getName());
+
+    private OxmSchemaLoader() {}
+
+    /**
+     * This constructor presents an awkward marrying of Spring bean creation and static method use. This
+     * is technical debt that will need fixing.
+     *
+     * @param translator contains schema versions configuration
+     * @param nodeIngestor provides DynamicJAXBContext for the OXM version
+     */
+    @Autowired
+    public OxmSchemaLoader(Translator translator, NodeIngestor nodeIngestor) {
+        OxmSchemaLoader.translator = translator;
+        OxmSchemaLoader.nodeIngestor = nodeIngestor;
+    }
+
+    /**
+     * Finds all OXM model files
+     *
+     * @throws SchemaProviderException
+     * @throws IOException
+     *
+     */
+    public synchronized static void loadModels() throws SchemaProviderException {
+        if (logger.isDebugEnabled()) {
+            logger.debug("Loading OXM Models");
+        }
+
+        for (SchemaVersion oxmVersion : translator.getSchemaVersions().getVersions()) {
+            DynamicJAXBContext jaxbContext = nodeIngestor.getContextForVersion(oxmVersion);
+            if (jaxbContext != null) {
+                loadModel(oxmVersion.toString(), jaxbContext);
+            }
+        }
+    }
+
+    private synchronized static void loadModel(String oxmVersion, DynamicJAXBContext jaxbContext) {
+        versionContextMap.put(oxmVersion, jaxbContext);
+        loadXmlLookupMap(oxmVersion, jaxbContext);
+        loadVertexLookupMap(oxmVersion, jaxbContext);
+        logger.info(SchemaProviderMsgs.LOADED_SCHEMA_FILE, oxmVersion);
+    }
+
+    /**
+     * Retrieves the JAXB context for the specified OXM model version.
+     *
+     * @param version - The OXM version that we want the JAXB context for.
+     *
+     * @return - A JAXB context derived from the OXM model schema.
+     *
+     * @throws SchemaProviderException
+     */
+    public static DynamicJAXBContext getContextForVersion(String version) throws SchemaProviderException {
+
+        // If we haven't already loaded in the available OXM models, then do so now.
+        if (versionContextMap == null || versionContextMap.isEmpty()) {
+            loadModels();
+        } else if (!versionContextMap.containsKey(version)) {
+            throw new SchemaProviderException("Error loading oxm model: " + version);
+        }
+
+        return versionContextMap.get(version);
+    }
+
+    public static String getLatestVersion() throws SchemaProviderException {
+
+        // If we haven't already loaded in the available OXM models, then do so now.
+        if (versionContextMap == null || versionContextMap.isEmpty()) {
+            loadModels();
+        }
+
+        // If there are still no models available, then there's not much we can do...
+        if (versionContextMap.isEmpty()) {
+            throw new SchemaProviderException("No available OXM schemas to get latest version for.");
+        }
+
+        // Iterate over the available model versions to determine which is the most
+        // recent.
+        Integer latestVersion = null;
+        String latestVersionStr = null;
+        for (String versionKey : versionContextMap.keySet()) {
+
+            Matcher matcher = versionPattern.matcher(versionKey);
+            if (matcher.find()) {
+
+                int currentVersion = Integer.valueOf(matcher.group(1));
+
+                if ((latestVersion == null) || (currentVersion > latestVersion)) {
+                    latestVersion = currentVersion;
+                    latestVersionStr = versionKey;
+                }
+            }
+        }
+
+        return latestVersionStr;
+    }
+
+    private static void loadXmlLookupMap(String version, DynamicJAXBContext jaxbContext) {
+
+        @SuppressWarnings("rawtypes")
+        List<Descriptor> descriptorsList = jaxbContext.getXMLContext().getDescriptors();
+        HashMap<String, DynamicType> types = new HashMap<String, DynamicType>();
+
+        for (@SuppressWarnings("rawtypes")
+        Descriptor desc : descriptorsList) {
+
+            DynamicType entity = jaxbContext.getDynamicType(desc.getAlias());
+            String entityName = desc.getDefaultRootElement();
+            types.put(entityName, entity);
+        }
+        xmlElementLookup.put(version, types);
+    }
+    
+    private static void loadVertexLookupMap(String version, DynamicJAXBContext jaxbContext) {
+
+      @SuppressWarnings("rawtypes")
+      List<Descriptor> descriptorsList = jaxbContext.getXMLContext().getDescriptors();
+      HashMap<String, VertexSchema> vertexMap = new HashMap<String, VertexSchema>();
+
+      for (@SuppressWarnings("rawtypes")
+      Descriptor desc : descriptorsList) {
+        try {
+          FromOxmVertexSchema vs = new FromOxmVertexSchema();
+          vs.fromOxm(desc.getDefaultRootElement(), jaxbContext, getXmlLookupMap(version));
+          vertexMap.put(vs.getName(), vs);
+        } catch (SchemaProviderException e) {
+          continue;
+        }
+      }
+      vertexLookup.put(version, vertexMap);
+    }
+
+    /**
+     * Retrieves the list of all Loaded OXM versions.
+     *
+     * @return - A List of Strings of all loaded OXM versions.
+     *
+     * @throws SpikeException
+     */
+    public static List<String> getLoadedOXMVersions() throws SchemaProviderException {
+        // If we haven't already loaded in the available OXM models, then do so now.
+        if (versionContextMap == null || versionContextMap.isEmpty()) {
+            loadModels();
+        }
+        // If there are still no models available, then there's not much we can do...
+        if (versionContextMap.isEmpty()) {
+            logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "No available OXM schemas to get versions for.");
+            throw new SchemaProviderException("No available OXM schemas to get latest version for.");
+        }
+        List<String> versions = new ArrayList<String>();
+        for (String versionKey : versionContextMap.keySet()) {
+            Matcher matcher = versionPattern.matcher(versionKey);
+            if (matcher.find()) {
+                versions.add("V" + matcher.group(1));
+            }
+        }
+        return versions;
+    }
+
+    public static HashMap<String, DynamicType> getXmlLookupMap(String version) {
+        return xmlElementLookup.get(version);
+    }
+
+    public static HashMap<String, VertexSchema> getVertexLookupForVersion(String version) throws SchemaProviderException {
+      // If we haven't already loaded in the available OXM models, then do so now.
+      if (vertexLookup == null || vertexLookup.isEmpty()) {
+          loadModels();
+      } else if (!vertexLookup.containsKey(version)) {
+          throw new SchemaProviderException("Error loading oxm model: " + version);
+      }
+      return vertexLookup.get(version);
+    }
+
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaProvider.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaProvider.java
new file mode 100644
index 00000000..0ad8bf45
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/OxmSchemaProvider.java
@@ -0,0 +1,117 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext;
+import org.onap.aai.edges.EdgeRule;
+import org.onap.aai.schemaif.SchemaProvider;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.EdgeSchema;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+
+
+public class OxmSchemaProvider implements SchemaProvider {
+
+    @Override
+    public void loadSchema() throws SchemaProviderException {
+        OxmEdgeRulesLoader.loadModels();
+        OxmSchemaLoader.loadModels();
+    }
+    
+    @Override
+    public String getLatestSchemaVersion() throws SchemaProviderException {
+        return OxmSchemaLoader.getLatestVersion();
+    }
+
+    @Override
+    public VertexSchema getVertexSchema(String vertexName, String schemaVersion) throws SchemaProviderException {
+        DynamicJAXBContext jaxbContext = OxmSchemaLoader.getContextForVersion(schemaVersion);
+        FromOxmVertexSchema vs = new FromOxmVertexSchema();
+
+        try {
+            vs.fromOxm(vertexName, jaxbContext, OxmSchemaLoader.getXmlLookupMap(schemaVersion));
+        }
+        catch (SchemaProviderException ex) {
+            // Node doesn't exist in schema.  Return null.
+            return null;
+        }
+
+        return vs;
+    }
+
+    @Override
+    public EdgeSchema getEdgeSchema(String edgeType, String sourceVertex, String targetVertex, String version)
+            throws SchemaProviderException {
+        RelationshipSchema relSchema = OxmEdgeRulesLoader.getSchemaForVersion(version);
+        String key = sourceVertex + ":" + targetVertex + ":" + edgeType;
+
+        EdgeRule edgeRule = relSchema.lookupEdgeRule(key);
+        if (edgeRule == null) {
+            return null;
+        }
+        
+        FromOxmEdgeSchema es = new FromOxmEdgeSchema();
+        es.fromEdgeRule(edgeRule);
+        
+        return es;
+    }
+
+    @Override
+    public Set<EdgeSchema> getAdjacentEdgeSchema(String vertexType, String version) throws SchemaProviderException {
+        RelationshipSchema relSchema = OxmEdgeRulesLoader.getSchemaForVersion(version);
+        Set<EdgeSchema> edges = new HashSet<EdgeSchema>();
+        List<EdgeRule> rules = relSchema.lookupAdjacentEdges(vertexType);
+        
+        for (EdgeRule rule : rules) {
+            FromOxmEdgeSchema es = new FromOxmEdgeSchema();
+            es.fromEdgeRule(rule);
+            edges.add(es);
+        }
+        
+        return edges;
+    }
+    
+    @Override
+    public Set<EdgeSchema> getEdgeSchemaForSourceTarget(String sourceType, String targetType, String version) throws SchemaProviderException {
+        RelationshipSchema relSchema = OxmEdgeRulesLoader.getSchemaForVersion(version);
+        Set<EdgeSchema> edges = new HashSet<EdgeSchema>();
+        Set<String> relTypes = relSchema.getValidRelationTypes(sourceType, targetType);
+        
+        for (String type : relTypes) {
+            EdgeSchema edgeSchema = getEdgeSchema(type, sourceType, targetType, version);
+            if (edgeSchema != null) {
+                edges.add(edgeSchema);
+            }
+        }
+        
+        return edges;
+    }
+
+    @Override
+    public Map<String, VertexSchema> getVertexMap(String schemaVersion) throws SchemaProviderException {
+      return OxmSchemaLoader.getVertexLookupForVersion(schemaVersion);
+    }
+}
diff --git a/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/RelationshipSchema.java b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/RelationshipSchema.java
new file mode 100644
index 00000000..fa4fe45d
--- /dev/null
+++ b/aai-schema-abstraction/src/main/java/org/onap/aai/schemaif/oxm/RelationshipSchema.java
@@ -0,0 +1,189 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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=========================================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+package org.onap.aai.schemaif.oxm;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.onap.aai.cl.eelf.LoggerFactory;
+import org.onap.aai.edges.EdgeRule;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.SchemaProviderMsgs;
+
+import com.google.common.collect.Multimap;
+
+
+public class RelationshipSchema {
+
+
+    public static final String SCHEMA_SOURCE_NODE_TYPE = "from";
+    public static final String SCHEMA_TARGET_NODE_TYPE = "to";
+    public static final String SCHEMA_RELATIONSHIP_TYPE = "label";
+    public static final String SCHEMA_RULES_ARRAY = "rules";
+
+    private static org.onap.aai.cl.api.Logger logger =
+            LoggerFactory.getInstance().getLogger(RelationshipSchema.class.getName());
+
+    private Map<String, Map<String, Class<?>>> relations = new HashMap<>();
+    /**
+     * Hashmap of valid relationship types along with properties.
+     */
+    private Map<String, Map<String, Class<?>>> relationTypes = new HashMap<>();
+    private Map<String, EdgeRule> relationshipRules = new HashMap<>();
+
+    // A map storing the list of valid edge types for a source/target pair
+    private Map<String, Set<String>> edgeTypesForNodePair = new HashMap<>();
+
+
+    public RelationshipSchema(Multimap<String, EdgeRule> rules, String props) throws SchemaProviderException, IOException {
+        HashMap<String, String> properties = new ObjectMapper().readValue(props, HashMap.class);
+
+        // hold the true values of the edge rules by key 
+        for (EdgeRule rule : rules.values()) {
+            String nodePairKey = buildNodePairKey(rule.getFrom(), rule.getTo());
+            if (edgeTypesForNodePair.get(nodePairKey) == null) {
+                Set<String> typeSet = new HashSet<String>();
+                typeSet.add(rule.getLabel());
+                edgeTypesForNodePair.put(nodePairKey, typeSet);
+            }
+            else {
+                edgeTypesForNodePair.get(nodePairKey).add(rule.getLabel());
+            }
+
+            String key = buildRelation(rule.getFrom(), rule.getTo(), rule.getLabel());
+            relationshipRules.put(key, rule);
+        }
+
+        Map<String, Class<?>> edgeProps =
+                properties.entrySet().stream().collect(Collectors.toMap(p -> p.getKey(), p -> {
+                    try {
+                        return resolveClass(p.getValue());
+                    } catch (SchemaProviderException | ClassNotFoundException e) {
+                        logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "Error in RelationshipSchema: " + e);
+                    }
+                    return null;
+                }));
+
+        rules.entries().forEach((kv) -> {
+            relationTypes.put(kv.getValue().getLabel(), edgeProps);
+            relations.put(buildRelation(kv.getValue().getFrom(), kv.getValue().getTo(), kv.getValue().getLabel()),
+                    edgeProps);
+        });
+    }
+
+    public EdgeRule lookupEdgeRule(String key) throws SchemaProviderException {
+        return relationshipRules.get(key);
+    }
+
+    public List<EdgeRule> lookupAdjacentEdges(String vertex) throws SchemaProviderException {
+        List<EdgeRule> edges = new ArrayList<EdgeRule>();
+        for (EdgeRule rule : relationshipRules.values()) {
+            if (rule.getFrom().equals(vertex) || rule.getTo().equals(vertex)) {
+                edges.add(rule);
+            }
+        }
+
+        return edges;
+    }
+
+    public RelationshipSchema(List<String> jsonStrings) throws SchemaProviderException, IOException {
+        String edgeRules = jsonStrings.get(0);
+        String props = jsonStrings.get(1);
+
+        HashMap<String, ArrayList<LinkedHashMap<String, String>>> rules =
+                new ObjectMapper().readValue(edgeRules, HashMap.class);
+        HashMap<String, String> properties = new ObjectMapper().readValue(props, HashMap.class);
+        Map<String, Class<?>> edgeProps =
+                properties.entrySet().stream().collect(Collectors.toMap(p -> p.getKey(), p -> {
+                    try {
+                        return resolveClass(p.getValue());
+                    } catch (SchemaProviderException | ClassNotFoundException e) {
+                        logger.error(SchemaProviderMsgs.SCHEMA_LOAD_ERROR, "Error in RelationshipSchema: " + e);
+                    }
+                    return null;
+                }));
+
+        rules.get(SCHEMA_RULES_ARRAY).forEach(l -> {
+            relationTypes.put(l.get(SCHEMA_RELATIONSHIP_TYPE), edgeProps);
+            relations.put(buildRelation(l.get(SCHEMA_SOURCE_NODE_TYPE), l.get(SCHEMA_TARGET_NODE_TYPE),
+                    l.get(SCHEMA_RELATIONSHIP_TYPE)), edgeProps);
+        });
+    }
+
+
+
+    public Map<String, Class<?>> lookupRelation(String key) {
+        return this.relations.get(key);
+    }
+
+    public Map<String, Class<?>> lookupRelationType(String type) {
+        return this.relationTypes.get(type);
+    }
+
+    public boolean isValidType(String type) {
+        return relationTypes.containsKey(type);
+    }
+
+
+    private String buildRelation(String source, String target, String relation) {
+        return source + ":" + target + ":" + relation;
+    }
+
+    public Set<String> getValidRelationTypes(String source, String target) {
+        Set<String> typeList = edgeTypesForNodePair.get(buildNodePairKey(source, target));
+
+        if (typeList == null) {
+            return new HashSet<String>();
+        }
+
+        return typeList;
+    }
+
+    private String buildNodePairKey(String source, String target) {
+        return source + ":" + target;
+    }
+
+
+    private Class<?> resolveClass(String type) throws SchemaProviderException, ClassNotFoundException {
+        Class<?> clazz = Class.forName(type);
+        validateClassTypes(clazz);
+        return clazz;
+    }
+
+    private void validateClassTypes(Class<?> clazz) throws SchemaProviderException {
+        if (!clazz.isAssignableFrom(Integer.class) && !clazz.isAssignableFrom(Double.class)
+                && !clazz.isAssignableFrom(Boolean.class) && !clazz.isAssignableFrom(String.class)) {
+            throw new SchemaProviderException("BAD_REQUEST");
+        }
+    }
+}
+
+
diff --git a/aai-schema-abstraction/src/main/resources/logging/SchemaProviderMsgs.properties b/aai-schema-abstraction/src/main/resources/logging/SchemaProviderMsgs.properties
new file mode 100644
index 00000000..0feb2acd
--- /dev/null
+++ b/aai-schema-abstraction/src/main/resources/logging/SchemaProviderMsgs.properties
@@ -0,0 +1,16 @@
+            
+## Error Logs
+SCHEMA_LOAD_ERROR=\
+            PVD0500E|\
+            Unable to load schema: {0}
+
+## Info Logs 
+LOADED_SCHEMA_FILE=\
+            PVD0001I|\
+            Successfully loaded schema: {0}
+
+LOADED_DB_RULE_FILE=\
+            PVD0002I|\
+            Successfully loaded DB Edge Rule and Edge Properties for: {0}
+                                 
+
diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java
new file mode 100644
index 00000000..83ba9e33
--- /dev/null
+++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/json/JsonSchemaProviderTest.java
@@ -0,0 +1,600 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.json;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.EdgeSchema;
+import org.onap.aai.schemaif.definitions.PropertySchema;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+import org.onap.aai.schemaif.definitions.types.ComplexDataType;
+import org.onap.aai.schemaif.definitions.types.DataType.Type;
+import org.onap.aai.schemaif.definitions.types.ListDataType;
+import org.onap.aai.schemaif.definitions.types.MapDataType;
+import org.onap.aai.schemaif.json.definitions.DataTypeDefinition;
+import org.onap.aai.schemaif.json.definitions.JsonEdgeSchema;
+import org.onap.aai.schemaif.json.definitions.JsonPropertySchema;
+import org.onap.aai.schemaif.json.definitions.JsonSchema;
+import org.onap.aai.schemaif.json.definitions.JsonVertexSchema;
+
+
+public class JsonSchemaProviderTest {
+
+    JsonSchemaProviderConfig config = new JsonSchemaProviderConfig();
+
+    @Before
+    public void init() throws Exception {
+        config.setSchemaServiceBaseUrl("https://testurl.com:8443");
+        config.setSchemaServiceCertFile("/c/certfile");
+        config.setSchemaServiceCertPwd("my-password");
+        config.setServiceName("test-service");
+    }
+
+    @Test
+    public void testJsonSchemaLoad() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchema jsonSchema = JsonSchema.fromJson(testSchema);
+
+            // Test Edge Schema
+            JsonEdgeSchema edgeSchema = null;
+            for (JsonEdgeSchema edge : jsonSchema.getRelationshipTypes()) {
+                if ( (edge.getFrom().equals("onap.nodes.sdwan.uCPE")) 
+                        && (edge.getTo().equals("onap.nodes.sdwan.service.SubscriberService")) ) {
+                    edgeSchema = edge;
+                    break;
+                }
+            }
+
+            assertTrue(edgeSchema.getLabel().equals("onap.relationships.sdwan.BelongsTo"));
+
+            // Test Node Schema
+            JsonVertexSchema vertexSchema = null;
+            for (JsonVertexSchema v : jsonSchema.getNodeTypes()) {
+                if ( (v.getName().equals("org.onap.resource.NetworkRules")) ) {
+                    vertexSchema = v;
+                    break;
+                }
+            }
+
+            assertTrue(vertexSchema.getProperties().size() == 2);
+
+            JsonPropertySchema propSchema = null;
+            for (JsonPropertySchema p : vertexSchema.getProperties()) {
+                if ( (p.getName().equals("network_policy_entries")) ) {
+                    propSchema = p;
+                    break;
+                }
+            }
+
+            assertTrue(propSchema.getRequired() == false);
+            assertTrue(propSchema.getUnique() == false);
+            assertTrue(propSchema.getDataType().equals("org.onap.datatypes.RuleList"));
+            assertTrue(propSchema.getDefaultValue().equals(""));
+            assertTrue(propSchema.getAnnotations().size() == 4);
+
+            // Test DataType Schema
+            DataTypeDefinition dataType = null;
+            for (DataTypeDefinition d : jsonSchema.getDataTypes()) {
+                if ( (d.getName().equals("org.onap.datatypes.network.VlanRequirements")) ) {
+                    dataType = d;
+                    break;
+                }
+            }
+
+            assertTrue(dataType.getName().equals("org.onap.datatypes.network.VlanRequirements"));
+            assertTrue(dataType.getProperties().size() == 4);
+
+            propSchema = null;
+            for (JsonPropertySchema p : dataType.getProperties()) {
+                if ( (p.getName().equals("vlan_type")) ) {
+                    propSchema = p;
+                    break;
+                }
+            }
+
+            assertTrue(propSchema.getRequired() == false);
+            assertTrue(propSchema.getDataType().equals("string"));
+            assertTrue(propSchema.getDefaultValue().equals(""));
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+
+    @Test
+    public void testJsonSchemaTranslateVertex() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            VertexSchema vertSchema = 
+                    schemaProvider.getVertexSchema("tosca.nodes.objectstorage", 
+                            schemaProvider.getLatestSchemaVersion());
+            System.out.println(vertSchema.toString());
+
+            // Validate vertex schema
+            assertTrue(vertSchema.getName().equals("tosca.nodes.ObjectStorage"));
+            assertTrue(vertSchema.getAnnotationValue("searchable").equals("size,name"));
+            assertTrue(vertSchema.getAnnotationValue("indexedProps").equals("aai-uuid,name"));
+
+            PropertySchema propSchema = vertSchema.getPropertySchema("Name");
+            assertTrue(propSchema.getName().equals("name"));
+            assertTrue(propSchema.getDefaultValue().equals(""));
+            assertTrue(propSchema.isRequired());
+            assertTrue(!propSchema.isKey());
+            assertTrue(!propSchema.isReserved());
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0);
+            assertTrue(propSchema.getAnnotationValue("Source_of_truth_type").equals("AAI"));
+
+            propSchema = vertSchema.getPropertySchema("Size");
+            assertTrue(propSchema.getName().equals("size"));
+            assertTrue(propSchema.getDefaultValue().equals("50"));
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.INT) == 0);
+            
+            propSchema = vertSchema.getPropertySchema("source-of-truth");
+            assertTrue(propSchema.getName().equals("source-of-truth"));
+            assertTrue(!propSchema.isRequired());
+            assertTrue(propSchema.isReserved());
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0);
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+
+    @Test
+    public void testJsonSchemaTranslateEdge() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("tosca.relationships.hostedOn", 
+                    "tosca.nodes.Softwarecomponent", "tosca.nodes.compute", 
+                    schemaProvider.getLatestSchemaVersion());
+            System.out.println(edgeSchema.toString());
+
+            // Validate edge schema
+            assertTrue(edgeSchema.getName().equals("tosca.relationships.HostedOn"));
+            assertTrue(edgeSchema.getSource().equals("tosca.nodes.SoftwareComponent"));
+            assertTrue(edgeSchema.getTarget().equals("tosca.nodes.Compute"));
+            assertTrue(edgeSchema.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
+            assertTrue(edgeSchema.getAnnotationValue("contains-other-v").equals("NONE"));
+
+
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+
+    @Test
+    public void testJsonSchemaTranslateAdjacentEdge() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            Set<EdgeSchema> edgeSchemaList = 
+                    schemaProvider.getAdjacentEdgeSchema("tosca.nodes.Database", 
+                            schemaProvider.getLatestSchemaVersion());
+
+            // Validate edge schema
+            assertTrue(edgeSchemaList.size() == 3);
+
+            for (EdgeSchema es : edgeSchemaList) {
+                System.out.println(es.toString());
+                if (es.getName().equals("tosca.relationships.HostedOn")) {
+                    assertTrue(es.getSource().equals("tosca.nodes.Database"));
+                    assertTrue(es.getTarget().equals("tosca.nodes.DBMS"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
+                }
+                else if (es.getName().equals("tosca.relationships.RoutesTo")) {
+                    assertTrue(es.getSource().equals("tosca.nodes.LoadBalancer"));
+                    assertTrue(es.getTarget().equals("tosca.nodes.Database"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
+                }
+                else if (es.getName().equals("tosca.relationships.Uses")) {
+                    assertTrue(es.getSource().equals("tosca.nodes.LoadBalancer"));
+                    assertTrue(es.getTarget().equals("tosca.nodes.Database"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
+                }
+                else {
+                    assertTrue(false);
+                }
+            }
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+
+    @Test
+    public void testJsonSchemaSourceTargetEdges() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            Set<EdgeSchema> edgeSchemaList = 
+                    schemaProvider.getEdgeSchemaForSourceTarget("tosca.nodes.LoadBalancer", 
+                            "tosca.nodes.Database", 
+                            schemaProvider.getLatestSchemaVersion());
+
+            // Validate edge schema
+            assertTrue(edgeSchemaList.size() == 2);
+
+            for (EdgeSchema es : edgeSchemaList) {
+                System.out.println(es.toString());
+                if (es.getName().equals("tosca.relationships.Uses")) {
+                    assertTrue(es.getSource().equals("tosca.nodes.LoadBalancer"));
+                    assertTrue(es.getTarget().equals("tosca.nodes.Database"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
+                }
+                else if (es.getName().equals("tosca.relationships.RoutesTo")) {
+                    assertTrue(es.getSource().equals("tosca.nodes.LoadBalancer"));
+                    assertTrue(es.getTarget().equals("tosca.nodes.Database"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
+                }
+                else {
+                    assertTrue(false);
+                }
+            }
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+
+    @Test
+    public void testJsonSchemaWildcardEdges() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            EdgeSchema edgeSchema = 
+                    schemaProvider.getEdgeSchema("amdocs.linkedTo", "service-instance", 
+                            "onap.nodes.sdwan.ManagementDomain", schemaProvider.getLatestSchemaVersion());
+
+            assertTrue(edgeSchema.getName().equals("amdocs.linkedTo"));
+            assertTrue(edgeSchema.getSource().equals("service-instance"));
+            assertTrue(edgeSchema.getTarget().equals("onap.nodes.sdwan.ManagementDomain"));
+
+            edgeSchema = schemaProvider.getEdgeSchema("amdocs.linkedTo", "onap.nodes.sdwan.ManagementDomain", 
+                    "service-instance", schemaProvider.getLatestSchemaVersion());
+
+            assertTrue(edgeSchema == null);
+            
+            
+            edgeSchema = 
+                    schemaProvider.getEdgeSchema("amdocs.unknownRelationship", "unknown", 
+                            "onap.nodes.sdwan.ManagementDomain", schemaProvider.getLatestSchemaVersion());
+            
+            assertTrue(edgeSchema.getName().equals("amdocs.unknownRelationship"));
+            assertTrue(edgeSchema.getSource().equals("unknown"));
+            assertTrue(edgeSchema.getTarget().equals("onap.nodes.sdwan.ManagementDomain"));
+            
+            edgeSchema = 
+                    schemaProvider.getEdgeSchema("amdocs.unknownRelationship", "onap.nodes.sdwan.ManagementDomain", 
+                            "unknown", schemaProvider.getLatestSchemaVersion());
+            
+            assertTrue(edgeSchema.getName().equals("amdocs.unknownRelationship"));
+            assertTrue(edgeSchema.getSource().equals("onap.nodes.sdwan.ManagementDomain"));
+            assertTrue(edgeSchema.getTarget().equals("unknown"));
+            
+            Set<EdgeSchema> edgeSchemaList = 
+                    schemaProvider.getEdgeSchemaForSourceTarget("service-instance", 
+                            "onap.nodes.sdwan.ManagementDomain", 
+                            schemaProvider.getLatestSchemaVersion());
+            assertTrue(edgeSchemaList.size() == 1);
+            
+            edgeSchemaList = schemaProvider.getEdgeSchemaForSourceTarget("unknown", "unknown", 
+                    schemaProvider.getLatestSchemaVersion());
+            assertTrue(edgeSchemaList.size() == 1);
+            
+            edgeSchemaList = schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "service-instance", 
+                    schemaProvider.getLatestSchemaVersion());
+            assertTrue(edgeSchemaList.size() == 1);
+            
+            
+            edgeSchemaList = schemaProvider.getAdjacentEdgeSchema("service-instance", schemaProvider.getLatestSchemaVersion());
+            System.out.println("EDGE LIST: \n\n" + edgeSchemaList);
+            assertTrue(edgeSchemaList.size() == 8);
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+    
+    @Test
+    public void testInvalidVertexOrEdge() throws SchemaProviderException {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            VertexSchema vertSchema = 
+                    schemaProvider.getVertexSchema("bad-node", schemaProvider.getLatestSchemaVersion());
+            assertTrue(vertSchema == null);
+
+            EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", 
+                    "cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion());
+            assertTrue(edgeSchema == null);
+
+            Set<EdgeSchema> edgeSchemaList = 
+                    schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", 
+                            schemaProvider.getLatestSchemaVersion());
+            assertTrue(edgeSchemaList.isEmpty());
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+
+    @Test
+    public void testJsonSchemaListAttribute() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            VertexSchema vertSchema = 
+                    schemaProvider.getVertexSchema("onap.nodes.sdwan.ManagementDomain", 
+                            schemaProvider.getLatestSchemaVersion());
+            System.out.println(vertSchema.toString());
+
+            // Validate schema            
+            PropertySchema propSchema = vertSchema.getPropertySchema("controllers");
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.LIST) == 0);
+            ListDataType listType = (ListDataType)propSchema.getDataType();
+            assertTrue(listType.getListType().getType().compareTo(Type.STRING) == 0);
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+
+    @Test
+    public void testJsonSchemaMapAttribute() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            VertexSchema vertSchema = 
+                    schemaProvider.getVertexSchema("onap.nodes.sdwan.ManagementDomain", 
+                            schemaProvider.getLatestSchemaVersion());
+            System.out.println(vertSchema.toString());
+
+            // Validate schema            
+            PropertySchema propSchema = vertSchema.getPropertySchema("analyticClusters");
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.MAP) == 0);
+            MapDataType mapType = (MapDataType)propSchema.getDataType();
+            assertTrue(mapType.getMapType().getType().compareTo(Type.STRING) == 0);
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+    
+    @Test
+    public void testJsonSchemaComplexAttribute() {
+        try {
+            String testSchema = readFile("src/test/resources/json/jsonSchema.json");
+            JsonSchemaProvider schemaProvider = new JsonSchemaProvider(config);
+            schemaProvider.loadSchema(testSchema, schemaProvider.getLatestSchemaVersion());
+
+            VertexSchema vertSchema = 
+                    schemaProvider.getVertexSchema("org.onap.resource.extContrailCP", 
+                            schemaProvider.getLatestSchemaVersion());
+            System.out.println(vertSchema.toString());
+
+            System.out.println("\n\nSize: " + vertSchema.getPropertySchemaList().size());
+            System.out.println(vertSchema.getPropertySchemaList());
+            assertTrue(vertSchema.getPropertySchemaList().size() == 22);
+
+            // Validate property schema            
+            PropertySchema propSchema = vertSchema.getPropertySchema("exCP_naming");
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.COMPLEX) == 0);
+            ComplexDataType complexType = (ComplexDataType)propSchema.getDataType();
+            List<PropertySchema> complexProps = complexType.getSubProperties();
+            assertTrue(complexProps.size() == 4);
+
+            PropertySchema subProp = null;
+            for (PropertySchema p : complexProps) {
+                if (p.getName().equals("naming_policy")) {
+                    subProp = p;
+                }
+            }
+
+            assertTrue(!subProp.isRequired());
+            assertTrue(subProp.getDataType().getType().compareTo(Type.STRING) == 0);
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+
+    @Test
+    public void testParseSchemaServiceResponse() {
+        try {
+            String testSchema = readFile("src/test/resources/json/schemaServiceResponse.json");
+            SchemaServiceResponse resp = SchemaServiceResponse.fromJson(testSchema);
+
+            System.out.println(resp.toJson());
+            assertTrue(resp.getVersion().equals("v1"));
+
+            JsonSchema jsonSchema = resp.getData();
+            System.out.println(jsonSchema.toJson());
+
+            assertTrue(jsonSchema.getDataTypes().size() == 1);
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+    
+    @Test
+    public void testSchemaValidateSuccess() {
+        try {
+            String testSchema = readFile("src/test/resources/json/schemaServiceResponse.json");
+            SchemaServiceResponse schema = SchemaServiceResponse.fromJson(testSchema);
+            schema.getData().validate();
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }           
+
+    @Test(expected = SchemaProviderException.class)
+    public void testSchemaValidateBadEdge() throws SchemaProviderException {
+        SchemaServiceResponse schema;    
+
+        try {
+            String testSchema = readFile("src/test/resources/json/badEdgeSchema.json");
+            schema = SchemaServiceResponse.fromJson(testSchema);
+        }
+        catch (Exception ex) {
+            assertTrue(false);
+            return;
+        }
+
+        schema.getData().validate();
+    }
+    
+    @Test(expected = SchemaProviderException.class)
+    public void testSchemaValidateBadVertex() throws SchemaProviderException {
+        SchemaServiceResponse schema;    
+
+        try {
+            String testSchema = readFile("src/test/resources/json/badVertexSchema.json");
+            schema = SchemaServiceResponse.fromJson(testSchema);
+        }
+        catch (Exception ex) {
+            assertTrue(false);
+            return;
+        }
+
+        System.out.println("Validate");
+        schema.getData().validate();    
+        System.out.println("Validate done");
+    }
+    
+    @Test(expected = SchemaProviderException.class)
+    public void testSchemaValidateBadType() throws SchemaProviderException {
+        SchemaServiceResponse schema;    
+
+        try {
+            String testSchema = readFile("src/test/resources/json/badTypeSchema.json");
+            schema = SchemaServiceResponse.fromJson(testSchema);
+        }
+        catch (Exception ex) {
+            assertTrue(false);
+            return;
+        }
+
+        schema.getData().validate(); 
+    }
+    
+    @Test(expected = SchemaProviderException.class)
+    public void testSchemaValidateBadProp() throws SchemaProviderException {
+        SchemaServiceResponse schema;    
+
+        try {
+            String testSchema = readFile("src/test/resources/json/badPropSchema.json");
+            schema = SchemaServiceResponse.fromJson(testSchema);
+        }
+        catch (Exception ex) {
+            assertTrue(false);
+            return;
+        }
+
+        schema.getData().validate(); 
+    }
+
+    static String readFile(String path) throws IOException {
+        byte[] encoded = Files.readAllBytes(Paths.get(path));
+        return new String(encoded);
+    }
+}
diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java
new file mode 100644
index 00000000..6c7364ae
--- /dev/null
+++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java
@@ -0,0 +1,254 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.aai.schemaif.SchemaProviderException;
+import org.onap.aai.schemaif.definitions.EdgeSchema;
+import org.onap.aai.schemaif.definitions.PropertySchema;
+import org.onap.aai.schemaif.definitions.VertexSchema;
+import org.onap.aai.schemaif.definitions.types.DataType.Type;
+
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
+
+    @Test
+    public void testLoadingSchema() throws SchemaProviderException {
+        try {
+            OxmSchemaProvider schemaProvider = new OxmSchemaProvider();
+            schemaProvider.loadSchema();
+
+            VertexSchema vertSchema = schemaProvider.getVertexSchema("pserver", schemaProvider.getLatestSchemaVersion());
+            System.out.println(vertSchema.toString());
+
+            EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", 
+                    "cloud-region", "zone", schemaProvider.getLatestSchemaVersion());
+            System.out.println(edgeSchema.toString());
+            
+            // Validate vertex schema
+            assertTrue(vertSchema.getName().equals("pserver"));
+            assertTrue(vertSchema.getAnnotationValue("nameProps").equals("pserver-name2"));
+            assertTrue(vertSchema.getAnnotationValue("dependentOn") == null);
+            
+            PropertySchema propSchema = vertSchema.getPropertySchema("hostname");
+            assertTrue(propSchema.getName().equals("hostname"));
+            assertTrue(propSchema.getDefaultValue().equals(""));
+            assertTrue(propSchema.isRequired());
+            assertTrue(!propSchema.isKey());
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0);
+            Object obj = propSchema.validateValue("somestring");
+            assertTrue(obj instanceof String);
+            
+            propSchema = vertSchema.getPropertySchema("in-maint");
+            assertTrue(propSchema.getName().equals("in-maint"));
+            assertTrue(propSchema.getDefaultValue().equals("false"));
+            assertTrue(!propSchema.isRequired());
+            assertTrue(!propSchema.isKey());
+            assertTrue(!propSchema.isReserved());
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.BOOL) == 0);
+            obj = propSchema.validateValue("True");
+            assertTrue(obj instanceof Boolean);
+            obj = propSchema.validateValue("false");
+            assertTrue(obj instanceof Boolean);
+            assertTrue(propSchema.getDataType().validateValue("badValue") == null);
+            
+            
+            propSchema = vertSchema.getPropertySchema("aai-node-type");
+            assertTrue(propSchema.getName().equals("aai-node-type"));
+            assertTrue(propSchema.getDefaultValue().equals(""));
+            assertTrue(!propSchema.isRequired());
+            assertTrue(!propSchema.isKey());
+            assertTrue(propSchema.isReserved());
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0);
+            
+            propSchema = vertSchema.getPropertySchema("pserver-id");
+            assertTrue(propSchema.getName().equals("pserver-id"));
+            assertTrue(propSchema.getDefaultValue().equals(""));
+            assertTrue(propSchema.isRequired());
+            assertTrue(!propSchema.isReserved());
+            assertTrue(propSchema.isKey());
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0);
+            
+            propSchema = vertSchema.getPropertySchema("number-of-cpus");
+            assertTrue(propSchema.getName().equals("number-of-cpus"));
+            assertTrue(propSchema.getAnnotationValue("source-of-truth-type").equals("openstack"));
+            assertTrue(propSchema.getDataType().getType().compareTo(Type.INT) == 0);
+            obj = propSchema.validateValue("35");
+            assertTrue(obj instanceof Integer);
+            obj = propSchema.validateValue("5.0");
+            assertTrue(obj instanceof Integer);
+            assertTrue(propSchema.getDataType().validateValue("5.5") == null);
+            assertTrue(propSchema.getDataType().validateValue("xyz") == null);
+            
+            // Validate edge schema
+            assertTrue(edgeSchema.getName().equals("org.onap.relationships.inventory.LocatedIn"));
+            assertTrue(edgeSchema.getSource().equals("cloud-region"));
+            assertTrue(edgeSchema.getTarget().equals("zone"));
+            assertTrue(edgeSchema.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_ONE));
+            assertTrue(edgeSchema.getAnnotationValue("contains-other-v").equals("NONE"));
+            assertTrue(edgeSchema.getPropertySchema("prevent-delete").getDataType().getType().equals(Type.STRING));
+            
+            // Validate 'dependentOn' annotation
+            vertSchema = schemaProvider.getVertexSchema("tenant", schemaProvider.getLatestSchemaVersion());
+            assertTrue(vertSchema.getAnnotationValue("dependentOn").equals("cloud-region"));
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+    
+    @Test
+    public void testAdjacentEdges() throws SchemaProviderException {
+        try {
+            OxmSchemaProvider schemaProvider = new OxmSchemaProvider();
+            schemaProvider.loadSchema();
+
+            Set<EdgeSchema> edgeSchemaList = 
+                    schemaProvider.getAdjacentEdgeSchema("snapshot", schemaProvider.getLatestSchemaVersion());
+            
+            // Validate edge schema
+            assertTrue(edgeSchemaList.size() == 2);
+            
+            for (EdgeSchema es : edgeSchemaList) {
+                System.out.println(es.toString());
+                if (es.getName().equals("org.onap.relationships.inventory.BelongsTo")) {
+                    assertTrue(es.getSource().equals("snapshot"));
+                    assertTrue(es.getTarget().equals("cloud-region"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_ONE));
+                }
+                else if (es.getName().equals("org.onap.relationships.inventory.Uses")) {
+                    assertTrue(es.getSource().equals("vserver"));
+                    assertTrue(es.getTarget().equals("snapshot"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.ONE_2_ONE));
+                }
+                else {
+                    assertTrue(false);
+                }
+            }
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+    
+    @Test
+    public void testValidSourceTargetEdge() throws SchemaProviderException {
+        try {
+            OxmSchemaProvider schemaProvider = new OxmSchemaProvider();
+            schemaProvider.loadSchema();
+
+            Set<EdgeSchema> edgeSchemaList = 
+                    schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer", 
+                            schemaProvider.getLatestSchemaVersion());
+
+            // Validate edge schema
+            assertTrue(edgeSchemaList.size() == 1);
+            assertTrue(edgeSchemaList.iterator().next().getName().equals("ncso.related-to"));
+            assertTrue(edgeSchemaList.iterator().next().getSource().equals("service-instance"));
+            assertTrue(edgeSchemaList.iterator().next().getTarget().equals("customer"));
+            assertTrue(edgeSchemaList.iterator().next().getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
+            
+            edgeSchemaList = 
+                    schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex", 
+                            schemaProvider.getLatestSchemaVersion());
+            
+            // Validate edge schema
+            assertTrue(edgeSchemaList.size() == 2);
+            
+            for (EdgeSchema es : edgeSchemaList) {
+                System.out.println(es.toString());
+                if (es.getName().equals("org.onap.relationships.inventory.FoundIn")) {
+                    assertTrue(es.getSource().equals("cloud-region"));
+                    assertTrue(es.getTarget().equals("complex"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
+                }
+                else if (es.getName().equals("org.onap.relationships.inventory.LocatedIn")) {
+                    assertTrue(es.getSource().equals("cloud-region"));
+                    assertTrue(es.getTarget().equals("complex"));
+                    assertTrue(es.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_ONE));
+                }
+                else {
+                    assertTrue(false);
+                }
+            }
+            
+            edgeSchemaList = 
+                    schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node", 
+                            schemaProvider.getLatestSchemaVersion());
+            
+            // Validate edge schema
+            assertTrue(edgeSchemaList.size() == 0);
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+    
+    @Test
+    public void testInvalidVertexOrEdge() throws SchemaProviderException {
+        try {
+            OxmSchemaProvider schemaProvider = new OxmSchemaProvider();
+            schemaProvider.loadSchema();
+
+            VertexSchema vertSchema = 
+                    schemaProvider.getVertexSchema("bad-node", schemaProvider.getLatestSchemaVersion());
+            assertTrue(vertSchema == null);
+
+            EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", 
+                    "cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion());
+            assertTrue(edgeSchema == null);
+            
+            Set<EdgeSchema> edgeSchemaList = 
+                    schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", 
+                            schemaProvider.getLatestSchemaVersion());
+            assertTrue(edgeSchemaList.isEmpty());
+        }
+        catch (Exception ex) {
+            StringWriter writer = new StringWriter();
+            PrintWriter printWriter = new PrintWriter(writer);
+            ex.printStackTrace(printWriter);
+            System.out.println(writer.toString());
+            assertTrue(false);
+        }
+    }
+}
diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaServiceSetup.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaServiceSetup.java
new file mode 100644
index 00000000..b4c1ca2e
--- /dev/null
+++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaServiceSetup.java
@@ -0,0 +1,78 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 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.aai.schemaif.oxm;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.junit.Before;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.onap.aai.edges.EdgeIngestor;
+import org.onap.aai.nodes.NodeIngestor;
+import org.onap.aai.setup.AAIConfigTranslator;
+import org.onap.aai.setup.SchemaLocationsBean;
+import org.onap.aai.setup.SchemaVersion;
+import org.onap.aai.setup.SchemaConfigVersions;
+import org.onap.aai.setup.Translator;
+
+public class OxmSchemaServiceSetup {
+
+    @Mock
+    private SchemaLocationsBean schemaLocationsBean;
+
+    @Mock
+    private SchemaConfigVersions schemaConfigVersions;
+
+    private EdgePropsConfiguration edgePropsConfiguration = new EdgePropsConfiguration();
+
+    private List<SchemaVersion> schemaVersionList = new ArrayList<>();
+
+    private OxmEdgeRulesLoader edgeLoader;
+    private OxmSchemaLoader vertexLoader;
+
+    @Before
+    public void schemaBeanMockSetup() throws Exception {
+        schemaVersionList.add(new SchemaVersion("v13"));
+
+        Mockito.when(schemaConfigVersions.getVersions()).thenReturn(schemaVersionList);
+        Mockito.when(schemaLocationsBean.getNodesInclusionPattern()).thenReturn(Arrays.asList(".*oxm(.*).xml"));
+        Mockito.when(schemaLocationsBean.getEdgesInclusionPattern()).thenReturn(Arrays.asList("DbEdgeRules_.*.json"));
+        Mockito.when(schemaLocationsBean.getNodeDirectory()).thenReturn("src/test/resources/oxm/oxm");
+        Mockito.when(schemaLocationsBean.getEdgeDirectory()).thenReturn("src/test/resources/oxm/edge-rules");
+
+        AAIConfigTranslator aaiConfigTranslator = new AAIConfigTranslator(schemaLocationsBean,  schemaConfigVersions);
+        Set<Translator> translators = new HashSet<>();
+        translators.add(aaiConfigTranslator);
+        NodeIngestor nodeIngestor = new NodeIngestor(translators);
+        nodeIngestor.initialize();
+        EdgeIngestor edgeIngestor = new EdgeIngestor(translators);
+        edgeIngestor.initialize();
+
+        edgePropsConfiguration.setEdgePropsDir("src/test/resources/oxm/edge-props");
+        edgeLoader = new OxmEdgeRulesLoader(aaiConfigTranslator, edgeIngestor, edgePropsConfiguration);
+        vertexLoader = new OxmSchemaLoader(aaiConfigTranslator, nodeIngestor);
+    }
+
+}
diff --git a/aai-schema-abstraction/src/test/resources/json/badEdgeSchema.json b/aai-schema-abstraction/src/test/resources/json/badEdgeSchema.json
new file mode 100644
index 00000000..66892d3a
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/json/badEdgeSchema.json
@@ -0,0 +1,100 @@
+{
+  "schema-version": "v1",
+  "schema-type": "json",
+  "schema-content": {
+    "relationship_types": [
+      {
+        "from": "tosca.nodes.SoftwareComponent",
+        "label": "tosca.relationships.HostedOn",
+        "annotations": {
+          "contains-other-v": "NONE",
+          "delete-other-v": "NONE",
+          "prevent-delete": "NONE"
+        }
+      }
+    ],
+    "data_types": [
+      {
+        "name": "org.onap.datatypes.network.MacAssignments",
+        "description": "",
+        "properties": [
+          {
+            "name": "mac_range_plan",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "mac_count",
+            "required": false,
+            "type": "integer",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "supplemental_data",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          }
+        ]
+      }
+    ],
+    "node_types": [
+      {
+        "name": "tosca.nodes.ObjectStorage",
+        "description": "",
+        "uriTemplate": "",
+        "properties": [
+          {
+            "name": "name",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": true,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": ""
+            }
+          },
+          {
+            "name": "size",
+            "required": true,
+            "unique": false,
+            "type": "integer",
+            "description": "",
+            "default": "50",
+            "annotations": {
+              "indexed": false,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          },
+          {
+            "name": "maxsize",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": false,
+              "searchable": false,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/aai-schema-abstraction/src/test/resources/json/badPropSchema.json b/aai-schema-abstraction/src/test/resources/json/badPropSchema.json
new file mode 100644
index 00000000..5c24fce0
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/json/badPropSchema.json
@@ -0,0 +1,101 @@
+{
+  "schema-version": "v1",
+  "schema-type": "json",
+  "schema-content": {
+    "relationship_types": [
+      {
+        "from": "tosca.nodes.SoftwareComponent",
+        "to": "tosca.nodes.Compute",
+        "label": "tosca.relationships.HostedOn",
+        "annotations": {
+          "contains-other-v": "NONE",
+          "delete-other-v": "NONE",
+          "prevent-delete": "NONE"
+        }
+      }
+    ],
+    "data_types": [
+      {
+        "name": "org.onap.datatypes.network.MacAssignments",
+        "description": "",
+        "properties": [
+          {
+            "name": "mac_range_plan",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "mac_count",
+            "required": false,
+            "type": "integer",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "supplemental_data",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          }
+        ]
+      }
+    ],
+    "node_types": [
+      {
+        "name": "tosca.nodes.ObjectStorage",      
+        "description": "",
+        "uriTemplate": "",
+        "properties": [
+          {
+            "name": "",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": true,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": ""
+            }
+          },
+          {
+            "name": "size",
+            "required": true,
+            "unique": false,
+            "type": "integer",
+            "description": "",
+            "default": "50",
+            "annotations": {
+              "indexed": false,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          },
+          {
+            "name": "maxsize",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": false,
+              "searchable": false,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/aai-schema-abstraction/src/test/resources/json/badTypeSchema.json b/aai-schema-abstraction/src/test/resources/json/badTypeSchema.json
new file mode 100644
index 00000000..c987a840
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/json/badTypeSchema.json
@@ -0,0 +1,101 @@
+{
+  "schema-version": "v1",
+  "schema-type": "json",
+  "schema-content": {
+    "relationship_types": [
+      {
+        "from": "tosca.nodes.SoftwareComponent",
+        "to": "tosca.nodes.Compute",
+        "label": "tosca.relationships.HostedOn",
+        "annotations": {
+          "contains-other-v": "NONE",
+          "delete-other-v": "NONE",
+          "prevent-delete": "NONE"
+        }
+      }
+    ],
+    "data_types": [
+      {
+        "name": "",
+        "description": "",
+        "properties": [
+          {
+            "name": "mac_range_plan",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "mac_count",
+            "required": false,
+            "type": "integer",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "supplemental_data",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          }
+        ]
+      }
+    ],
+    "node_types": [
+      {
+        "name": "tosca.nodes.ObjectStorage",      
+        "description": "",
+        "uriTemplate": "",
+        "properties": [
+          {
+            "name": "name",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": true,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": ""
+            }
+          },
+          {
+            "name": "size",
+            "required": true,
+            "unique": false,
+            "type": "integer",
+            "description": "",
+            "default": "50",
+            "annotations": {
+              "indexed": false,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          },
+          {
+            "name": "maxsize",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": false,
+              "searchable": false,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/aai-schema-abstraction/src/test/resources/json/badVertexSchema.json b/aai-schema-abstraction/src/test/resources/json/badVertexSchema.json
new file mode 100644
index 00000000..cd8bd3d7
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/json/badVertexSchema.json
@@ -0,0 +1,100 @@
+{
+  "schema-version": "v1",
+  "schema-type": "json",
+  "schema-content": {
+    "relationship_types": [
+      {
+        "from": "tosca.nodes.SoftwareComponent",
+        "to": "tosca.nodes.Compute",
+        "label": "tosca.relationships.HostedOn",
+        "annotations": {
+          "contains-other-v": "NONE",
+          "delete-other-v": "NONE",
+          "prevent-delete": "NONE"
+        }
+      }
+    ],
+    "data_types": [
+      {
+        "name": "org.onap.datatypes.network.MacAssignments",
+        "description": "",
+        "properties": [
+          {
+            "name": "mac_range_plan",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "mac_count",
+            "required": false,
+            "type": "integer",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "supplemental_data",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          }
+        ]
+      }
+    ],
+    "node_types": [
+      {
+        "description": "",
+        "uriTemplate": "",
+        "properties": [
+          {
+            "name": "name",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": true,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": ""
+            }
+          },
+          {
+            "name": "size",
+            "required": true,
+            "unique": false,
+            "type": "integer",
+            "description": "",
+            "default": "50",
+            "annotations": {
+              "indexed": false,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          },
+          {
+            "name": "maxsize",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": false,
+              "searchable": false,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/aai-schema-abstraction/src/test/resources/json/jsonSchema.json b/aai-schema-abstraction/src/test/resources/json/jsonSchema.json
new file mode 100644
index 00000000..36db8bbd
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/json/jsonSchema.json
@@ -0,0 +1,976 @@
+{
+  "relationship_types": [
+    {
+      "from": "service-instance",
+      "to": "*",
+      "label": "amdocs.linkedTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "unknown",
+      "to": "*",
+      "label": "amdocs.unknownRelationship",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    }, 
+    {
+      "from": "*",
+      "to": "unknown",
+      "label": "amdocs.unknownRelationship",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },    
+    {
+      "from": "tosca.nodes.SoftwareComponent",
+      "to": "tosca.nodes.Compute",
+      "label": "tosca.relationships.HostedOn",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.LoadBalancer",
+      "to": "tosca.nodes.ObjectStorage",
+      "label": "tosca.relationships.RoutesTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.LoadBalancer",
+      "to": "onap.nodes.sdwan.ManagementDomain",
+      "label": "tosca.relationships.RoutesTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.LoadBalancer",
+      "to": "tosca.nodes.LoadBalancer",
+      "label": "tosca.relationships.RoutesTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.LoadBalancer",
+      "to": "tosca.nodes.Database",
+      "label": "tosca.relationships.RoutesTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.LoadBalancer",
+      "to": "tosca.nodes.Compute",
+      "label": "tosca.relationships.RoutesTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.LoadBalancer",
+      "to": "tosca.nodes.Database",
+      "label": "tosca.relationships.Uses",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },    
+    {
+      "from": "tosca.nodes.LoadBalancer",
+      "to": "tosca.nodes.WebApplication",
+      "label": "tosca.relationships.RoutesTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.LoadBalancer",
+      "to": "tosca.nodes.WebServer",
+      "label": "tosca.relationships.RoutesTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "nodes.ics.Port",
+      "to": "tosca.nodes.Compute",
+      "label": "tosca.relationships.network.BindsTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.network.Port",
+      "to": "tosca.nodes.Compute",
+      "label": "tosca.relationships.network.BindsTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.Compute",
+      "to": "tosca.nodes.BlockStorage",
+      "label": "tosca.relationships.AttachesTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "onap.nodes.sdwan.RoutingInstance",
+      "to": "onap.nodes.sdwan.service.SubscriberService",
+      "label": "onap.relationships.sdwan.BelongsTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "onap.nodes.sdwan.RoutingInstance",
+      "to": "onap.nodes.sdwan.ManagementDomain",
+      "label": "onap.relationships.ManagedBy",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "tosca.nodes.Database",
+      "to": "tosca.nodes.DBMS",
+      "label": "tosca.relationships.HostedOn",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "onap.nodes.sdwan.uCPE",
+      "to": "onap.nodes.sdwan.service.SubscriberService",
+      "label": "onap.relationships.sdwan.BelongsTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "onap.nodes.sdwan.uCPE",
+      "to": "onap.nodes.sdwan.ManagementDomain",
+      "label": "onap.relationships.ManagedBy",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "onap.nodes.sdwan.VPN",
+      "to": "onap.nodes.sdwan.service.SubscriberService",
+      "label": "onap.relationships.sdwan.BelongsTo",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    },
+    {
+      "from": "onap.nodes.sdwan.Account",
+      "to": "onap.nodes.sdwan.ManagementDomain",
+      "label": "onap.relationships.ManagedBy",
+      "annotations": {
+        "contains-other-v": "NONE",
+        "delete-other-v": "NONE",
+        "prevent-delete": "NONE"
+      }
+    }
+  ],
+  "data_types": [
+    {
+      "name": "org.onap.datatypes.network.VlanRequirements",
+      "description": "",
+      "properties": [
+        {
+          "name": "vlan_range_plan",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "vlan_type",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": "Valid_values: [c-tag, s-tag],"
+        },
+        {
+          "name": "vlan_count",
+          "required": false,
+          "type": "integer",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "supplemental_data",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        }
+      ]
+    },
+    {
+      "name": "org.onap.datatypes.RuleList",
+      "description": "",
+      "properties": [
+        {
+          "name": "network_policy_entries_policy_rule",
+          "required": false,
+          "type": "list:string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        }
+      ]
+    },
+    {
+      "name": "org.onap.datatypes.network.MacRequirements",
+      "description": "",
+      "properties": [
+        {
+          "name": "mac_range_plan",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "mac_count",
+          "required": false,
+          "type": "integer",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "mac_count_required",
+          "required": false,
+          "type": "org.onap.datatypes.AssignmentRequirements",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "supplemental_data",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        }
+      ]
+    },
+    {
+      "name": "org.onap.datatypes.AssignmentRequirements",
+      "description": "",
+      "properties": [
+        {
+          "name": "is_required",
+          "required": false,
+          "type": "boolean",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "count",
+          "required": false,
+          "type": "integer",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "supplemental_data",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        }
+      ]
+    },
+    {
+      "name": "org.onap.datatypes.Naming",
+      "description": "",
+      "properties": [
+        {
+          "name": "generated_naming",
+          "required": false,
+          "type": "boolean",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "naming_policy",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "instance_name",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        },
+        {
+          "name": "supplemental_data",
+          "required": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "constraint": ""
+        }
+      ]
+    }
+  ],
+  "node_types": [
+    {
+      "name": "unknown",
+      "description": "",
+      "uriTemplate": "",
+      "properties": [
+        {
+          "name": "node-name",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": true,
+            "searchable": true,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        }
+      ]
+    },  
+    {
+      "name": "service-instance",
+      "description": "",
+      "uriTemplate": "",
+      "properties": [
+        {
+          "name": "service-instance-name",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": true,
+            "searchable": true,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "service-type",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": true,
+            "source_of_truth_type": "AAI",
+            "constraint": "Greater_or_equal: 0 GB,"
+          }
+        }
+      ]
+    },
+    {
+      "name": "tosca.nodes.ObjectStorage",
+      "description": "",
+      "uriTemplate": "",
+      "properties": [
+        {
+          "name": "name",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": true,
+            "searchable": true,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "size",
+          "required": true,
+          "unique": false,
+          "type": "integer",
+          "description": "",
+          "default": "50",
+          "annotations": {
+            "indexed": false,
+            "searchable": true,
+            "source_of_truth_type": "AAI",
+            "constraint": "Greater_or_equal: 0 GB,"
+          }
+        },
+        {
+          "name": "maxsize",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": "Greater_or_equal: 0 GB,"
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.onap.resource.NetworkRules",
+      "description": "",
+      "uriTemplate": "",
+      "properties": [
+        {
+          "name": "name",
+          "required": false,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "network_policy_entries",
+          "required": false,
+          "unique": false,
+          "type": "org.onap.datatypes.RuleList",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        }
+      ]
+    },
+    {
+      "name": "onap.nodes.sdwan.ManagementDomain",
+      "description": "",
+      "uriTemplate": "",
+      "properties": [
+        {
+          "name": "mdName",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "controllers",
+          "required": true,
+          "unique": false,
+          "type": "list:string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "stagingControllers",
+          "required": true,
+          "unique": false,
+          "type": "list:string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "mdDirectorUrl",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "mdDirectorCredentialName",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "encryptionType",
+          "required": false,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "analyticClusters",
+          "required": false,
+          "unique": false,
+          "type": "map:string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "cliUsers",
+          "required": false,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "devicesSet",
+          "required": false,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        }
+      ]
+    },
+    {
+      "name": "org.onap.resource.extContrailCP",
+      "description": "",
+      "uriTemplate": "",
+      "properties": [
+        {
+          "name": "static_routes",
+          "required": false,
+          "unique": false,
+          "type": "list:string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "virtual_network",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "static_route",
+          "required": false,
+          "unique": false,
+          "type": "boolean",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "allowed_address_pairs",
+          "required": false,
+          "unique": false,
+          "type": "list:string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "shared_ip",
+          "required": false,
+          "unique": false,
+          "type": "boolean",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "interface_type",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": "Valid_values: [management, left, right, other],"
+          }
+        },
+        {
+          "name": "network_role",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "network_role_tag",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "mac_requirements",
+          "required": false,
+          "unique": false,
+          "type": "org.onap.datatypes.network.MacRequirements",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "vlan_requirements",
+          "required": false,
+          "unique": false,
+          "type": "list:string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "ip_requirements",
+          "required": true,
+          "unique": false,
+          "type": "list:string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "exCP_naming",
+          "required": true,
+          "unique": false,
+          "type": "org.onap.datatypes.Naming",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "subnetpoolid",
+          "required": true,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "subinterface_indicator",
+          "required": false,
+          "unique": false,
+          "type": "boolean",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "related_networks",
+          "required": false,
+          "unique": false,
+          "type": "list:string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "ip_address",
+          "required": false,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "order",
+          "required": true,
+          "unique": false,
+          "type": "integer",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": "Greater_or_equal: 0,"
+          }
+        },
+        {
+          "name": "is_default",
+          "required": false,
+          "unique": false,
+          "type": "boolean",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "ip_range_start",
+          "required": false,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        },
+        {
+          "name": "ip_range_end",
+          "required": false,
+          "unique": false,
+          "type": "string",
+          "description": "",
+          "default": "",
+          "annotations": {
+            "indexed": false,
+            "searchable": false,
+            "source_of_truth_type": "AAI",
+            "constraint": ""
+          }
+        }
+      ]
+    }
+  ],
+  "common_node_properties": [
+    {
+      "name": "aai-uuid",
+      "required": true,
+      "unique": true,
+      "type": "string",
+      "description": "",
+      "default": "",
+      "annotations": {
+        "indexed": true,
+        "searchable": false,
+        "source_of_truth_type": "AAI",
+        "constraint": ""
+      }
+    },
+    {
+      "name": "source-of-truth",
+      "required": false,
+      "unique": false,
+      "type": "string",
+      "description": "",
+      "default": "",
+      "annotations": {
+        "indexed": false,
+        "searchable": false,
+        "source_of_truth_type": "AAI",
+        "constraint": ""
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/aai-schema-abstraction/src/test/resources/json/schemaServiceResponse.json b/aai-schema-abstraction/src/test/resources/json/schemaServiceResponse.json
new file mode 100644
index 00000000..06e78ed1
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/json/schemaServiceResponse.json
@@ -0,0 +1,131 @@
+{
+  "schema-version": "v1",
+  "schema-type": "json",
+  "schema-content": {
+    "relationship_types": [
+      {
+        "from": "tosca.nodes.SoftwareComponent",
+        "to": "tosca.nodes.Compute",
+        "label": "tosca.relationships.HostedOn",
+        "annotations": {
+          "contains-other-v": "NONE",
+          "delete-other-v": "NONE",
+          "prevent-delete": "NONE"
+        }
+      }
+    ],
+    "data_types": [
+      {
+        "name": "org.onap.datatypes.network.MacAssignments",
+        "description": "",
+        "properties": [
+          {
+            "name": "mac_range_plan",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "mac_count",
+            "required": false,
+            "type": "integer",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          },
+          {
+            "name": "supplemental_data",
+            "required": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "constraint": ""
+          }
+        ]
+      }
+    ],
+    "node_types": [
+      {
+        "name": "tosca.nodes.ObjectStorage",
+        "description": "",
+        "uriTemplate": "",
+        "properties": [
+          {
+            "name": "name",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": true,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": ""
+            }
+          },
+          {
+            "name": "size",
+            "required": true,
+            "unique": false,
+            "type": "integer",
+            "description": "",
+            "default": "50",
+            "annotations": {
+              "indexed": false,
+              "searchable": true,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          },
+          {
+            "name": "maxsize",
+            "required": true,
+            "unique": false,
+            "type": "string",
+            "description": "",
+            "default": "",
+            "annotations": {
+              "indexed": false,
+              "searchable": false,
+              "source_of_truth_type": "AAI",
+              "constraint": "Greater_or_equal: 0 GB,"
+            }
+          }
+        ]
+      }
+    ],
+    "common_node_properties": [
+      {
+        "name": "aai-uuid",
+        "required": true,
+        "unique": true,
+        "type": "string",
+        "description": "",
+        "default": "",
+        "annotations": {
+          "indexed": true,
+          "searchable": false,
+          "source_of_truth_type": "AAI",
+          "constraint": ""
+        }
+      },
+      {
+        "name": "source-of-truth",
+        "required": false,
+        "unique": false,
+        "type": "string",
+        "description": "",
+        "default": "",
+        "annotations": {
+          "indexed": false,
+          "searchable": false,
+          "source_of_truth_type": "AAI",
+          "constraint": ""
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/aai-schema-abstraction/src/test/resources/oxm/edge-props/edge_properties_v13.json b/aai-schema-abstraction/src/test/resources/oxm/edge-props/edge_properties_v13.json
new file mode 100644
index 00000000..8d00636d
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/oxm/edge-props/edge_properties_v13.json
@@ -0,0 +1,6 @@
+{
+        "contains-other-v": "java.lang.String",
+        "delete-other-v": "java.lang.String",
+        "SVC-INFRA": "java.lang.String",
+        "prevent-delete": "java.lang.String"
+}
\ No newline at end of file
diff --git a/aai-schema-abstraction/src/test/resources/oxm/edge-rules/v13/DbEdgeRules_v13.json b/aai-schema-abstraction/src/test/resources/oxm/edge-rules/v13/DbEdgeRules_v13.json
new file mode 100644
index 00000000..75365661
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/oxm/edge-rules/v13/DbEdgeRules_v13.json
@@ -0,0 +1,2848 @@
+{
+	"rules": [
+	{
+                        "from": "service-instance",
+                        "to": "customer",
+                        "label": "ncso.related-to",
+                        "direction": "OUT",
+                        "multiplicity": "MANY2MANY",
+                        "contains-other-v": "NONE",
+                        "delete-other-v": "NONE",
+                        "prevent-delete": "NONE",
+                        "default": "true",
+                        "description":""
+},
+{
+                        "from": "generic-vnf",
+                        "to": "vnfc",
+                        "label": "ncso.related-to",
+                        "direction": "OUT",
+                        "multiplicity": "MANY2MANY",
+                        "contains-other-v": "NONE",
+                        "delete-other-v": "NONE",
+                        "prevent-delete": "NONE",
+                        "default": "true",
+                        "description":""
+},
+{
+                        "from": "vnfc",
+                        "to": "vnfc",
+                        "label": "ncso.related-to",
+                        "direction": "OUT",
+                        "multiplicity": "MANY2MANY",
+                        "contains-other-v": "NONE",
+                        "delete-other-v": "NONE",
+                        "prevent-delete": "NONE",
+                        "default": "true",
+                        "description":""
+},
+{
+                        "from": "vnfc",
+                        "to": "vserver",
+                        "label": "ncso.related-to",
+                        "direction": "OUT",
+                        "multiplicity": "MANY2MANY",
+                        "contains-other-v": "NONE",
+                        "delete-other-v": "NONE",
+                        "prevent-delete": "NONE",
+                        "default": "true",
+                        "description":""
+},
+{
+                        "from": "generic-vnf",
+                        "to": "service-instance",
+                        "label": "ncso.related-to",
+                        "direction": "OUT",
+                        "multiplicity": "MANY2MANY",
+                        "contains-other-v": "NONE",
+                        "delete-other-v": "NONE",
+                        "prevent-delete": "NONE",
+                        "default": "true",
+                        "description":""
+},
+{
+                        "from": "generic-vnf",
+                        "to": "generic-vnf",
+                        "label": "ncso.related-to",
+                        "direction": "OUT",
+                        "multiplicity": "MANY2MANY",
+                        "contains-other-v": "NONE",
+                        "delete-other-v": "NONE",
+                        "prevent-delete": "NONE",
+                        "default": "true",
+                        "description":""
+			},
+{
+			"from": "service-instance",
+			"to": "generic-vnf",
+			"label": "ncso.related-to",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+},
+{
+			"from": "generic-vnf",
+			"to": "vserver",
+			"label": "ncso.related-to",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+},
+		{
+			"from": "allotted-resource",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "network-policy",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tunnel-xconnect",
+			"to": "allotted-resource",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "availability-zone",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "availability-zone",
+			"to": "service-capability",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "availability-zone",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cloud-region",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cloud-region",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.FoundIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cloud-region",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cloud-region",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "dvs-switch",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "flavor",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "group-assignment",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "image",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "oam-network",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "snapshot",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tenant",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv4-address-list",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv6-address-list",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "volume-group",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "complex",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "ctag-pool",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "allotted-resource",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "connector",
+			"to": "virtual-data-center",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "connector",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "element-choice-set",
+			"to": "constrained-element-set",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "ctag-pool",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-subscription",
+			"to": "customer",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "dvs-switch",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-element",
+			"to": "element-choice-set",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "entitlement",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "ctag-pool",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "ipsec-configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "pnf",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "pserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "vnf-image",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.DependsOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "license",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "network-profile",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "site-pair-set",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "group-assignment",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tenant",
+			"to": "group-assignment",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "image",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "instance-group",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.Targets",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vig-server",
+			"to": "ipsec-configuration",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "ctag-assignment",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "network-policy",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "route-table-reference",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "segmentation-assignment",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "subnet",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "lag-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "line-of-business",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "logical-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Source",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.Destination",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "sriov-vf",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vlan",
+			"to": "l-interface",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BridgedTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "lag-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.BridgedTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.BridgedTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-ver",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "constrained-element-set",
+			"to": "model-constraint",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "constrained-element-set",
+			"to": "model-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-constraint",
+			"to": "model-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-element",
+			"to": "model-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-element",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "model-element",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "named-query",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "named-query-element",
+			"to": "named-query",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "named-query-element",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "named-query-element",
+			"to": "named-query-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "property-constraint",
+			"to": "named-query-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "related-lookup",
+			"to": "named-query-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "newvce",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "oam-network",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "oam-network",
+			"to": "service-capability",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "operational-environment",
+			"to": "operational-environment",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "owning-entity",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "p-interface",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "logical-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "physical-link",
+			"label": "tosca.relationships.network.LinksTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "sriov-pf",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "platform",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "pnf",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "pnf",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pnf",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pnf",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pnf",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "cvlan-tag",
+			"to": "port-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "project",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "pserver",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "pserver",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "pserver",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "site-pair",
+			"to": "routing-instance",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "metadatum",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "allotted-resource",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "connector",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "ctag-assignment",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "cvlan-tag",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "zone",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "service-subscription",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "class-of-service",
+			"to": "site-pair",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "routing-instance",
+			"to": "site-pair-set",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "sriov-vf",
+			"to": "sriov-pf",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "host-route",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-subscription",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tenant",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "entitlement",
+			"to": "vce",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "license",
+			"to": "vce",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "port-group",
+			"to": "vce",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "vce",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vce",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vce",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vce",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.DependsOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "vnfc",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv4-address-list",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv4-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv6-address-list",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vip-ipv6-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "virtual-data-center",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "virtual-data-center",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vlan",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vlan",
+			"to": "multicast-configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv4-address-list",
+			"to": "vnfc",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-interface-ipv6-address-list",
+			"to": "vnfc",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "vip-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "vip-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "tenant",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.DependsOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "volume-group",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "lag-interface",
+			"to": "vpls-pe",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "p-interface",
+			"to": "vpls-pe",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vpls-pe",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vpls-pe",
+			"to": "ctag-pool",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "route-target",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l-interface",
+			"to": "vserver",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "vserver",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vnfc",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "flavor",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "image",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "pserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "snapshot",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vserver",
+			"to": "volume",
+			"label": "tosca.relationships.AttachesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "zone",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "allotted-resource",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "l3-network",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "logical-link",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vf-module",
+			"to": "model-ver",
+			"label": "org.onap.relationships.inventory.IsA",
+			"direction": "OUT",
+			"multiplicity": "Many2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "forwarding-path",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarding-path",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.ForwardsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarding-path",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.ForwardsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "evc",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder-evc",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "p-interface",
+			"label": "org.onap.relationships.inventory.ForwardsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "generic-vnf",
+			"to": "nos-server",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "nos-server",
+			"to": "pserver",
+			"label": "tosca.relationships.HostedOn",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "nos-server",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "configuration",
+			"label": "tosca.relationships.network.BindsTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "configuration",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.PartOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "vpn-binding",
+			"to": "customer",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":""
+		},
+		{
+			"from": "service-instance",
+			"to": "configuration",
+			"label": "org.onap.relationships.inventory.ComposedOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "false",
+			"description":""
+		},
+		{
+			"from": "forwarder",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "Points to the generic-vnf(s) involved in this forwarding step."
+		},
+        {
+            "from": "cloud-region",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+         },
+		 {
+			"from": "collection",
+			"to": "instance-group",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		 },
+		 {
+			"from": "service-instance",
+			"to": "collection",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		 },
+		 {
+			"from": "vlan-mapping",
+			"to": "forwarder-evc",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": ""
+		 }
+	]
+}
\ No newline at end of file
diff --git a/aai-schema-abstraction/src/test/resources/oxm/oxm/v13/aai_oxm_v13.xml b/aai-schema-abstraction/src/test/resources/oxm/oxm/v13/aai_oxm_v13.xml
new file mode 100644
index 00000000..bb786a35
--- /dev/null
+++ b/aai-schema-abstraction/src/test/resources/oxm/oxm/v13/aai_oxm_v13.xml
@@ -0,0 +1,6775 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ============LICENSE_START=======================================================
+  org.onap.aai
+  ================================================================================
+  Copyright (C) 2017 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=========================================================
+  -->
+
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v13" xml-mapping-metadata-complete="true">
+	<xml-schema element-form-default="QUALIFIED">
+		<xml-ns namespace-uri="http://org.onap.aai.inventory/v13" />
+	</xml-schema>
+	<java-types>
+		<java-type name="Inventory">
+			<xml-root-element name="inventory" />
+			<java-attributes>
+				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v13.Search" />
+				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v13.Actions" />
+				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v13.CloudInfrastructure" />
+				<xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v13.ExternalSystem" />
+				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v13.Business" />
+				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v13.ServiceDesignAndCreation" />
+				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v13.Network" />
+				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v13.AaiInternal" />
+				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v13.Nodes"/>
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Nodes">
+			<xml-root-element name="nodes" />
+		</java-type>
+		<java-type name="Search">
+			<xml-root-element name="search" />
+			<java-attributes>
+				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v13.EdgeTagQueryResult" />
+				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v13.EdgeTagQueryRequest" />
+				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v13.SearchResults" />
+				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v13.SdnZoneResponse" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="EdgeTagQueryResult">
+			<xml-root-element name="edge-tag-query-result" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v13.TaggedInventoryItemList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="TaggedInventoryItemList">
+			<xml-root-element name="tagged-inventory-item-list" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v13.InventoryItem" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="InventoryItem">
+			<xml-root-element name="inventory-item" />
+			<java-attributes>
+				<xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
+				<xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v13.InventoryItemData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v13.TaggedInventoryItemList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="InventoryItemData">
+			<xml-root-element name="inventory-item-data" />
+			<java-attributes>
+				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="EdgeTagQueryRequest">
+			<xml-root-element name="edge-tag-query-request" />
+			<java-attributes>
+				<xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
+				<xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
+				<xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v13.StartNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v13.IncludeNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v13.SecondaryFilter" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="StartNodeFilter">
+			<xml-root-element name="start-node-filter" />
+			<java-attributes>
+				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="IncludeNodeFilter">
+			<xml-root-element name="include-node-filter" />
+			<java-attributes>
+				<xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="SecondaryFilter">
+			<xml-root-element name="secondary-filter" />
+			<java-attributes>
+				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+				<xml-element java-attribute="filterType" name="filter-type" type="java.lang.String" />
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="SearchResults">
+			<xml-root-element name="search-results" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v13.ResultData" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ResultData">
+			<xml-root-element name="result-data" />
+			<java-attributes>
+				<xml-element java-attribute="resourceType" name="resource-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The specific type of node in the A&amp;AI graph" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceLink" name="resource-link" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The URL to the specific resource" />
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+		</java-type>
+
+		<java-type name="SdnZoneResponse">
+			<xml-root-element name="sdn-zone-response" />
+			<java-attributes>
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v13.OamNetworks" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v13.AzAndDvsSwitches" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="AzAndDvsSwitches">
+			<xml-root-element name="az-and-dvs-switches" />
+			<java-attributes>
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v13.DvsSwitches" />
+				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v13.AvailabilityZone" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Actions">
+			<xml-properties>
+				<xml-property name="description" value="APIs that are more action related than REST (e.g., notify, update)." />
+			</xml-properties>
+			<xml-root-element name="actions" />
+			<java-attributes>
+				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v13.Update" />
+				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v13.Notify" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Update">
+			<xml-properties>
+				<xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team." />
+			</xml-properties>
+			<xml-root-element name="update" />
+			<java-attributes>
+				<xml-element java-attribute="updateNodeType" name="update-node-type"  type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v13.UpdateNodeKey" />
+				<xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v13.Action" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Action">
+			<xml-root-element name="action" />
+			<java-attributes>
+				<xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v13.ActionData" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ActionData">
+			<xml-root-element name="action-data" />
+			<java-attributes>
+				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="UpdateNodeKey">
+			<xml-root-element name="update-node-key" />
+			<java-attributes>
+				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
+				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Notify">
+			<xml-root-element name="notify" />
+			<java-attributes>
+				<xml-element java-attribute="eventId" name="event-id"  type="java.lang.String" />
+				<xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
+				<xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v13.KeyData" />
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="KeyData">
+			<xml-root-element name="key-data" />
+			<java-attributes>
+				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String" />
+				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+               <java-type name="ExternalSystem">
+                       <xml-properties>
+                               <xml-property name="description" value="Namespace for external system." />
+                       </xml-properties>
+                       <xml-root-element name="external-system" />
+                       <java-attributes>
+                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v13.EsrEmsList" />
+                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v13.EsrVnfmList" />
+                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v13.EsrThirdpartySdncList" />
+                       </java-attributes>
+               </java-type>
+
+               <java-type name="EsrEmsList">
+                       <xml-root-element name="esr-ems-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v13.EsrEms" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrEms">
+                       <xml-root-element name="esr-ems" />
+                       <java-attributes>
+                               <xml-element java-attribute="emsId" name="ems-id"  type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of EMS." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist EMS address information used by EMS driver." />
+                               <xml-property name="indexedProps" value="ems-id" />
+                               <xml-property name="searchable" value="ems-id" />
+                               <xml-property name="container" value="esr-ems-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrVnfmList">
+                       <xml-root-element name="esr-vnfm-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v13.EsrVnfm" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrVnfm">
+                       <xml-root-element name="esr-vnfm" />
+                       <java-attributes>
+                               <xml-element java-attribute="vnfmId" name="vnfm-id"  type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of VNFM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vimId" name="vim-id" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="indecate the VIM to deploy VNF." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="certificateUrl" name="certificate-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="certificate url of VNFM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist VNFM address information used by VF-C." />
+                               <xml-property name="indexedProps" value="vnfm-id" />
+                               <xml-property name="searchable" value="vnfm-id" />
+                               <xml-property name="container" value="esr-vnfm-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrThirdpartySdncList">
+                       <xml-root-element name="esr-thirdparty-sdnc-list" />
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v13.EsrThirdpartySdnc" />
+                       </java-attributes>
+            <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrThirdpartySdnc">
+                       <xml-root-element name="esr-thirdparty-sdnc" />
+                       <java-attributes>
+                               <xml-element java-attribute="thirdpartySdncId" name="thirdparty-sdnc-id"  type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of SDNC." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="location" name="location" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="used for DC type to indicate the location of SDNC, such as Core or Edge." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="productName" name="product-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="password used to access SDNC server." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC." />
+                               <xml-property name="indexedProps" value="sdnc-id" />
+                               <xml-property name="searchable" value="sdnc-id" />
+                               <xml-property name="container" value="esr-thirdparty-sdnc-list" />
+                               <xml-property name="namespace" value="external-system" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrSystemInfoList">
+                       <xml-root-element name="esr-system-info-list" />
+                       <xml-properties>
+                               <xml-property name="description" value="Collection of persistent block-level external system auth info." />
+                       </xml-properties>
+                       <java-attributes>
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v13.EsrSystemInfo" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="maximumDepth" value="0" />
+                       </xml-properties>
+               </java-type>
+
+               <java-type name="EsrSystemInfo">
+                       <xml-root-element name="esr-system-info" />
+                       <java-attributes>
+                               <xml-element java-attribute="esrSystemInfoId" name="esr-system-info-id"  type="java.lang.String" xml-key="true">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Unique ID of esr system info." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemName" name="system-name" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="name of external system." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="type" name="type" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="type of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="vendor of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="version" name="version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="version of external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="serviceUrl" name="service-url" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="url used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="userName" name="user-name"  type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="username used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="password" name="password"  type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="password used to access external systems." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemType" name="system-type"  type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="protocol" name="protocol" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="sslCacert" name="ssl-cacert" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ca file content if enabled ssl on auth-url." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Whether to verify VIM's certificate." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="service IP of ftp server." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="port" name="port" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="service port of ftp server." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="cloudDomain" name="cloud-domain" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="domain info for authentication." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="defaultTenant" name="default-tenant" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="default tenant of VIM." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean">
+                                       <xml-properties>
+                                               <xml-property name="description" value="ftp passive mode or not." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="remotepath" name="remote-path" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="resource or performance data file path." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="systemStatus" name="system-status" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="the status of external system." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                                       <xml-properties>
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                       </xml-properties>
+                               </xml-element>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+                       </java-attributes>
+                       <xml-properties>
+                               <xml-property name="description" value="Persist common address information of external systems." />
+                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" />
+                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type" />
+                               <xml-property name="container" value="esr-system-info-list" />
+                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc" />
+                       </xml-properties>
+               </java-type>
+
+		<java-type name="HpaCapabilities">
+			<xml-properties>
+				<xml-property name="description" value="Collection of HPA Capabilities"/>
+			</xml-properties>
+			<xml-root-element name="hpa-capabilities"/>
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="hpaCapability" name="hpa-capability" type="inventory.aai.onap.org.v13.HpaCapability"/>
+			</java-attributes>
+		</java-type>
+
+		<java-type name="HpaCapability">
+			<xml-root-element name="hpa-capability"/>
+			<java-attributes>
+				<xml-element java-attribute="hpaCapabilityId" name="hpa-capability-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="UUID to uniquely identify a HPA capability"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="hpaFeature" name="hpa-feature"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the HPACapability"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="hpaVersion" name="hpa-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="HPA schema version"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="architecture" name="architecture" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Hardware architecture"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="hpaFeatureAttributes" name="hpa-feature-attributes" type="inventory.aai.onap.org.v13.HpaFeatureAttributes"/>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Represents a HPA capability"/>
+				<xml-property name="indexedProps" value="hpa-feature,architecture,hpa-capability-id"/>
+				<xml-property name="dependentOn" value="flavor,cloud-region"/>
+				<xml-property name="container" value="hpa-capabilities"/>
+			</xml-properties>
+		</java-type>
+
+		<java-type name="HpaFeatureAttributes">
+			<xml-root-element name="hpa-feature-attributes"/>
+			<java-attributes>
+				<xml-element java-attribute="hpaAttributeKey" name="hpa-attribute-key"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="name of the specific HPA attribute"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="hpaAttributeValue" name="hpa-attribute-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="JSON string specifying the value, unit and type of the specific HPA attribute"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="HPA Capability Feature attributes"/>
+				<xml-property name="indexedProps" value="hpa-attribute-key"/>
+				<xml-property name="dependentOn" value="hpa-capability"/>
+			</xml-properties>
+		</java-type>
+
+		<java-type name="CloudInfrastructure">
+			<xml-properties>
+				<xml-property name="description" value="Namespace for cloud infrastructure." />
+			</xml-properties>
+			<xml-root-element name="cloud-infrastructure" />
+			<java-attributes>
+				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v13.Complexes" />
+				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v13.CloudRegions" />
+				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v13.NetworkProfiles" />
+				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v13.Pservers" />
+				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v13.VirtualDataCenters" />
+				<xml-element java-attribute="operationalEnvironments" name="operational-environments" type="inventory.aai.onap.org.v13.OperationalEnvironments" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="CloudRegions">
+			<xml-root-element name="cloud-regions" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v13.CloudRegion" />
+			</java-attributes>
+            <xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="CloudRegion">
+			<xml-root-element name="cloud-region" />
+			<java-attributes>
+				<xml-element java-attribute="cloudOwner" name="cloud-owner"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cloudRegionId" name="cloud-region-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Identifier used by the vendor for the region. Second part of composite key" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cloudType" name="cloud-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type of the cloud (e.g., openstack)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ownerDefinedType" name="owner-defined-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Cloud-owner defined type indicator (e.g., dcp, lcp)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cloudRegionVersion" name="cloud-region-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Software version employed at the site.  NOTE - THIS FIELD IS NOT KEPT UP TO DATE." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL of the keystone identity service" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cloudZone" name="cloud-zone" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Zone where the cloud is homed.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="complex name for cloud-region instance.  NOTE - THIS FIELD IS NOT CORRECTLY POPULATED." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="sriovAutomation" name="sriov-automation" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="Whether the cloud region supports (true) or does not support (false) SR-IOV automation." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cloudEpaCaps" name="cloud-epa-caps" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="MultiVIM will discover and expose EPA capabilities." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v13.VolumeGroups" />
+				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v13.Tenants" />
+				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v13.Flavors" />
+				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v13.GroupAssignments" />
+				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v13.Snapshots" />
+				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v13.Images" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v13.DvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v13.OamNetworks" />
+				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v13.AvailabilityZones" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v13.VipIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v13.VipIpv6AddressList" />
+				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v13.HpaCapabilities">
+					<xml-properties>
+						<xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v13.EsrSystemInfoList" />
+            </java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation." />
+				<xml-property name="indexedProps" value="cloud-owner,cloud-region-id,cloud-type,owner-defined-type" />
+				<xml-property name="nameProps" value="owner-defined-type" />
+				<xml-property name="container" value="cloud-regions" />
+				<xml-property name="namespace" value="cloud-infrastructure" />
+			</xml-properties>
+		</java-type>
+		<java-type name="VolumeGroups">
+			<xml-properties>
+				<xml-property name="description" value="Collection of persistent block-level storage." />
+			</xml-properties>
+			<xml-root-element name="volume-groups" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v13.VolumeGroup" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="VolumeGroup">
+			<xml-root-element name="volume-group" />
+			<java-attributes>
+				<xml-element java-attribute="volumeGroupId" name="volume-group-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of volume-group." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="volumeGroupName" name="volume-group-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the volume group." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Heat stack id corresponding to this volume-group" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfType" name="vnf-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this volume-group" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfModuleModelCustomizationId" name="vf-module-model-customization-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="helps relate the volume group to the vf-module whose components will require the volume group" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Persistent block-level storage." />
+				<xml-property name="indexedProps" value="volume-group-name,vnf-type,heat-stack-id,volume-group-id" />
+				<xml-property name="searchable" value="volume-group-id,volume-group-name" />
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="volume-groups" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="RelationshipList">
+			<xml-root-element name="relationship-list" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v13.Relationship" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Relationship">
+			<xml-root-element name="relationship" />
+			<java-attributes>
+				<xml-element java-attribute="relatedTo" name="related-to" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate type of node." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The edge label for this relationship." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to the object in A&amp;AI." />
+					</xml-properties>
+				</xml-element>
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v13.RelationshipData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v13.RelatedToProperty" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="RelatedToProperty">
+			<xml-root-element name="related-to-property" />
+			<java-attributes>
+				<xml-element java-attribute="propertyKey" name="property-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Key part of a key/value pair" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Value part of a key/value pair" />
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+		</java-type>
+
+		<java-type name="RelationshipData">
+			<xml-root-element name="relationship-data" />
+			<java-attributes>
+				<xml-element java-attribute="relationshipKey" name="relationship-key"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="A keyword provided by A&amp;AI to indicate an attribute." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipValue" name="relationship-value"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Value of the attribute." />
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Complexes">
+			<xml-properties>
+				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
+			</xml-properties>
+			<xml-root-element name="complexes" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v13.Complex" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Complex">
+			<xml-root-element name="complex" />
+			<java-attributes>
+				<xml-element java-attribute="physicalLocationId" name="physical-location-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier for physical location, e.g., CLLI" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dataCenterCode" name="data-center-code" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Data center code which can be an alternate way to identify a complex" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="complexName" name="complex-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Gamma complex name for LCP instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="identityUrl" name="identity-url" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL of the keystone identity service" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="physicalLocationType" name="physical-location-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type, e.g., central office, data center." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="street1" name="street1"  type="java.lang.String" />
+				<xml-element java-attribute="street2" name="street2" type="java.lang.String" />
+				<xml-element java-attribute="city" name="city"  type="java.lang.String" />
+				<xml-element java-attribute="state" name="state" type="java.lang.String" />
+				<xml-element java-attribute="postalCode" name="postal-code"  type="java.lang.String" />
+				<xml-element java-attribute="country" name="country"  type="java.lang.String" />
+				<xml-element java-attribute="region" name="region"  type="java.lang.String" />
+				<xml-element java-attribute="latitude" name="latitude" type="java.lang.String" />
+				<xml-element java-attribute="longitude" name="longitude" type="java.lang.String" />
+				<xml-element java-attribute="elevation" name="elevation" type="java.lang.String" />
+				<xml-element java-attribute="lata" name="lata" type="java.lang.String" />
+				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v13.CtagPools" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
+				<xml-property name="indexedProps" value="identity-url,data-center-code,complex-name,physical-location-id" />
+				<xml-property name="searchable" value="physical-location-id,data-center-code,complex-name,street1,street2,postal-code" />
+				<xml-property name="uniqueProps" value="physical-location-id" />
+				<xml-property name="container" value="complexes" />
+				<xml-property name="namespace" value="cloud-infrastructure" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="CtagPools">
+			<xml-root-element name="ctag-pools" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v13.CtagPool" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="CtagPool">
+			<xml-root-element name="ctag-pool" />
+			<java-attributes>
+				<xml-element java-attribute="targetPe" name="target-pe"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="The Target provider edge router" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Name of the availability zone" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ctagPoolPurpose" name="ctag-pool-purpose"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Describes what the intended purpose of this pool is." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ctagValues" name="ctag-values" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Comma separated list of ctags" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
+				<xml-property name="indexedProps" value="availability-zone-name" />
+				<xml-property name="dependentOn" value="complex" />
+				<xml-property name="container" value="ctag-pools" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Tenants">
+			<xml-properties>
+				<xml-property name="description" value="Collection of openstack tenants." />
+			</xml-properties>
+			<xml-root-element name="tenants" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v13.Tenant" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Tenant">
+			<xml-root-element name="tenant" />
+			<java-attributes>
+				<xml-element java-attribute="tenantId" name="tenant-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id relative to the cloud-region." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="tenantName" name="tenant-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Readable name of tenant" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="tenantContext" name="tenant-context" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This field will store the tenant context." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v13.Vservers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Openstack tenant" />
+				<xml-property name="nameProps" value="tenant-name" />
+				<xml-property name="indexedProps" value="tenant-name,tenant-id,tenant-context" />
+				<xml-property name="searchable" value="tenant-id,tenant-name" />
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="tenants" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Vservers">
+			<xml-properties>
+				<xml-property name="description" value="Collection of virtual Servers, aka virtual machines or VMs." />
+			</xml-properties>
+			<xml-root-element name="vservers" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v13.Vserver" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Vserver">
+			<xml-root-element name="vserver" />
+			<java-attributes>
+				<xml-element java-attribute="vserverId" name="vserver-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier for this vserver relative to its tenant" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vserverName" name="vserver-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of vserver" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vserverName2" name="vserver-name2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Alternative name of vserver" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vserverSelflink" name="vserver-selflink"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="Used to indicate whether closed loop function is enabled on this node" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v13.Volumes" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
+				<xml-property name="nameProps" value="vserver-name" />
+				<xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2" />
+				<xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2" />
+				<xml-property name="dependentOn" value="tenant" />
+				<xml-property name="container" value="vservers" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="LInterfaces">
+			<xml-properties>
+				<xml-property name="description" value="Collection of logical interfaces." />
+			</xml-properties>
+			<xml-root-element name="l-interfaces" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v13.LInterface" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="LInterface">
+			<xml-root-element name="l-interface" />
+			<java-attributes>
+				<xml-element java-attribute="interfaceName" name="interface-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Name given to the interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="E.g., CUSTOMER, UPLINK, etc." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="v6WanLinkIp" name="v6-wan-link-ip" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Questionably placed - v6 ip addr of this interface (is in vr-lan-interface from Mary B." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ID of interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="macaddr" name="macaddr" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="MAC address for the interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkName" name="network-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the network" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER" />
+					</xml-properties>
+				</xml-element>	
+				<xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Human friendly text regarding this interface." />
+					</xml-properties>
+				</xml-element>			
+				<xml-element java-attribute="isPortMirrored" name="is-port-mirrored"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="boolean indicatating whether or not port is a mirrored." />
+					</xml-properties>
+				</xml-element>					
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false" java-attribute="inMaint" name="in-maint"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Prov Status of the logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="allowedAddressPairs" name="allowed-address-pairs" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Freeform field for storing an ip address, list of ip addresses or a subnet block." />
+					</xml-properties>
+				</xml-element>				
+				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v13.Vlans" />
+				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v13.SriovVfs" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
+				<xml-property name="indexedProps" value="macaddr,interface-id,interface-name,network-name" />
+				<xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface" />
+				<xml-property name="container" value="l-interfaces" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="SriovVfs">
+			<xml-properties>
+				<xml-property name="description" value="Collection of SR-IOV Virtual Functions." />
+			</xml-properties>
+			<xml-root-element name="sriov-vfs" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v13.SriovVf" />
+			</java-attributes>
+		</java-type>
+		<java-type name="SriovVf">
+			<xml-root-element name="sriov-vf" />
+			<java-attributes>
+				<xml-element java-attribute="pciId" name="pci-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="PCI ID used to identify the sriov-vf" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfVlanFilter" name="vf-vlan-filter" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfMacFilter" name="vf-mac-filter" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfVlanStrip" name="vf-vlan-strip" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfVlanAntiSpoofCheck" name="vf-vlan-anti-spoof-check" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="This option ensures anti VLAN spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfMacAntiSpoofCheck" name="vf-mac-anti-spoof-check" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="This option ensures anti MAC spoof checks are done at the VF level to comply with security. The disable check will also be honored per the VNF needs for trusted VMs." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfMirrors" name="vf-mirrors" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfBroadcastAllow" name="vf-broadcast-allow" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfUnknownMulticastAllow" name="vf-unknown-multicast-allow" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfUnknownUnicastAllow" name="vf-unknown-unicast-allow" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfInsertStag" name="vf-insert-stag" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="This option, if set to true, instructs to insert outer tag after traffic comes out of VM." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfLinkStatus" name="vf-link-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron network id of the interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
+				<xml-property name="indexedProps" value="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id" />
+				<xml-property name="dependentOn" value="l-interface" />
+				<xml-property name="container" value="sriov-vfs" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="L3InterfaceIpv4AddressList">
+			<xml-root-element name="l3-interface-ipv4-address-list" />
+			<java-attributes>
+				<xml-element java-attribute="l3InterfaceIpv4Address" name="l3-interface-ipv4-address"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="IP address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="l3InterfaceIpv4PrefixLength" name="l3-interface-ipv4-prefix-length" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Prefix length, 32 for single address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Inner VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Outer VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="Indicator of fixed or floating address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="IPv4 Address Range" />
+				<xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Vlans">
+			<xml-root-element name="vlans" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v13.Vlan" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Vlan">
+			<xml-root-element name="vlan" />
+			<java-attributes>
+				<xml-element java-attribute="vlanInterface" name="vlan-interface"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="String that identifies the interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Inner VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Outer VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the numeric part of the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the units corresponding to the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanDescription" name="vlan-description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used to describe (the service associated with) the vlan" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="backdoorConnection" name="backdoor-connection" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Whether customer is going to use this VLAN for backdoor connection to another customer premise device." />
+					</xml-properties>
+				</xml-element>					
+				<xml-element java-attribute="vpnKey" name="vpn-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." />
+					</xml-properties>
+				</xml-element>
+					<xml-element default-value="false" java-attribute="inMaint" name="in-maint"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Prov Status of the VLAN configuration related to a logical interface. Valid values [PREPROV/NVTPROV/PROV]." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false" java-attribute="isIpUnnumbered" name="is-ip-unnumbered"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration." />
+					</xml-properties>
+				</xml-element>			
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Definition of vlan" />
+				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-key" />
+				<xml-property name="dependentOn" value="l-interface" />
+				<xml-property name="container" value="vlans" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="L3InterfaceIpv6AddressList">
+			<xml-root-element name="l3-interface-ipv6-address-list" />
+			<java-attributes>
+				<xml-element java-attribute="l3InterfaceIpv6Address" name="l3-interface-ipv6-address"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="IP address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="l3InterfaceIpv6PrefixLength" name="l3-interface-ipv6-prefix-length" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Prefix length, 128 for single address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Inner VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Outer VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="Indicator of fixed or floating address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="IPv6 Address Range" />
+				<xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Volumes">
+			<xml-properties>
+				<xml-property name="description" value="Collection of ephemeral Block storage volumes." />
+			</xml-properties>
+			<xml-root-element name="volumes" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v13.Volume" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Volume">
+			<xml-root-element name="volume" />
+			<java-attributes>
+				<xml-element java-attribute="volumeId" name="volume-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of block storage volume relative to the vserver." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="volumeSelflink" name="volume-selflink"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Ephemeral Block storage volume." />
+				<xml-property name="indexedProps" value="volume-id" />
+				<xml-property name="dependentOn" value="vserver" />
+				<xml-property name="container" value="volumes" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Flavors">
+			<xml-properties>
+				<xml-property name="description" value="Collection of openstack flavors." />
+			</xml-properties>
+			<xml-root-element name="flavors" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v13.Flavor" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Flavor">
+			<xml-root-element name="flavor" />
+			<java-attributes>
+				<xml-element java-attribute="flavorId" name="flavor-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Flavor id, expected to be unique across cloud-region." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorName" name="flavor-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Cloud Region Flavor name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Number of CPUs" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorRam" name="flavor-ram" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Amount of memory" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorDisk" name="flavor-disk" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Disk space" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorEphemeral" name="flavor-ephemeral" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Amount of ephemeral disk space" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorSwap" name="flavor-swap" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="amount of swap space allocation" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorIsPublic" name="flavor-is-public" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="whether flavor is available to all users or private to the tenant it was created in." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorSelflink" name="flavor-selflink"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="flavorDisabled" name="flavor-disabled" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="Boolean as to whether this flavor is no longer enabled" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v13.HpaCapabilities">
+					<xml-properties>
+						<xml-property name="description" value="List of flavor specific HPA Capabilities"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Openstack flavor." />
+				<xml-property name="nameProps" value="flavor-name" />
+				<xml-property name="indexedProps" value="flavor-name,flavor-id" />
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="flavors" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="Snapshots">
+			<xml-properties>
+				<xml-property name="description" value="Collection of openstack snapshots" />
+			</xml-properties>
+			<xml-root-element name="snapshots" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v13.Snapshot" />
+			</java-attributes>		
+		</java-type>
+		
+		<java-type name="Snapshot">
+			<xml-root-element name="snapshot" />
+			<java-attributes>
+				<xml-element java-attribute="snapshotId" name="snapshot-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Snapshot id, this is the key UUID assoc associated in glance with the snapshots." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="snapshotName" name="snapshot-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Snapshot name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="snapshotArchitecture" name="snapshot-architecture" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Operating system architecture" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="snapshotOsDistro" name="snapshot-os-distro" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="snapshotOsVersion" name="snapshot-os-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The operating system version as specified by the distributor." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="application" name="application" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The application that the image instantiates." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The vendor of the application." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The version of the application." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="snapshotSelflink" name="snapshot-selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="prevSnapshotId" name="prev-snapshot-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This field contains the UUID of the previous snapshot (if any)." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Openstack snapshot" />
+				<xml-property name="nameProps" value="snapshot-name" />
+				<xml-property name="uniqueProps" value="snapshot-id" />
+				<xml-property name="indexedProps" value="application,snapshot-name,application-vendor,snapshot-id,application-version,prev-snapshot-id" />
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="snapshots" />
+			</xml-properties>	
+		</java-type>
+		
+		<java-type name="GroupAssignments">
+			<xml-properties>
+				<xml-property name="description" value="Collection of openstack group assignments" />
+			</xml-properties>
+			<xml-root-element name="group-assignments" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v13.GroupAssignment" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="GroupAssignment">
+			<xml-root-element name="group-assignment" />
+			<java-attributes>
+				<xml-element java-attribute="groupId" name="group-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Group id, expected to be unique across cloud-region." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="groupType" name="group-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Group type - the type of group this instance refers to" />
+					</xml-properties>
+				</xml-element>				
+				<xml-element java-attribute="groupName" name="group-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Group name - name assigned to the group" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="groupDescription" name="group-description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Group description - description of the group" />
+					</xml-properties>
+				</xml-element>	
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>		
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
+				<xml-property name="nameProps" value="group-name" />
+				<xml-property name="indexedProps" value="group-id,group-type,group-name" />
+				<xml-property name="searchable" value="group-id,group-name"/>
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="group-assignments" />
+			</xml-properties>
+		</java-type>			
+
+		<java-type name="Images">
+			<xml-properties>
+				<xml-property name="description" value="Collectio of Openstack images." />
+			</xml-properties>
+			<xml-root-element name="images" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v13.Image" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Image">
+			<xml-root-element name="image" />
+			<java-attributes>
+				<xml-element java-attribute="imageId" name="image-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Image id, expected to be unique across cloud region" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="imageName" name="image-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Image name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="imageArchitecture" name="image-architecture" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Operating system architecture." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="imageOsDistro" name="image-os-distro"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The common name of the operating system distribution in lowercase" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="imageOsVersion" name="image-os-version"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The operating system version as specified by the distributor." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="application" name="application" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The application that the image instantiates." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="applicationVendor" name="application-vendor" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The vendor of the application." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The version of the application." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="imageSelflink" name="image-selflink"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Openstack image." />
+				<xml-property name="nameProps" value="image-name" />
+				<xml-property name="indexedProps" value="application,image-name,application-vendor,image-id,application-version" />
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="images" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Metadata">
+			<xml-properties>
+				<xml-property name="description" value="Collection of metadatum (key/value pairs)" />
+			</xml-properties>
+			<xml-root-element name="metadata" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v13.Metadatum" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Metadatum">
+			<xml-root-element name="metadatum" />
+			<java-attributes>
+				<xml-element java-attribute="metaname" name="metaname"  type="java.lang.String" xml-key="true" />
+				<xml-element java-attribute="metaval" name="metaval"  type="java.lang.String" />
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Key/value pairs" />
+				<xml-property name="indexedProps" value="metaname" />
+				<xml-property name="dependentOn" value="tenant,image,service-instance,connector,model" />
+				<xml-property name="container" value="metadata" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="DvsSwitches">
+			<xml-properties>
+				<xml-property name="description" value="Collection of digital virtual switch metadata used for vmWare VCEs and GenericVnfs." />
+			</xml-properties>
+			<xml-root-element name="dvs-switches" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v13.DvsSwitch" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="DvsSwitch">
+			<xml-root-element name="dvs-switch" />
+			<java-attributes>
+				<xml-element java-attribute="switchName" name="switch-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="DVS switch name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vcenterUrl" name="vcenter-url"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL used to reach the vcenter" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Digital virtual switch metadata, used by SDN-C to configure VCEs.  A&amp;AI needs to receive this data from the PO deployment team and administer it using the provisioningTool.sh into A&amp;AI. " />
+				<xml-property name="indexedProps" value="vcenter-url,switch-name" />
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="dvs-switches" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="NetworkProfiles">
+			<xml-properties>
+				<xml-property name="description" value="Collection of network profiles" />
+			</xml-properties>
+			<xml-root-element name="network-profiles" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v13.NetworkProfile" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="NetworkProfile">
+			<xml-root-element name="network-profile" />
+			<java-attributes>
+				<xml-element java-attribute="nmProfileName" name="nm-profile-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique name of network profile." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="communityString" name="community-string" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Encrypted SNMP community string" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
+				<xml-property name="indexedProps" value="nm-profile-name" />
+				<xml-property name="container" value="network-profiles" />
+				<xml-property name="namespace" value="cloud-infrastructure" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Pservers">
+			<xml-properties>
+				<xml-property name="description" value="Collection of compute hosts." />
+			</xml-properties>
+			<xml-root-element name="pservers" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v13.Pserver" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Pserver">
+			<xml-root-element name="pserver" />
+			<java-attributes>
+				<xml-element java-attribute="hostname" name="hostname" required="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Value from executing hostname on the compute node." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ptniiEquipName" name="ptnii-equip-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="PTNII name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="numberOfCpus" name="number-of-cpus" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Number of cpus" />
+                  <xml-property name="source-of-truth-type" value="openstack"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="diskInGigabytes" name="disk-in-gigabytes" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Disk size, in GBs" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ramInMegabytes" name="ram-in-megabytes" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="RAM size, in MBs" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="fqdn" name="fqdn" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Fully-qualified domain name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="pserverSelflink" name="pserver-selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used to configure device, also used for troubleshooting and is IP used for traps generated by device." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Serial number, may be queried" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV4 Loopback 0 address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV6 Loopback 0 address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV4 AIM address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV6 AIM address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV6 OAM address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="pserverId" name="pserver-id" type="java.lang.String" required="true" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="ID of Pserver" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="internetTopology" name="internet-topology" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="internet topology of Pserver" />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="pserverName2" name="pserver-name2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="alternative pserver name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="purpose of pserver" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicates who owns and or manages the device." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="hostProfile" name="host-profile" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The host profile that defines the configuration of the pserver." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver." />
+				<xml-property name="nameProps" value="pserver-name2" />
+				<xml-property name="indexedProps" value="hostname,in-maint,pserver-id,pserver-name2,inv-status" />
+				<xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address" />
+				<xml-property name="container" value="pservers" />
+				<xml-property name="namespace" value="cloud-infrastructure" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="PInterfaces">
+			<xml-properties>
+				<xml-property name="description" value="Collection of physical interfaces." />
+			</xml-properties>
+			<xml-root-element name="p-interfaces" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v13.PInterface" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="PInterface">
+			<xml-root-element name="p-interface" />
+			<java-attributes>
+				<xml-element java-attribute="interfaceName" name="interface-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Name that identifies the physical interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the numeric part of the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the units corresponding to the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="portDescription" name="port-description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Nature of the services and connectivity on this port." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipmentIdentifier" name="equipment-identifier" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="CLEI or other specification for p-interface hardware." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Role specification for p-interface hardware." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interfaceType" name="interface-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicates the physical properties of the interface." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="macAddress" name="mac-addresss" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="MAC Address of the p-interface." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false" java-attribute="inMaint" name="in-maint"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="inventory status" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v13.SriovPfs" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Physical interface (e.g., nic)" />
+				<xml-property name="indexedProps" value="interface-name,prov-status" />
+				<xml-property name="nameProps" value="prov-status" />
+				<xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
+				<xml-property name="container" value="p-interfaces" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="LagInterfaces">
+			<xml-properties>
+				<xml-property name="description" value="Collection of link aggregate interfaces." />
+			</xml-properties>
+			<xml-root-element name="lag-interfaces" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v13.LagInterface" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="LagInterface">
+			<xml-root-element name="lag-interface" />
+			<java-attributes>
+				<xml-element java-attribute="interfaceName" name="interface-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Name that identifies the link aggregate interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interfaceDescription" name="interface-description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Human friendly text regarding this interface." />
+					</xml-properties>
+				</xml-element>	
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the numeric part of the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the units corresponding to the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interfaceId" name="interface-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ID of interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false" java-attribute="inMaint" name="in-maint"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Link aggregate interface" />
+				<xml-property name="indexedProps" value="interface-name,interface-id,interface-role" />
+				<xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf" />
+				<xml-property name="container" value="lag-interfaces" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="OamNetworks">
+			<xml-properties>
+				<xml-property name="description" value="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. " />
+			</xml-properties>
+			<xml-root-element name="oam-networks" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v13.OamNetwork" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="OamNetwork">
+			<xml-root-element name="oam-network" />
+			<java-attributes>
+				<xml-element java-attribute="networkUuid" name="network-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="UUID of the network. Unique across a cloud-region" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkName" name="network-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the network." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cvlanTag" name="cvlan-tag"  type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="cvlan-id" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Used for VNF firewall rule so customer cannot send customer traffic over this oam network" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
+				<xml-property name="nameProps" value="network-name" />
+				<xml-property name="indexedProps" value="cvlan-tag,network-uuid,network-name" />
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="oam-networks" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="AvailabilityZones">
+			<xml-properties>
+				<xml-property name="description" value="Collection of availability zones" />
+			</xml-properties>
+			<xml-root-element name="availability-zones" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v13.AvailabilityZone" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="AvailabilityZone">
+			<xml-root-element name="availability-zone" />
+			<java-attributes>
+				<xml-element java-attribute="availabilityZoneName" name="availability-zone-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Name of the availability zone.  Unique across a cloud region" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="hypervisorType" name="hypervisor-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
+				<xml-property name="indexedProps" value="availability-zone-name" />
+				<xml-property name="dependentOn" value="cloud-region" />
+				<xml-property name="container" value="availability-zones" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="VirtualDataCenters">
+			<xml-properties>
+				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
+			</xml-properties>
+			<xml-root-element name="virtual-data-centers" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v13.VirtualDataCenter" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="VirtualDataCenter">
+			<xml-root-element name="virtual-data-center" />
+			<java-attributes>
+				<xml-element java-attribute="vdcId" name="vdc-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of the vdc" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vdcName" name="vdc-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the virtual data center" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
+				<xml-property name="nameProps" value="vdc-name" />
+				<xml-property name="indexedProps" value="vdc-name,vdc-id" />
+				<xml-property name="container" value="virtual-data-centers" />
+				<xml-property name="namespace" value="cloud-infrastructure" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Business">
+			<xml-properties>
+				<xml-property name="description" value="Namespace for business related constructs" />
+			</xml-properties>
+			<xml-root-element name="business" />
+			<java-attributes>
+				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v13.Connectors" />
+				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v13.Customers" />
+				<xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v13.LinesOfBusiness" />
+				<xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v13.OwningEntities" />
+				<xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v13.Platforms" />
+				<xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v13.Projects" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Projects">
+			<xml-properties>
+				<xml-property name="description" value="Collection of projects" />
+			</xml-properties>
+			<xml-root-element name="projects" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="project" name="project" type="inventory.aai.onap.org.v13.Project" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Project">
+			<xml-root-element name="project" />
+			<java-attributes>
+				<xml-element java-attribute="projectName" name="project-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Name of the project deploying a service" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="describes the project" />
+				<xml-property name="indexedProps" value="project-name" />
+				<xml-property name="uniqueProps" value="project-name" />
+				<xml-property name="container" value="projects" />
+				<xml-property name="namespace" value="business" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Connectors">
+			<xml-properties>
+				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+			</xml-properties>
+			<xml-root-element name="connectors" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v13.Connector" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Connector">
+			<xml-root-element name="connector" />
+			<java-attributes>
+				<xml-element java-attribute="resourceInstanceId" name="resource-instance-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id of resource instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="internal" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
+				<xml-property name="indexedProps" value="resource-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version" />
+				<xml-property name="container" value="connectors" />
+				<xml-property name="namespace" value="business" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Customers">
+			<xml-properties>
+				<xml-property name="description" value="Collection of customer identifiers to provide linkage back to BSS information." />
+			</xml-properties>
+			<xml-root-element name="customers" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v13.Customer" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Customer">
+			<xml-root-element name="customer" />
+			<java-attributes>
+				<xml-element java-attribute="globalCustomerId" name="global-customer-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Global customer id used across ECOMP to uniquely identify customer." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="subscriberName" name="subscriber-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Subscriber name, an alternate way to retrieve a customer." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="subscriberType" name="subscriber-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Subscriber type, a way to provide VID with only the INFRA customers." />
+						<xml-property name="defaultValue" value="CUST" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v13.ServiceSubscriptions" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
+				<xml-property name="nameProps" value="subscriber-name" />
+				<xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
+				<xml-property name="searchable" value="global-customer-id,subscriber-name" />
+				<xml-property name="uniqueProps" value="global-customer-id" />
+				<xml-property name="container" value="customers" />
+				<xml-property name="namespace" value="business" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="LinesOfBusiness">
+			<xml-properties>
+				<xml-property name="description" value="Collection of lines-of-business" />
+			</xml-properties>
+			<xml-root-element name="lines-of-business" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v13.LineOfBusiness" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="LineOfBusiness">
+			<xml-root-element name="line-of-business" />
+			<java-attributes>
+				<xml-element java-attribute="lineOfBusinessName" name="line-of-business-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Name of the line-of-business (product)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="describes a line-of-business" />
+				<xml-property name="indexedProps" value="line-of-business-name" />
+				<xml-property name="uniqueProps" value="line-of-business-name" />
+				<xml-property name="container" value="lines-of-business" />
+				<xml-property name="namespace" value="business" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="OwningEntities">
+			<xml-properties>
+				<xml-property name="description" value="Collection of owning-entities" />
+			</xml-properties>
+			<xml-root-element name="owning-entities" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="owningEntity" name="owning-entity" type="inventory.aai.onap.org.v13.OwningEntity" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="OwningEntity">
+			<xml-root-element name="owning-entity" />
+			<java-attributes>
+				<xml-element java-attribute="owningEntityId" name="owning-entity-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="UUID of an owning entity" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="owningEntityName" name="owning-entity-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Owning entity name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="describes an owning-entity" />
+				<xml-property name="indexedProps" value="owning-entity-id, owning-entity-name" />
+				<xml-property name="searchable" value="owning-entity-id" />
+				<xml-property name="uniqueProps" value="owning-entity-id, owning-entity-name" />
+				<xml-property name="container" value="owning-entities" />
+				<xml-property name="namespace" value="business" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="Platforms">
+			<xml-properties>
+				<xml-property name="description" value="Collection of platforms" />
+			</xml-properties>
+			<xml-root-element name="platforms" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v13.Platform" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="Platform">
+			<xml-root-element name="platform" />
+			<java-attributes>
+				<xml-element java-attribute="platformName" name="platform-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Name of the platform" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="describes a platform" />
+				<xml-property name="indexedProps" value="platform-name" />
+				<xml-property name="uniqueProps" value="platform-name" />
+				<xml-property name="container" value="platforms" />
+				<xml-property name="namespace" value="business" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="ServiceSubscriptions">
+			<xml-properties>
+				<xml-property name="description" value="Collection of objects that group service instances." />
+			</xml-properties>
+			<xml-root-element name="service-subscriptions" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v13.ServiceSubscription" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ServiceSubscription">
+			<xml-root-element name="service-subscription" />
+			<java-attributes>
+				<xml-element java-attribute="serviceType" name="service-type"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Value defined by orchestration to identify this service across ECOMP." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="tempUbSubAccountId" name="temp-ub-sub-account-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This property will be deleted from A&amp;AI in the near future. Only stop gap solution." />
+                    </xml-properties>
+                </xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v13.ServiceInstances">
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Object that group service instances." />
+				<xml-property name="indexedProps" value="service-type" />
+				<xml-property name="dependentOn" value="customer" />
+				<xml-property name="container" value="service-subscriptions" />
+				<xml-property name="crossEntityReference" value="service-instance,service-type" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="ServiceInstances">
+			<xml-properties>
+				<xml-property name="description" value="Collection of service instances" />
+			</xml-properties>
+			<xml-root-element name="service-instances" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v13.ServiceInstance" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ServiceInstance">
+			<xml-root-element name="service-instance" />
+			<java-attributes>
+				<xml-element java-attribute="serviceInstanceId" name="service-instance-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Uniquely identifies this instance of a service" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceInstanceName" name="service-instance-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This field will store a name assigned to the service-instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceType" name="service-type" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="String capturing type of service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceRole" name="service-role" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="String capturing the service role." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="environmentContext" name="environment-context" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This field will store the environment context assigned to the service-instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="workloadContext" name="workload-context" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="This field will store the workload context assigned to the service-instance." />
+					</xml-properties>
+				</xml-element>
+                <xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="create time of Network Service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="updatedAt" name="updated-at" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="last update of Network Service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="short description for service-instance." />
+                    </xml-properties>
+                </xml-element>
+                <!-- for storing the nsd_id create edge between services -->
+                <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="internal" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Path to the controller object." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v13.AllottedResources" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Instance of a service" />
+				<xml-property name="indexedProps" value="service-instance-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status,environment-context,workload-context" />
+				<xml-property name="nameProps" value="service-instance-name" />
+				<xml-property name="searchable" value="service-instance-id,service-instance-name" />
+				<xml-property name="uniqueProps" value="service-instance-id" />
+				<xml-property name="dependentOn" value="service-subscription" />
+				<xml-property name="container" value="service-instances" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="ServiceDesignAndCreation">
+			<xml-properties>
+				<xml-property name="description" value="Namespace for objects managed by ASDC" />
+			</xml-properties>
+			<xml-root-element name="service-design-and-creation" />
+			<java-attributes>
+				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v13.VnfImages" />
+				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v13.Services" />
+				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v13.ServiceCapabilities" />
+				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v13.Models" />
+				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v13.NamedQueries" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="VnfImages">
+			<xml-properties>
+				<xml-property name="description" value="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+			</xml-properties>
+			<xml-root-element name="vnf-images" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v13.VnfImage" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="VnfImage">
+			<xml-root-element name="vnf-image" />
+			<java-attributes>
+				<xml-element java-attribute="vnfImageUuid" name="vnf-image-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of this asset" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="application" name="application"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The application that the image instantiates." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="applicationVendor" name="application-vendor"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The vendor of the application." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="applicationVersion" name="application-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The version of the application." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge." />
+				<xml-property name="indexedProps" value="application,vnf-image-uuid,application-vendor,application-version" />
+				<xml-property name="uniqueProps" value="vnf-image-uuid" />
+				<xml-property name="container" value="vnf-images" />
+				<xml-property name="namespace" value="service-design-and-creation" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Services">
+			<xml-properties>
+				<xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC." />
+			</xml-properties>
+			<xml-root-element name="services" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v13.Service" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Service">
+			<xml-root-element name="service" />
+			<java-attributes>
+				<xml-element java-attribute="serviceId" name="service-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceDescription" name="service-description"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Description of the service" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceSelflink" name="service-selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceVersion" name="service-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="service version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.  Does not strictly map to ASDC services." />
+				<xml-property name="indexedProps" value="service-description,service-id" />
+				<xml-property name="container" value="services" />
+				<xml-property name="namespace" value="service-design-and-creation" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="ServiceCapabilities">
+			<xml-properties>
+				<xml-property name="description" value="Collection of service capabilities." />
+			</xml-properties>
+			<xml-root-element name="service-capabilities" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v13.ServiceCapability" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ServiceCapability">
+			<xml-root-element name="service-capability" />
+			<java-attributes>
+				<xml-element java-attribute="serviceType" name="service-type"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="This gets defined by others to provide a unique ID for the service, we accept what is sent." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfType" name="vnf-type"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this." />
+				<xml-property name="indexedProps" value="service-type,vnf-type" />
+				<xml-property name="container" value="service-capabilities" />
+				<xml-property name="namespace" value="service-design-and-creation" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Network">
+			<xml-properties>
+				<xml-property name="description" value="Namespace for network inventory resources." />
+			</xml-properties>
+			<xml-root-element name="network" />
+			<java-attributes>
+				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v13.LogicalLinks" />
+				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v13.SitePairSets" />
+				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v13.VpnBindings" />
+				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v13.VplsPes" />
+				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v13.MulticastConfigurations" />
+				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v13.Vces" />
+				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v13.Vnfcs" />
+				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v13.L3Networks" />
+				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v13.NetworkPolicies" />
+				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v13.GenericVnfs" />
+				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v13.LagLinks" />
+				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v13.Newvces" />
+				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v13.Pnfs" />
+				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v13.PhysicalLinks" />
+				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v13.IpsecConfigurations" />
+				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v13.RouteTableReferences" />
+				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v13.InstanceGroups" />
+				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v13.Zones" />
+				<xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v13.Configurations" />
+				<xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v13.ForwardingPaths" />
+			</java-attributes>
+		</java-type>
+        <java-type name="Configurations">
+			<xml-properties>
+				<xml-property name="description" value="Collection of configurations" />
+			</xml-properties>
+			<xml-root-element name="configurations" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configuration" type="inventory.aai.onap.org.v13.Configuration" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Configuration">
+			<xml-root-element name="configuration" />
+			<java-attributes>
+				<xml-element java-attribute="configurationId" name="configuration-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="UUID assigned to configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationType" name="configuration-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="port-mirroring-configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationSubType" name="configuration-sub-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="vprobe, pprobe." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of the configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationSelflink" name="configuration-selflink"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelCustomizationId" name="model-customization-id"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="id of  the configuration used to customize the resource" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="tunnelBandwidth" name="tunnel-bandwidth" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="DHV Site Effective Bandwidth" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vendorAllowedMaxBandwidth" name="vendor-allowed-max-bandwidth" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Velocloud Nominal Throughput - VNT" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+				<xml-element java-attribute="forwarderEvcs" name="forwarder-evcs" type="inventory.aai.onap.org.v13.ForwarderEvcs" />
+				<xml-element java-attribute="evcs" name="evcs" type="inventory.aai.onap.org.v13.Evcs" />
+			</java-attributes>
+			<xml-properties>
+                <xml-property name="description" value="Port Mirror Configuration." />
+				<xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
+				<xml-property name="uniqueProps" value="configuration-id" />
+				<xml-property name="container" value="configurations" />
+				<xml-property name="namespace" value="network" />
+                <xml-property name="nameProps" value="configuration-type" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="LogicalLinks">
+			<xml-properties>
+				<xml-property name="description" value="Collection of logical connections" />
+			</xml-properties>
+			<xml-root-element name="logical-links" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v13.LogicalLink" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="LogicalLink">
+			<xml-root-element name="logical-link" />
+			<java-attributes>
+				<xml-element java-attribute="linkName" name="link-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ" />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="linkType" name="link-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type of logical link, e.g., evc" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the numeric part of the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the units corresponding to the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="v4, v6, or ds for dual stack" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="For example, static or BGP" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="internal" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indication of operational status of the logical link." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indication of the network use of the logical link." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
+					</xml-properties>
+				</xml-element>
+					<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Circuit id" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Reason for this entity, role it is playing" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Logical links generally connect l-interfaces but are used to express logical connectivity between two points" />
+				<xml-property name="indexedProps" value="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,purpose" />
+				<xml-property name="uniqueProps" value="link-id" />
+				<xml-property name="container" value="logical-links" />
+				<xml-property name="namespace" value="network" />
+				<xml-property name="searchable" value="link-name" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="SitePairSets">
+			<xml-properties>
+				<xml-property name="description" value="Collection of sets of instances for probes related to generic-vnf" />
+			</xml-properties>
+			<xml-root-element name="site-pair-sets" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v13.SitePairSet" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="SitePairSet">
+			<xml-root-element name="site-pair-set" />
+			<java-attributes>
+				<xml-element java-attribute="sitePairSetId" name="site-pair-set-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id of site pair set." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v13.RoutingInstances" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
+				<xml-property name="indexedProps" value="site-pair-set-id" />
+				<xml-property name="uniqueProps" value="site-pair-set-id" />
+				<xml-property name="container" value="site-pair-sets" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="RoutingInstances">
+			<xml-properties>
+				<xml-property name="description" value="set of probes related to generic-vnf routing instance" />
+			</xml-properties>
+			<xml-root-element name="routing-instances" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v13.RoutingInstance" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="RoutingInstance">
+			<xml-root-element name="routing-instance" />
+			<java-attributes>
+				<xml-element java-attribute="routingInstanceId" name="routing-instance-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id of routing instance" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="rpmOwner" name="rpm-owner" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="rpm owner" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v13.SitePairs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="indexedProps" value="routing-instance-id" />
+				<xml-property name="dependentOn" value="site-pair-set" />
+				<xml-property name="container" value="routing-instances" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="SitePairs">
+			<xml-properties>
+				<xml-property name="description" value="probe within a set" />
+			</xml-properties>
+			<xml-root-element name="site-pairs" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v13.SitePair" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="SitePair">
+			<xml-root-element name="site-pair" />
+			<java-attributes>
+				<xml-element java-attribute="sitePairId" name="site-pair-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="unique identifier of probe" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="sourceIp" name="source-ip" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Prefix address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="destinationIp" name="destination-ip" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Prefix address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ip version, v4, v6" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="destinationHostname" name="destination-hostname" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Hostname of the destination equipment to which SLAs are measured against." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="destinationEquipType" name="destination-equip-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The type of destinatination equipment. Could be Router, UCPE, etc." />
+					</xml-properties>
+				</xml-element>					
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v13.ClassesOfService" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="indexedProps" value="site-pair-id" />
+				<xml-property name="uniqueProps" value="site-pair-id" />
+				<xml-property name="dependentOn" value="routing-instance" />
+				<xml-property name="container" value="site-pairs" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="ClassesOfService">
+			<xml-properties>
+				<xml-property name="description" value="class-of-service of probe" />
+			</xml-properties>
+			<xml-root-element name="classes-of-service" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v13.ClassOfService" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ClassOfService">
+			<xml-root-element name="class-of-service" />
+			<java-attributes>
+				<xml-element java-attribute="cos" name="cos"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="unique identifier of probe" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="probeId" name="probe-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="identifier of probe" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="probeType" name="probe-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="type of probe" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="indexedProps" value="cos" />
+				<xml-property name="dependentOn" value="site-pair" />
+				<xml-property name="container" value="classes-of-service" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="VpnBindings">
+			<xml-root-element name="vpn-bindings" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v13.VpnBinding" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="VpnBinding">
+			<xml-root-element name="vpn-binding" />
+			<java-attributes>
+				<xml-element java-attribute="vpnId" name="vpn-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="VPN ID, globally unique within A&amp;AI" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vpnName" name="vpn-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="VPN Name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the platform associated with the VPN example AVPN, Mobility" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="region of customer vpn" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="id for this customer vpn" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v13.RouteTargets" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList">
+					<xml-properties>
+						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="VPN binding" />
+				<xml-property name="nameProps" value="vpn-name,vpn-type" />
+				<xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type" />
+				<xml-property name="searchable" value="vpn-id,vpn-name" />
+				<xml-property name="uniqueProps" value="vpn-id" />
+				<xml-property name="container" value="vpn-bindings" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="VplsPes">
+			<xml-properties>
+				<xml-property name="description" value="Collection of VPLS Provider Edge routers" />
+			</xml-properties>
+			<xml-root-element name="vpls-pes" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v13.VplsPe" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="VplsPe">
+			<xml-root-element name="vpls-pe" />
+			<java-attributes>
+				<xml-element java-attribute="equipmentName" name="equipment-name"  type="java.lang.String" xml-key="true" />
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Client should send valid enumerated value, e.g., VPLS-PE." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Temporary location for stag to get to VCE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="VPLS Provider Edge routers." />
+				<xml-property name="indexedProps" value="prov-status,equipment-name" />
+				<xml-property name="container" value="vpls-pes" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="MulticastConfigurations">
+			<xml-properties>
+				<xml-property name="description" value="multicast configuration of generic-vnf ip-address" />
+			</xml-properties>
+			<xml-root-element name="multicast-configurations" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v13.MulticastConfiguration" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="MulticastConfiguration">
+			<xml-root-element name="multicast-configuration" />
+			<java-attributes>
+				<xml-element java-attribute="multicastConfigurationId" name="multicast-configuration-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id of multicast configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="multicastProtocol" name="multicast-protocol"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="protocol of multicast configuration" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="rpType" name="rp-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="rp type of multicast configuration" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="indexedProps" value="multicast-configuration-id" />
+				<xml-property name="uniqueProps" value="multicast-configuration-id" />
+				<xml-property name="container" value="multicast-configurations" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Vces">
+			<xml-properties>
+				<xml-property name="description" value="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated." />
+			</xml-properties>
+			<xml-root-element name="vces" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v13.Vce" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Vce">
+			<xml-root-element name="vce" />
+			<java-attributes>
+				<xml-element java-attribute="vnfId" name="vnf-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfName" name="vnf-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of VNF." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Alternate name of VNF." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfType" name="vnf-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier of service, does not strictly map to ASDC services, SOON TO BE DEPRECATED." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="OBSOLETE -  do not use" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Network role being played by this VNF" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of VPE connected to this VCE." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Loopback0 address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="OBSOLETE -  see child relationships" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v13.PortGroups" />
+				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v13.Licenses" />
+				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v13.Entitlements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
+				<xml-property name="nameProps" value="vnf-name" />
+				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id" />
+				<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
+				<xml-property name="uniqueProps" value="vnf-id" />
+				<xml-property name="container" value="vces" />
+				<xml-property name="namespace" value="network" />
+				<xml-property name="extends" value="vnf" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="PortGroups">
+			<xml-root-element name="port-groups" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v13.PortGroup" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="PortGroup">
+			<xml-root-element name="port-group" />
+			<java-attributes>
+				<xml-element java-attribute="interfaceId" name="interface-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of the interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron network id of this Interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronNetworkName" name="neutron-network-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron network name of this Interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interfaceRole" name="interface-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Role assigned to this Interface, should use values as defined in ECOMP Yang models." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="portGroupId" name="port-group-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID for port group in vmware" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="portGroupName" name="port-group-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Likely to duplicate value of neutron network name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="switchName" name="switch-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="DVS or standard switch name (should be non-null for port groups associated with DVS)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v13.CvlanTags" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
+				<xml-property name="nameProps" value="port-group-name" />
+				<xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,interface-name,switch-name" />
+				<xml-property name="dependentOn" value="vce" />
+				<xml-property name="container" value="port-groups" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="CvlanTags">
+			<xml-root-element name="cvlan-tags" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v13.CvlanTagEntry" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="CvlanTagEntry">
+			<xml-root-element name="cvlan-tag-entry" />
+			<java-attributes>
+				<xml-element java-attribute="cvlanTag" name="cvlan-tag"  type="java.lang.Long" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="See mis-na-virtualization-platform.yang" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="dependentOn" value="port-group" />
+				<xml-property name="indexedProps" value="cvlan-tag" />
+				<xml-property name="container" value="cvlan-tags" />
+			</xml-properties>
+		</java-type>
+
+
+
+		<java-type name="Vnfcs">
+			<xml-properties>
+				<xml-property name="description" value="virtual network components associated with a vserver from application controller." />
+			</xml-properties>
+			<xml-root-element name="vnfcs" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v13.Vnfc" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Vnfc">
+			<xml-root-element name="vnfc" />
+			<java-attributes>
+				<xml-element java-attribute="vnfcName" name="vnfc-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of vnfc." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nfcNamingCode" name="nfc-naming-code"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Short code that is used in naming instances of the item being modeled" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nfcFunction" name="nfc-function"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="English description of function that the specific resource deployment is providing. Assigned as part of the customization of a resource in a service" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="prov status of this vnfc" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this VNF, mastered by APP-C" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV4OamVip" name="ipaddress-v4-oam-vip" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Oam V4 vip address of this vnfc" />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="groupNotation" name="group-notation" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Group notation of VNFC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+					</xml-properties>
+				</xml-element>				
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v13.L3InterfaceIpv6AddressList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="indexedProps" value="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id" />
+				<xml-property name="searchable" value="vnfc-name" />
+				<xml-property name="container" value="vnfcs" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="L3Networks">
+			<xml-root-element name="l3-networks" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v13.L3Network" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="L3Network">
+			<xml-root-element name="l3-network" />
+			<java-attributes>
+				<xml-element java-attribute="networkId" name="network-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Network ID, should be uuid. Unique across A&amp;AI." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkName" name="network-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the network, governed by some naming convention.." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkType" name="network-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type of the network - who defines these values?" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkRole" name="network-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Role the network plans - who defines these values?" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkTechnology" name="network-technology" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Network technology - who defines these values?" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron network id of this Interface" />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="isBoundToVpn" name="is-bound-to-vpn" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="Set to true if bound to VPN" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier of service from ASDC.  Does not strictly map to ASDC services.  SOON TO BE DEPRECATED" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="network role instance" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="contrailNetworkFqdn" name="contrail-network-fqdn" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Contrail FQDN for the network" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="internal" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name associated with the physical network." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="isProviderNetwork" name="is-provider-network"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="boolean indicatating whether or not network is a provider network." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="isSharedNetwork" name="is-shared-network"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="boolean indicatating whether or not network is a shared network." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="isExternalNetwork" name="is-external-network"  type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="boolean indicatating whether or not network is an external network." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Path to the controller object." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v13.Subnets" />
+				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v13.CtagAssignments" />
+				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v13.SegmentationAssignments" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" >
+					<xml-properties>
+						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Generic network definition" />
+				<xml-property name="nameProps" value="network-name" />
+				<xml-property name="indexedProps" value="heat-stack-id,network-uuid,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role" />
+				<xml-property name="searchable" value="network-id,network-name" />
+				<xml-property name="uniqueProps" value="network-id" />
+				<xml-property name="container" value="l3-networks" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		<java-type name="NetworkPolicies">
+			<xml-root-element name="network-policies" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v13.NetworkPolicy" />
+			</java-attributes>
+		</java-type>
+		<java-type name="NetworkPolicy">
+			<xml-root-element name="network-policy" />
+			<java-attributes>
+				<xml-element java-attribute="networkPolicyId" name="network-policy-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="UUID representing unique key to this instance" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkPolicyFqdn" name="network-policy-fqdn" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Contrail FQDN for the policy" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ID for the openStack Heat instance" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="nameProps" value="network-policy-fqdn" />
+				<xml-property name="indexedProps" value="network-policy-id,network-policy-fqdn" />
+				<xml-property name="searchable" value="network-policy-id,network-policy-fqdn" />
+				<xml-property name="uniqueProps" value="network-policy-id" />
+				<xml-property name="container" value="network-policies" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		<java-type name="CtagAssignments">
+			<xml-root-element name="ctag-assignments" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v13.CtagAssignment" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="CtagAssignment">
+			<xml-root-element name="ctag-assignment" />
+			<java-attributes>
+				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner"  type="java.lang.Long" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="id." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="indexedProps" value="vlan-id-inner" />
+				<xml-property name="dependentOn" value="l3-network" />
+				<xml-property name="container" value="ctag-assignments" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Subnets">
+			<xml-root-element name="subnets" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v13.Subnet" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Subnet">
+			<xml-root-element name="subnet" />
+			<java-attributes>
+				<xml-element java-attribute="subnetId" name="subnet-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Subnet ID, should be UUID." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="subnetName" name="subnet-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name associated with the subnet." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron id of this subnet" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="gatewayAddress" name="gateway-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="gateway ip address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="networkStartAddress" name="network-start-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="network start address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cidrMask" name="cidr-mask" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="cidr mask" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ip version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="dhcpEnabled" name="dhcp-enabled" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="dhcp enabled" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dhcpStart" name="dhcp-start" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the start address reserved for use by dhcp" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dhcpEnd" name="dhcp-end" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the last address reserved for use by dhcp" />
+					</xml-properties>
+				</xml-element>
+					<xml-element java-attribute="subnetRole" name="subnet-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="role of the subnet, referenced when assigning IPs" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipAssignmentDirection" name="ip-assignment-direction" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ip address assignment direction of the subnet" />
+					</xml-properties>
+				</xml-element>			
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="subnetSequence" name="subnet-sequence" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="sequence of the subnet" />
+					</xml-properties>
+				</xml-element>		
+				<xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v13.HostRoutes" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />				
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
+				<xml-property name="nameProps" value="subnet-name" />
+				<xml-property name="uniqueProps" value="subnet-id" />
+				<xml-property name="dependentOn" value="l3-network" />
+				<xml-property name="container" value="subnets" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="GenericVnfs">
+			<xml-properties>
+				<xml-property name="description" value="Collection of VNFs" />
+			</xml-properties>
+			<xml-root-element name="generic-vnfs" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v13.GenericVnf" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="GenericVnf">
+			<xml-root-element name="generic-vnf" />
+			<java-attributes>
+				<xml-element java-attribute="vnfId" name="vnf-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+					</xml-properties>
+				</xml-element>
+                <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vnf instance id." />
+                    </xml-properties>
+                </xml-element>
+				<xml-element java-attribute="vnfName" name="vnf-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of VNF." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Alternate name of VNF." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfType" name="vnf-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceId" name="service-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier of service, does not necessarily map to ASDC service models.  SOON TO BE DEPRECATED" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+						<xml-property name="suggestibleOnSearch" value="true"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="OBSOLETE -  do not use" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Client should send valid enumerated value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
+						<xml-property name="suggestibleOnSearch" value="true"/>
+					</xml-properties>
+				</xml-element>
+                <xml-element java-attribute="vnfPackageName" name="vnf-package-name" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value=""/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vnfDiscriptorName" name="vnf-discriptor-name" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="vnf discriptor name"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="jobId" name="job-id" required="false" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="job id corresponding to vnf"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="identifier of managed by ATT or customer" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by generic-vnf." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="v4 Loopback0 address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nmLanV6Address" name="nm-lan-v6-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="v6 Loopback address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="managementV6Address" name="management-v6-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="v6 management address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vcpu" name="vcpu" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="number of vcpus ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vcpuUnits" name="vcpu-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="units associated with vcpu, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vmemory" name="vmemory" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="number of GB of memory ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vmemoryUnits" name="vmemory-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="units associated with vmemory, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vdisk" name="vdisk" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="number of vdisks ordered for this instance of VNF, used for VNFs with no vservers/flavors, to be used only uCPE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vdiskUnits" name="vdisk-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="units associated with vdisk, used for VNFs with no vservers/flavors, to be used only by uCPE" />
+					</xml-properties>
+				</xml-element>
+                <xml-element java-attribute="nshd" name="nshd" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of associated SHD in vnf." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nvm" name="nvm" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of vms in vnf." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nnet" name="nnet" type="java.lang.Long">
+                    <xml-properties>
+                        <xml-property name="description" value="number of network in vnf." />
+                    </xml-properties>
+                </xml-element>
+				<xml-element default-value="false"  java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="isClosedLoopDisabled" name="is-closed-loop-disabled" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether closed loop function is enabled on this node" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="summaryStatus" name="summary-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="details regarding the generic-vnf operation, PLEASE DISCONTINUE USE OF THIS FIELD." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="encryptedAccessFlag" name="encrypted-access-flag" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="indicates whether generic-vnf access uses SSH" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="entitlementAssignmentGroupUuid" name="entitlement-assignment-group-uuid" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="UUID of the Entitlement group used for licensing VNFs, OBSOLETE -  See child relationships." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="UUID of the specific entitlement resource.  OBSOLETE -  See child relationships." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="licenseAssignmentGroupUuid" name="license-assignment-group-uuid" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="UUID of the license assignment group.  OBSOLETE -  See child relationships." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="licenseKeyUuid" name="license-key-uuid" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="UUID of the actual license resource.  OBSOLETE -  See child relationships." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="internal" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="as-number of the VNF" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="represents sub zone of the rr plane" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Generic description of the type of NF" />
+						<xml-property name="suggestibleOnSearch" value="true"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nfFunction" name="nf-function" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="English description of Network function that the specific VNF deployment is providing" />
+					</xml-properties>
+				</xml-element>	
+				<xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="role in the network that this model will be providing" />
+						<xml-property name="suggestibleOnSearch" value="true"/>
+					</xml-properties>
+				</xml-element>	
+				<xml-element java-attribute="nfNamingCode" name="nf-naming-code" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="string assigned to this model used for naming purposes" />
+					</xml-properties>
+				</xml-element>	
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Path to the controller object." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamGatewayAddress" name="ipv4-oam-gateway-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Gateway address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamGatewayAddressPrefixLength" name="ipv4-oam-gateway-address-prefix-length" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Prefix length for oam-address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Temporary location for S-TAG to get to VCE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nmProfileName" name="nm-profile-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Network Management profile of this VNF" />
+					</xml-properties>
+				</xml-element>			
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
+				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v13.VfModules" />
+				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v13.Licenses" />
+				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v13.Entitlements" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="General purpose VNF" />
+				<xml-property name="nameProps" value="vnf-name" />
+				<xml-property name="indexedProps" value="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role" />
+				<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
+				<xml-property name="uniqueProps" value="vnf-id" />
+				<xml-property name="container" value="generic-vnfs" />
+				<xml-property name="namespace" value="network" />
+				<xml-property name="extends" value="vnf" />
+				<xml-property name="containsSuggestibleProps" value="true"/>
+				<xml-property name="suggestionAliases" value="VNFs"/>
+			</xml-properties>
+		</java-type>
+
+		<java-type name="VfModules">
+			<xml-properties>
+				<xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
+			</xml-properties>
+			<xml-root-element name="vf-modules" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v13.VfModule" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="VfModule">
+			<xml-root-element name="vf-module" />
+			<java-attributes>
+				<xml-element java-attribute="vfModuleId" name="vf-module-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of vf-module." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vfModuleName" name="vf-module-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of vf-module" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Heat stack id corresponding to this instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="orchestration status of this vf-module, mastered by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="isBaseVfModule" name="is-base-vf-module" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="used to indicate whether or not this object is base vf module" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="internal" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the Contrail unique ID for a service-instance" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Path to the controller object." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="a deployment unit of VNFCs" />
+				<xml-property name="indexedProps" value="vf-module-id,vf-module-name,heat-stack-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-service-instance-fqdn" />
+				<xml-property name="searchable" value="vf-module-id,vf-module-name" />
+				<xml-property name="dependentOn" value="generic-vnf" />
+				<xml-property name="container" value="vf-modules" />
+			</xml-properties>
+		</java-type>
+
+
+		<java-type name="LagLinks">
+			<xml-properties>
+				<xml-property name="description" value="Collection of link aggregation connections" />
+			</xml-properties>
+			<xml-root-element name="lag-links" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v13.LagLink" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="LagLink">
+			<xml-root-element name="lag-link" />
+			<java-attributes>
+				<xml-element java-attribute="linkName" name="link-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Alphabetical concatenation of lag-interface names" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="LAG links can connect lag-interfaces" />
+				<xml-property name="indexedProps" value="link-name" />
+				<xml-property name="container" value="lag-links" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Newvces">
+			<xml-properties>
+				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+			</xml-properties>
+			<xml-root-element name="newvces" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v13.Newvce" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Newvce">
+			<xml-root-element name="newvce" />
+			<java-attributes>
+				<xml-element java-attribute="vnfId2" name="vnf-id2"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id of VNF, can't use same attribute name right now until we promote this new object" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfName" name="vnf-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of VNF." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfName2" name="vnf-name2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Alternate name of VNF." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vnfType" name="vnf-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded in service-specific ways and clients should expect changes to occur in the future to this field as ECOMP matures." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="OBSOLETE -  do not use" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Address tail-f uses to configure generic-vnf, also used for troubleshooting and is IP used for traps generated by GenericVnf (v4-loopback0-ip-address)." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Client should send valid enumerated value." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="v4 Loopback0 address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v13.LInterfaces" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce." />
+				<xml-property name="nameProps" value="vnf-name" />
+				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2" />
+				<xml-property name="searchable" value="vnf-id2,vnf-name,vnf-name2" />
+				<xml-property name="uniqueProps" value="vnf-id2" />
+				<xml-property name="container" value="newvces" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Pnfs">
+			<xml-properties>
+				<xml-property name="description" value="Collection of Physical Network Functions." />
+			</xml-properties>
+			<xml-root-element name="pnfs" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v13.Pnf" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Pnf">
+			<xml-root-element name="pnf" />
+			<java-attributes>
+				<xml-element java-attribute="pnfName" name="pnf-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="unique name of Physical Network Function." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="pnfName2" name="pnf-name2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="name of Physical Network Function." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="source of name2" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="pnfId" name="pnf-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="id of pnf" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipType" name="equip-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Equipment type.  Source of truth should define valid values." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipVendor" name="equip-vendor" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Equipment vendor.  Source of truth should define valid values." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="equipModel" name="equip-model" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Equipment model.  Source of truth should define valid values." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="identifier of managed by ATT or customer" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV4Oam" name="ipaddress-v4-oam" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ipv4-oam-address with new naming convention for IP addresses" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="swVersion" name="sw-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="sw-version is the version of SW for the hosted application on the PNF." />
+					</xml-properties>
+				</xml-element>
+				<xml-element default-value="false"  java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="defaultValue" value="false"/>
+						<xml-property name="description" value="Used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="frameId" name="frame-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ID of the physical frame (relay rack) where pnf is installed." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serialNumber" name="serial-number" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Serial number of the device" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV4Loopback0" name="ipaddress-v4-loopback-0" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV4 Loopback 0 address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV6Loopback0" name="ipaddress-v6-loopback-0" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV6 Loopback 0 address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV4Aim" name="ipaddress-v4-aim" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV4 AIM address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV6Aim" name="ipaddress-v6-aim" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV6 AIM address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipaddressV6Oam" name="ipaddress-v6-oam" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="IPV6 OAM address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="CANOPI's inventory status.  Only set with values exactly as defined by CANOPI." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Prov Status of this device (not under canopi control) Valid values [PREPROV/NVTPROV/PROV]" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nfRole" name="nf-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Nf Role is the role performed by this instance in the network." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v13.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v13.LagInterfaces" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE." />
+				<xml-property name="indexedProps" value="pnf-name,orchestration-status,inv-status" />
+				<xml-property name="searchable" value="pnf-name" />
+				<xml-property name="uniqueProps" value="pnf-name" />
+				<xml-property name="container" value="pnfs" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="PhysicalLinks">
+			<xml-properties>
+				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+			</xml-properties>
+			<xml-root-element name="physical-links" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v13.PhysicalLink" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="PhysicalLink">
+			<xml-root-element name="physical-link" />
+			<java-attributes>
+				<xml-element java-attribute="linkName" name="link-name"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="e.g., hostnameA_p-connection_nameA_hostnameZ+p_connection-nameZ" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the numeric part of the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="speedUnits" name="speed-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Captures the units corresponding to the speed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Circuit it" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dualMode" name="dual-mode" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Dual access mode (e.g., primary, secondary" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceProviderName" name="service-provider-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the service Provider on this link." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceProviderBandwidthUpValue" name="service-provider-bandwidth-up-value" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Upstream Bandwidth value agreed with the service provider" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceProviderBandwidthUpUnits" name="service-provider-bandwidth-up-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Units for the upstream BW value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceProviderBandwidthDownValue" name="service-provider-bandwidth-down-value" type="java.lang.Integer">
+					<xml-properties>
+						<xml-property name="description" value="Downstream Bandwidth value agreed with the service provider" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceProviderBandwidthDownUnits" name="service-provider-bandwidth-down-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Units for downstream BW value" />
+					</xml-properties>
+				</xml-element>					
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
+				<xml-property name="indexedProps" value="circuit-id,link-name" />
+				<xml-property name="alternateKeys1" value="circuit-id" />
+				<xml-property name="container" value="physical-links" />
+				<xml-property name="namespace" value="network" />
+				<xml-property name="searchable" value="link-name,circuit-id" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="VigServers">
+			<xml-root-element name="vig-servers" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v13.VigServer" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="VigServer">
+			<xml-root-element name="vig-server" />
+			<java-attributes>
+				<xml-element java-attribute="vigAddressType" name="vig-address-type"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="indicates whether the VIG is for AVPN or INTERNET" />
+					</xml-properties>
+				</xml-element>
+				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV4Vig" name="ipaddress-v4-vig" type="java.lang.String" >
+					<xml-properties>
+						<xml-property name="description" value="v4 IP of the vig server" />
+					</xml-properties>
+				</xml-element>
+				<xml-element container-type="java.util.ArrayList" java-attribute="ipaddressV6Vig" name="ipaddress-v6-vig" type="java.lang.String" >
+					<xml-properties>
+						<xml-property name="description" value="v6 IP of the vig server" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607" />
+				<xml-property name="indexedProps" value="vig-address-type" />
+				<xml-property name="dependentOn" value="ipsec-configuration" />
+				<xml-property name="container" value="vig-servers" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="IpsecConfigurations">
+			<xml-root-element name="ipsec-configurations" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v13.IpsecConfiguration" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="IpsecConfiguration">
+			<xml-root-element name="ipsec-configuration" />
+			<java-attributes>
+				<xml-element java-attribute="ipsecConfigurationId" name="ipsec-configuration-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="UUID of this configuration" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="requestedVigAddressType" name="requested-vig-address-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicate the type of VIG server like AVPN, INTERNET, BOTH" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="requestedEncryptionStrength" name="requested-encryption-strength" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ATT can offer a shared DMZ or a DMZ specific to a customer" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="sharedDmzNetworkAddress" name="shared-dmz-network-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Network address of shared DMZ" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="requestedCustomerName" name="requested-customer-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="If the DMZ is a custom DMZ, this field will indicate the customer information" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ikeVersion" name="ike-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="can be 1 or 2" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ikev1Authentication" name="ikev1-authentication" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Contains values like md5, sha1, sha256, sha384" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ikev1AmGroupId" name="ikev1-am-group-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Group name defined in VIG for clients using aggressive mode" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ikev1AmPassword" name="ikev1-am-password" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="pre-shared key for the above group name " />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ikev1SaLifetime" name="ikev1-sa-lifetime" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Lifetime for IKEv1 SA" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipsecAuthentication" name="ipsec-authentication" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="md5, sha1, sha256, sha384" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Life time for IPSec SA" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipsecPfs" name="ipsec-pfs" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="enable PFS or not" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="xauthUserId" name="xauth-userid" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="user ID for xAuth, sm-user,ucpeHostName,nmteHostName" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="xauthUserPassword" name="xauth-user-password" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Encrypted using the Juniper $9$ algorithm" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dpdInterval" name="dpd-interval" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The time between DPD probe" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dpdFrequency" name="dpd-frequency" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Maximum number of DPD before claiming the tunnel is down" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v13.VigServers" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="IPSec configuration node will contain various configuration data for the NMTE VNF. This node will have an edge to the generic-vnf (vnf type = TE). Starting 1607, this data will be populated by SDN-C" />
+				<xml-property name="indexedProps" value="ipsec-configuration-id" />
+				<xml-property name="uniqueProps" value="ipsec-configuration-id" />
+				<xml-property name="container" value="ipsec-configurations" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+
+
+		<java-type name="NotificationEvent">
+			<xml-root-element name="notification-event" />
+			<java-attributes>
+				<xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
+				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v13.NotificationEventHeader" />
+				<xml-any-element java-attribute="entity" />
+			</java-attributes>
+		</java-type>
+		<java-type name="NotificationEventHeader">
+			<xml-root-element name="notification-event-header" />
+			<java-attributes>
+				<xml-element java-attribute="id" name="id" type="java.lang.String" />
+				<xml-element java-attribute="timestamp" name="timestamp" type="java.lang.String" />
+				<xml-element java-attribute="sourceName" name="source-name" type="java.lang.String" />
+				<xml-element java-attribute="domain" name="domain" type="java.lang.String" />
+				<xml-element java-attribute="sequenceNumber" name="sequence-number" type="java.lang.String" />
+				<xml-element java-attribute="severity" name="severity" type="java.lang.String" />
+				<xml-element java-attribute="eventType" name="event-type" type="java.lang.String" />
+				<xml-element java-attribute="version" name="version" type="java.lang.String" />
+				<xml-element java-attribute="action" name="action" type="java.lang.String" />
+				<xml-element java-attribute="entityType" name="entity-type" type="java.lang.String" />
+				<xml-element java-attribute="topEntityType" name="top-entity-type" type="java.lang.String" />
+				<xml-element java-attribute="entityLink" name="entity-link" type="java.lang.String" />
+				<xml-element java-attribute="status" name="status" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+		<java-type name="AaiInternal">
+			<xml-root-element name="aai-internal" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v13.ReservedPropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v13.EdgePropNames" />
+			</java-attributes>
+		</java-type>
+		<java-type name="ReservedPropNames">
+			<xml-properties>
+				<xml-property name="description" value="Internal map to define some reserved properties of a vertex" />
+				<xml-property name="uniqueProps" value="aai-unique-key" />
+				<xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri" />
+			</xml-properties>
+			<xml-root-element name="reserved-prop-names" />
+			<java-attributes>
+				<xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String" />
+				<xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String" />
+				<xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long" />
+				<xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String" />
+				<xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long" />
+				<xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String" />
+				<xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+		<java-type name="EdgePropNames">
+			<!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
+			<xml-properties>
+				<xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
+				<xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
+                <xml-property name="uniqueProps" value="aai-uuid" />
+                <xml-property name="indexedProps" value="aai-uuid" />
+            </xml-properties>
+			<xml-root-element name="edge-prop-names" />
+			<java-attributes>
+				<xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
+				<xml-element java-attribute="direction" name="direction" type="java.lang.String" />
+				<xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
+				<xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String" />
+				<xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" />
+				<xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" />
+				<xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
+				<xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Models">
+			<xml-properties>
+				<xml-property name="description" value="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models" />
+			</xml-properties>
+			<xml-root-element name="models" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v13.Model" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Model">
+			<xml-root-element name="model" />
+			<xml-properties>
+				<xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models, independent of version" />
+				<xml-property name="nameProps" value="model-type" />
+				<xml-property name="indexedProps" value="model-invariant-id,model-type" />
+				<xml-property name="uniqueProps" value="model-invariant-id" />
+				<xml-property name="searchable" value="model-invariant-id" />
+				<xml-property name="container" value="models" />
+				<xml-property name="namespace" value="service-design-and-creation" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelType" name="model-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v13.ModelVers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+
+		<java-type name="ModelVers">
+			<xml-root-element name="model-vers" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v13.ModelVer" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="ModelVer">
+			<xml-root-element name="model-ver" />
+			<xml-properties>
+				<xml-property name="description" value="Subgraph definition provided by ASDC to describe a specific version of an inventory asset and its connections related to ASDC models" />
+				<xml-property name="nameProps" value="model-name" />
+				<xml-property name="indexedProps" value="model-version-id,model-name,model-version,distribution-status" />
+				<xml-property name="uniqueProps" value="model-version-id" />
+				<xml-property name="searchable" value="model-version-id,model-name" /> 
+				<xml-property name="container" value="model-vers" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element java-attribute="modelVersionId" name="model-version-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelName" name="model-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the model, which can change from version to version." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersion" name="model-version"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="distributionStatus" name="distribution-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Distribution Status" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Description" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v13.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ModelElements">
+			<xml-root-element name="model-elements" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v13.ModelElement" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ModelElement">
+			<xml-properties>
+				<xml-property name="description" value="Defines how other models combine to make up a higher-level model." />
+				<xml-property name="uniqueProps" value="model-element-uuid" />
+				<xml-property name="indexedProps" value="model-element-uuid" />
+				<xml-property name="allowDirectRead" value="true" />
+				<xml-property name="allowDirectWrite" value="false" />
+				<xml-property name="container" value="model-elements" />
+			</xml-properties>
+			<xml-root-element name="model-element" />
+			<java-attributes>
+				<xml-element java-attribute="modelElementUuid" name="model-element-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="autoGenerateUuid" value="true" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="newDataDelFlag" name="new-data-del-flag"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicates whether this element was created as part of instantiation from this model" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cardinality" name="cardinality"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="How many of this type of element are required/allowed" />
+					</xml-properties>
+				</xml-element>
+				<xml-element container-type="java.util.ArrayList" java-attribute="linkagePoints" name="linkage-points" type="java.lang.String" >
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements">
+					<xml-properties>
+						<xml-property name="description" value="Defines how other models combine to make up a higher-level model" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v13.ModelConstraints">
+					<xml-properties>
+						<xml-property name="description" value="Describes new constraints on this model element that are not part of that model's definition" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ModelConstraints">
+			<xml-root-element name="model-constraints" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v13.ModelConstraint" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ModelConstraint">
+			<xml-properties>
+				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+				<xml-property name="uniqueProps" value="model-constraint-uuid" />
+				<xml-property name="indexedProps" value="model-constraint-uuid" />
+				<xml-property name="allowDirectRead" value="true" />
+				<xml-property name="allowDirectWrite" value="false" />
+				<xml-property name="container" value="model-constraints" />
+			</xml-properties>
+			<xml-root-element name="model-constraint" />
+			<java-attributes>
+				<xml-element java-attribute="modelConstraintUuid" name="model-constraint-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="autoGenerateUuid" value="true" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace"  type="java.lang.String" />
+				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v13.ConstrainedElementSets" />
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ConstrainedElementSets">
+			<xml-root-element name="constrained-element-sets" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v13.ConstrainedElementSet" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ConstrainedElementSet">
+			<xml-properties>
+				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+				<xml-property name="uniqueProps" value="constrained-element-set-uuid" />
+				<xml-property name="indexedProps" value="constrained-element-set-uuid" />
+				<xml-property name="allowDirectRead" value="true" />
+				<xml-property name="allowDirectWrite" value="false" />
+				<xml-property name="container" value="constrained-element-sets" />
+			</xml-properties>
+			<xml-root-element name="constrained-element-set" />
+			<java-attributes>
+				<xml-element java-attribute="constrainedElementSetUuid" name="constrained-element-set-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="autoGenerateUuid" value="true" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="constraintType" name="constraint-type"  type="java.lang.String" />
+				<xml-element java-attribute="checkType" name="check-type"  type="java.lang.String" />
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v13.ElementChoiceSets" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ElementChoiceSets">
+			<xml-root-element name="element-choice-sets" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v13.ElementChoiceSet" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ElementChoiceSet">
+			<xml-properties>
+				<xml-property name="description" value="This is how we would capture constraints defining allowed sets of elements." />
+				<xml-property name="uniqueProps" value="element-choice-set-uuid" />
+				<xml-property name="indexedProps" value="element-choice-set-uuid" />
+				<xml-property name="allowDirectRead" value="true" />
+				<xml-property name="allowDirectWrite" value="false" />
+				<xml-property name="container" value="element-choice-sets" />
+			</xml-properties>
+			<xml-root-element name="element-choice-set" />
+			<java-attributes>
+				<xml-element java-attribute="elementChoiceSetUuid" name="element-choice-set-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="autoGenerateUuid" value="true" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name"  type="java.lang.String" />
+				<xml-element java-attribute="cardinality" name="cardinality" type="java.lang.String" />
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v13.ModelElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="NamedQueries">
+			<xml-root-element name="named-queries" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v13.NamedQuery" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="NamedQuery">
+			<xml-properties>
+				<xml-property name="description" value="TBD" />
+				<xml-property name="nameProps" value="named-query-name" />
+				<xml-property name="uniqueProps" value="named-query-uuid" />
+				<xml-property name="indexedProps" value="named-query-uuid,named-query-name" />
+                                <xml-property name="searchable" value="named-query-uuid" />
+				<xml-property name="container" value="named-queries" />
+				<xml-property name="namespace" value="service-design-and-creation" />
+			</xml-properties>
+			<xml-root-element name="named-query" />
+			<java-attributes>
+				<xml-element java-attribute="namedQueryUuid" name="named-query-uuid"  type="java.lang.String" xml-key="true" />
+				<xml-element java-attribute="namedQueryName" name="named-query-name"  type="java.lang.String" />
+				<xml-element java-attribute="namedQueryVersion" name="named-query-version"  type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" >
+					<xml-element-wrapper name="required-input-params" />
+				</xml-element>
+				<xml-element java-attribute="description" name="description" type="java.lang.String" />
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v13.NamedQueryElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="NamedQueryElements">
+			<xml-root-element name="named-query-elements" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v13.NamedQueryElement" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="NamedQueryElement">
+			<xml-properties>
+				<xml-property name="description" value="TBD" />
+				<xml-property name="uniqueProps" value="named-query-element-uuid" />
+				<xml-property name="indexedProps" value="named-query-element-uuid" />
+				<xml-property name="allowDirectRead" value="true" />
+				<xml-property name="allowDirectWrite" value="false" />
+				<xml-property name="container" value="named-query-elements" />
+			</xml-properties>
+			<xml-root-element name="named-query-element" />
+			<java-attributes>
+				<xml-element java-attribute="namedQueryElementUuid" name="named-query-element-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="autoGenerateUuid" value="true" />
+					</xml-properties>
+				</xml-element>
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+				<xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
+				<xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v13.NamedQueryElements" />
+				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v13.RelatedLookups" />
+				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v13.PropertyConstraints" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="RelatedLookups">
+			<xml-root-element name="related-lookups" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v13.RelatedLookup" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="RelatedLookup">
+			<xml-properties>
+				<xml-property name="description" value="TBD" />
+				<xml-property name="uniqueProps" value="related-lookup-uuid" />
+				<xml-property name="indexedProps" value="related-lookup-uuid" />
+				<xml-property name="allowDirectRead" value="true" />
+				<xml-property name="allowDirectWrite" value="false" />
+				<xml-property name="container" value="related-lookups" />
+			</xml-properties>
+			<xml-root-element name="related-lookup" />
+			<java-attributes>
+				<xml-element java-attribute="relatedLookupUuid" name="related-lookup-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="autoGenerateUuid" value="true" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="sourceNodeType" name="source-node-type"  type="java.lang.String" />
+				<xml-element java-attribute="sourceNodeProperty" name="source-node-property"  type="java.lang.String" />
+				<xml-element java-attribute="targetNodeType" name="target-node-type"  type="java.lang.String" />
+				<xml-element java-attribute="targetNodeProperty" name="target-node-property"  type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="PropertyConstraints">
+			<xml-root-element name="property-constraints" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v13.PropertyConstraint" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="PropertyConstraint">
+			<xml-properties>
+				<xml-property name="description" value="TBD" />
+				<xml-property name="uniqueProps" value="property-constraint-uuid" />
+				<xml-property name="indexedProps" value="property-constraint-uuid" />
+				<xml-property name="allowDirectRead" value="true" />
+				<xml-property name="allowDirectWrite" value="false" />
+				<xml-property name="container" value="property-constraints" />
+			</xml-properties>
+			<xml-root-element name="property-constraint" />
+			<java-attributes>
+				<xml-element java-attribute="propertyConstraintUuid" name="property-constraint-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="autoGenerateUuid" value="true" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="constraintType" name="constraint-type"  type="java.lang.String" />
+				<xml-element java-attribute="propertyName" name="property-name"  type="java.lang.String" />
+				<xml-element java-attribute="propertyValue" name="property-value"  type="java.lang.String" />
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ModelAndNamedQuerySearch">
+			<xml-properties>
+				<xml-property name="description" value="ModelAndNamedQuerySearch holds query-parameters and instance-properties for performing a named-query or model query" />
+			</xml-properties>
+			<xml-root-element name="model-and-named-query-search" />
+			<java-attributes>
+				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v13.QueryParameters" />
+				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v13.InstanceFilters" />
+				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v13.SecondaryFilts" />
+				<xml-element java-attribute="topNodeType" name="top-node-type" type="java.lang.String" />
+				<xml-element java-attribute="secondaryFilterCutPoint" name="secondary-filter-cut-point" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="QueryParameters">
+			<xml-properties>
+				<xml-property name="description" value="QueryParameters for performing a named-query or model query" />
+			</xml-properties>
+			<xml-root-element name="query-parameters" />
+			<java-attributes>
+				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v13.NamedQuery" />
+				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v13.OverloadedModel" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="OverloadedModel">
+			<xml-root-element name="overloaded-model" />
+			<xml-properties>
+				<xml-property name="description" value="Allows for legacy POST of old-style and new-style models" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier corresponding to the main definition of a model in ASDC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelNameVersionId" name="model-name-version-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique identifier corresponding to one version of a model in ASDC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelType" name="model-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type of the model, e.g., service, resource, widget, etc." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelName" name="model-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the model, which can change from version to version." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelId" name="model-id"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Invariant unique ID which does not change from version to version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersion" name="model-version"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelDescription" name="model-description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Description" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v13.ModelVers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="InstanceFilters">
+			<xml-properties>
+				<xml-property name="description" value="InstanceFilters for performing a named-query or model query" />
+			</xml-properties>
+			<xml-root-element name="instance-filters" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v13.InstanceFilter" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="InstanceFilter">
+			<xml-properties>
+				<xml-property name="description" value="InstanceFilter for performing a named-query or model query" />
+				<xml-property name="container" value="instance-filters" />
+			</xml-properties>
+			<xml-root-element name="instance-filter" />
+			<java-attributes>
+				<xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="SecondaryFilts">
+			<xml-properties>
+				<xml-property name="description" value="SecondaryFilts for performing a named-query or model query" />
+			</xml-properties>
+			<xml-root-element name="secondary-filts" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v13.SecondaryFilt" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="SecondaryFilt">
+			<xml-properties>
+				<xml-property name="description" value="SecondaryFilt for performing a named-query or model query" />
+			</xml-properties>
+			<xml-root-element name="secondary-filt" />
+			<java-attributes>
+				<xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Properties">
+			<xml-properties>
+				<xml-property name="description" value="Property holder for query properties or instance properties" />
+			</xml-properties>
+			<xml-root-element name="properties" />
+			<java-attributes>
+				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ResponseList">
+			<xml-properties>
+				<xml-property name="description" value="Response container for the results of a named-query or model query" />
+			</xml-properties>
+			<xml-root-element name="response-list" />
+			<java-attributes>
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v13.InventoryResponseItems" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="InventoryResponseItems">
+			<xml-properties>
+				<xml-property name="description" value="Container for inventory items in response list" />
+				<xml-property name="container" value="response-list" />
+			</xml-properties>
+			<xml-root-element name="inventory-response-items" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v13.InventoryResponseItem" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="InventoryResponseItem">
+			<xml-properties>
+				<xml-property name="description" value="Inventory item for response list" />
+				<xml-property name="container" value="inventory-response-items" />
+			</xml-properties>
+			<xml-root-element name="inventory-response-item" />
+			<java-attributes>
+				<xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
+				<xml-any-element java-attribute="item" />
+				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v13.ExtraProperties" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v13.InventoryResponseItems" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ExtraProperties">
+			<xml-properties>
+				<xml-property name="description" value="Extra properties for inventory item for response list" />
+			</xml-properties>
+			<xml-root-element name="extra-properties" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v13.ExtraProperty" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="ExtraProperty">
+			<xml-root-element name="extra-property" />
+			<java-attributes>
+				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="RouteTableReferences">
+			<xml-properties>
+				<xml-property name="description" value="Collection of openstack route table references" />
+			</xml-properties>
+			<xml-root-element name="route-table-references" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v13.RouteTableReference" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="RouteTableReference">
+			<xml-root-element name="route-table-reference" />
+			<java-attributes>
+				<xml-element java-attribute="routeTableReferenceId" name="route-table-reference-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="routeTableReferenceFqdn" name="route-table-reference-fqdn"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="FQDN entry in the route table." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Concurrency value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			
+			<xml-properties>
+				<xml-property name="description" value="Openstack route table reference." />
+				<xml-property name="nameProps" value="route-table-reference-fqdn" />
+				<xml-property name="uniqueProps" value="route-table-reference-id" />
+				<xml-property name="indexedProps" value="route-table-reference-id,route-table-reference-fqdn" />
+				<xml-property name="container" value="route-table-references" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="InstanceGroups">
+			<xml-properties>
+				<xml-property name="description" value="Collection of openstack route table references" />
+			</xml-properties>
+			<xml-root-element name="instance-groups" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v13.InstanceGroup" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="InstanceGroup">
+			<xml-root-element name="instance-group" />
+			<java-attributes>
+				<xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="role of the instance group." />
+					</xml-properties>
+				</xml-element>
+
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ASDC model id for this resource or service model." />
+					</xml-properties>
+				</xml-element>
+
+				<xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ASDC model version uid for this resource model." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="id" name="id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="description" name="description"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Descriptive text to help identify the usage of this instance-group" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="type" name="type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Only valid value today is lower case ha for high availability" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="subType" name="sub-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Valid values for ha type are [geo-activeactive, geo-activestandby, local-activeactive, local-activestandby]" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Concurrency value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			
+			<xml-properties>
+				<xml-property name="description" value="General mechanism for grouping instances" />
+				<xml-property name="nameProps" value="description" />
+				<xml-property name="uniqueProps" value="id" />
+				<xml-property name="searchable" value="id,description"/>
+				<xml-property name="indexedProps" value="id,description,type,sub-type" />
+				<xml-property name="container" value="instance-groups" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		
+
+		<java-type name="SegmentationAssignments">
+			<xml-properties>
+				<xml-property name="description" value="Collection of openstack segmentation assignments" />
+			</xml-properties>
+			<xml-root-element name="segmentation-assignments" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v13.SegmentationAssignment" />
+			</java-attributes>
+		</java-type>
+				
+		<java-type name="SegmentationAssignment">
+			<xml-root-element name="segmentation-assignment" />
+			<java-attributes>
+				<xml-element java-attribute="segmentationId" name="segmentation-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Route Table Reference id, UUID assigned to this instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Concurrency value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Openstack segmentation assignment." />
+				<xml-property name="indexedProps" value="segmentation-id" />
+				<xml-property name="dependentOn" value="l3-network" />
+				<xml-property name="container" value="segmentation-assignments" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="AllottedResources">
+			<xml-properties>
+				<xml-property name="description" value="This object is used to store slices of services being offered" />
+			</xml-properties>
+			<xml-root-element name="allotted-resources" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v13.AllottedResource" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="AllottedResource">
+			<xml-root-element name="allotted-resource" />
+			<java-attributes>
+				<xml-element java-attribute="id" name="id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="description" name="description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The descriptive information assigned to this allotted resource instance" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Link back to more information in the controller" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="internal" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Concurrency value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="type" name="type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Generic description of the type of allotted resource." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="role" name="role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="role in the network that this resource will be providing." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v13.TunnelXconnects" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			
+			<xml-properties>
+				<xml-property name="description" value="Represents a slice or partial piece of a resource that gets separately allotted" />
+				<xml-property name="nameProps" value="description" />
+				<xml-property name="uniqueProps" value="id" />
+				<xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role" />
+				<xml-property name="dependentOn" value="service-instance" />
+				<xml-property name="container" value="allotted-resources" />
+				<!--  <xml-property name="namespace" value="network" /> -->
+			</xml-properties>
+		</java-type>	
+		
+		<java-type name="TunnelXconnects">
+			<xml-properties>
+				<xml-property name="description" value="This object is used to store the specific tunnel cross connect aspects of an allotted resource" />
+			</xml-properties>
+			<xml-root-element name="tunnel-xconnects" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v13.TunnelXconnect" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="TunnelXconnect">
+			<xml-root-element name="tunnel-xconnect" />
+			<java-attributes>
+				<xml-element java-attribute="id" name="id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Allotted Resource id UUID assigned to this instance." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The WAN uplink bandwidth for WAN1" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The WAN downlink bandwidth for WAN1" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The WAN uplink bandwidth for WAN2" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The WAN downlink bandwidth for WAN2" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Concurrency value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			
+			<xml-properties>
+				<xml-property name="description" value="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted" />
+				<xml-property name="uniqueProps" value="id" />
+				<xml-property name="indexedProps" value="id" />
+				<xml-property name="dependentOn" value="allotted-resource" />
+				<xml-property name="container" value="tunnel-xconnects" />
+				<!--  <xml-property name="namespace" value="network" /> -->
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="Entitlements">
+			<xml-properties>
+				<xml-property name="description" value="Entitlements, keyed by group-uuid and resource-uuid, related to license management" />
+			</xml-properties>
+			<xml-root-element name="entitlements" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v13.Entitlement" />
+			</java-attributes>
+		</java-type>
+				
+		<java-type name="Entitlement">
+			<xml-root-element name="entitlement" />
+			<java-attributes>
+				<xml-element java-attribute="groupUuid" name="group-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID for the entitlement group the resource comes from, should be uuid." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceUuid" name="resource-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of an entitlement resource. " />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Concurrency value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Metadata for entitlement group." />
+				<xml-property name="indexedProps" value="group-uuid,resource-uuid" />
+				<xml-property name="dependentOn" value="generic-vnf,vce" />
+				<xml-property name="container" value="entitlements" />
+			</xml-properties>
+		</java-type>
+		
+		
+		<java-type name="Licenses">
+			<xml-properties>
+				<xml-property name="description" value="Licenses to be allocated across resources, keyed by group-uuid and resource-uuid, related to license management" />
+			</xml-properties>
+			<xml-root-element name="licenses" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v13.License" />
+			</java-attributes>
+		</java-type>
+				
+		<java-type name="License">
+			<xml-root-element name="license" />
+			<java-attributes>
+				<xml-element java-attribute="groupUuid" name="group-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID for the license group the resource belongs to, should be uuid." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceUuid" name="resource-uuid"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of a license resource. " />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Concurrency value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Metadata for license group." />
+				<xml-property name="indexedProps" value="group-uuid,resource-uuid" />
+				<xml-property name="dependentOn" value="generic-vnf,vce" />
+				<xml-property name="container" value="licenses" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="Vnf">
+			<xml-root-element name="vnf"/>
+			<java-attributes>
+				<xml-element java-attribute="vnfId" name="vnf-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique id of VNF.  This is unique across the graph." />
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Abstract vnf class" />
+				<xml-property name="indexedProps" value="vnf-id" />
+				<xml-property name="uniqueProps" value="vnf-id" />
+				<xml-property name="inheritors" value="vce,generic-vnf" />
+				<xml-property name="abstract" value="true" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="Zones">
+			<xml-properties>
+				<xml-property name="description" value="Collection of zones" />
+			</xml-properties>
+			<xml-root-element name="zones" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v13.Zone" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Zone">
+			<xml-root-element name="zone" />
+			<java-attributes>
+				<xml-element java-attribute="zoneId" name="zone-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Code assigned by AIC to the zone" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="zoneName" name="zone-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="English name associated with the zone" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="designType" name="design-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Design of zone [Medium/Large…]" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="zoneContext" name="zone-context"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Context of zone [production/test]" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="status" name="status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Status of a zone." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Concurrency value" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="A zone is a grouping of assets in a location homing to the same connections into the CBB" />
+				<xml-property name="nameProps" value="zone-name" />
+				<xml-property name="indexedProps" value="zone-id,design-type,zone-context" />
+				<xml-property name="uniqueProps" value="zone-id" />
+				<xml-property name="container" value="zones" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		<java-type name="RouteTargets">
+			<xml-properties>
+				<xml-property name="description" value="Collection of route target information" />
+			</xml-properties>
+			<xml-root-element name="route-targets" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="routeTarget" name="route-target" type="inventory.aai.onap.org.v13.RouteTarget" />
+			</java-attributes>
+		</java-type>
+		<java-type name="RouteTarget">
+			<xml-root-element name="route-target" />
+			<java-attributes>
+				<xml-element java-attribute="globalRouteTarget" name="global-route-target"  xml-key="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Number used to identify an RT, globally unique in the network" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="routeTargetRole" name="route-target-role"  xml-key="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Role assigned to this route target" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Route target information" />
+				<xml-property name="container" value="route-targets" />
+				<xml-property name="dependentOn" value="vpn-binding" />
+				<xml-property name="canBeLinked" value="true" />
+			</xml-properties>
+		</java-type>
+						
+		<java-type name="SriovPfs">
+			<xml-properties>
+				<xml-property name="description" value="Collection of SR-IOV Physical Functions." />
+			</xml-properties>
+			<xml-root-element name="sriov-pfs" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="sriovPf" name="sriov-pf" type="inventory.aai.onap.org.v13.SriovPf" />
+			</java-attributes>
+		</java-type>
+		<java-type name="SriovPf">
+			<xml-root-element name="sriov-pf" />
+			<java-attributes>
+				<xml-element java-attribute="pfPciId" name="pf-pci-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Identifier for the sriov-pf" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="SR-IOV Physical Function" />
+				<xml-property name="indexedProps" value="pf-pci-id" />
+				<xml-property name="dependentOn" value="p-interface" />
+				<xml-property name="container" value="sriov-pfs" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="HostRoutes">
+			<xml-root-element name="host-routes" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="hostRoute" name="host-route" type="inventory.aai.onap.org.v13.HostRoute" />
+			</java-attributes>
+		</java-type>
+		<java-type name="HostRoute">
+			<xml-root-element name="host-route" />
+			<java-attributes>
+				<xml-element java-attribute="hostRouteId" name="host-route-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="host-route id" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="routePrefix" name="route-prefix"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="subnet prefix" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nextHop" name="next-hop"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Could be ip-address, hostname, or service-instance" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nextHopType" name="next-hop-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Should be ip-address, hostname, or service-instance to match next-hop" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="indexedProps" value="host-route-id" />
+				<xml-property name="dependentOn" value="subnet" />
+				<xml-property name="container" value="host-routes" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="VipIpv4AddressList">
+			<xml-root-element name="vip-ipv4-address-list" />
+			<java-attributes>
+				<xml-element java-attribute="vipIpv4Address" name="vip-ipv4-address"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="IP address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vipIpv4PrefixLength" name="vip-ipv4-prefix-length" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Prefix length, 32 for single address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Inner VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Outer VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="Indicator of fixed or floating address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="IPv4 Address Range" />
+				<xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+				<xml-property name="dependentOn" value="cloud-region" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="VipIpv6AddressList">
+			<xml-root-element name="vip-ipv6-address-list" />
+			<java-attributes>
+				<xml-element java-attribute="vipIpv6Address" name="vip-ipv6-address"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="IP address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vipIpv6PrefixLength" name="vip-ipv6-prefix-length" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Prefix length, 128 for single address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Inner VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" type="java.lang.Long">
+					<xml-properties>
+						<xml-property name="description" value="Outer VLAN tag" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="isFloating" name="is-floating" type="java.lang.Boolean">
+					<xml-properties>
+						<xml-property name="description" value="Indicator of fixed or floating address" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronNetworkId" name="neutron-network-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron network id of the interface that address belongs to" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="neutronSubnetId" name="neutron-subnet-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Neutron id of subnet that address belongs to" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="IPv6 Address Range" />
+				<xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id" />
+				<xml-property name="dependentOn" value="cloud-region" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="OperationalEnvironments">
+			<xml-properties>
+				<xml-property name="description" value="a logical partition of the cloud which allows to have multiple environments in the production AIC." />
+			</xml-properties>
+			<xml-root-element name="operational-environments" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="operationalEnvironment" name="operational-environment" type="inventory.aai.onap.org.v13.OperationalEnvironment" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="maximumDepth" value="0" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="OperationalEnvironment">
+			<xml-root-element name="operational-environment" />
+			<java-attributes>
+				<xml-element java-attribute="operationalEnvironmentId" name="operational-environment-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="UUID of an operational environment" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalEnvironmentName" name="operational-environment-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Operational Environment name" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalEnvironmentType" name="operational-environment-type"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Operational Environment Type." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalEnvironmentStatus" name="operational-environment-status"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Status" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="tenantContext" name="tenant-context"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Tenant Context." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="workloadContext" name="workload-context"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Workload Context." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="It is a logical partition of the cloud which allows to have multiple environments in the production AIC." />
+				<xml-property name="indexedProps" value="operational-environment-id" />
+				<xml-property name="nameProps" value="operational-environment-name" />
+				<xml-property name="uniqueProps" value="operational-environment-id" />
+				<xml-property name="container" value="operational-environments" />
+				<xml-property name="namespace" value="cloud-infrastructure" />
+			</xml-properties>
+		</java-type>
+		
+		<java-type name="ForwardingPaths">
+			<xml-root-element name="forwarding-paths" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="forwardingPath" name="forwarding-path" type="inventory.aai.onap.org.v13.ForwardingPath" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="ForwardingPath">
+			<xml-root-element name="forwarding-path"/>
+			<xml-properties>
+				<xml-property name="namespace" value="network"/>
+				<xml-property name="indexedProps" value="forwarding-path-id,forwarding-path-name"/>
+				<xml-property name="description" value="Entity that describes the sequenced forwarding path between interfaces of services or resources"/>
+			  <xml-property name="container" value="forwarding-paths" />
+			  <xml-property name="nameProps" value="forwarding-path-name" />
+			  <xml-property name="uniqueProps" value="forwarding-path-id" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element java-attribute="forwardingPathId" name="forwarding-path-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of this FP"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="forwardingPathName" name="forwarding-path-name"  type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the FP"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the self link for this FP"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="forwarders" name="forwarders" type="inventory.aai.onap.org.v13.Forwarders" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="Forwarders">
+			<xml-root-element name="forwarders" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="forwarder" name="forwarder" type="inventory.aai.onap.org.v13.Forwarder" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="Forwarder">
+			<xml-root-element name="forwarder"/>
+			<xml-properties>
+				<xml-property name="indexedProps" value="sequence"/>
+				<xml-property name="description" value="Entity describing a sequenced segment of forwarding path"/>
+				<xml-property name="container" value="forwarders" />
+				<xml-property name="dependentOn" value="forwarding-path" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element java-attribute="sequence" name="sequence"  type="java.lang.Integer" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique ID of this segmentation"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="forwarderRole" name="forwarder-role" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="ingress, intermediate, egress"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="ForwarderEvcs">
+			<xml-root-element name="forwarder-evcs"/>
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="forwarderEvc" name="forwarder-evc" type="inventory.aai.onap.org.v13.ForwarderEvc"/>
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="ForwarderEvc">
+			<xml-root-element name="forwarder-evc"/>
+			<java-attributes>
+				<xml-element java-attribute="forwarderEvcId" name="forwarder-evc-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Key for forwarder-evc object"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Circuit ID from customer/ESP/ingress end of EVC, or reference to beater circuit on gateway/network/egress end of EVC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ivlan" name="ivlan" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Internal VLAN." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="svlan" name="svlan" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="SVLAN value for ingress of egress forwarder." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="CVLAN value for ingress of egress forwarder." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="forwarder object is an optional child object of the Configuration object." />
+				<xml-property name="dependentOn" value="configuration" />
+				<xml-property name="uniqueProps" value="forwarder-evc-id" />
+				<xml-property name="container" value="forwarder-evcs" />
+			</xml-properties>
+		</java-type>
+
+		<java-type name="Evcs">
+			<xml-root-element name="evcs" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="evc" name="evc" type="inventory.aai.onap.org.v13.Evc" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Evc">
+			<xml-root-element name="evc" />
+			<java-attributes>
+				<xml-element java-attribute="evcId" name="evc-id"  type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Unique/key field for the evc object" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="forwardingPathTopology" name="forwarding-path-topology" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Point-to-Point, Multi-Point" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cirValue" name="cir-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Commited Information Rate" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cirUnits" name="cir-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="CIR units" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="connectionDiversityGroupId" name="connection-diversity-group-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Diversity Group ID" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceHours" name="service-hours" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="formerly Performance Group" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="espEvcCircuitId" name="esp-evc-circuit-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="EVC Circuit ID of ESP EVC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="espEvcCirValue" name="esp-evc-cir-value" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Committed Information Rate (For ESP)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="espEvcCirUnits" name="esp-evc-cir-units" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="CIR units (For ESP)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="espItuCode" name="esp-itu-code" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Identifies ESP" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="collectorPopClli" name="collector-pop-clli" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Collector POP CLLI (from the hostname of the access pnf)" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="interConnectTypeIngress" name="inter-connect-type-ingress" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Interconnect type on ingress side of EVC." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="tagmodeAccessIngress" name="tagmode-access-ingress" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="tagode for collector side of EVC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="tagmodeAccessEgress" name="tagmode-access-egress" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="tagMode for network side of EVC" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v13.RelationshipList"/>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/>
+					</xml-properties>
+				</xml-element>
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="evc object is an optional child object of the Configuration object." />
+				<xml-property name="dependentOn" value="configuration" />
+				<xml-property name="uniqueProps" value="evc-id" />
+				<xml-property name="container" value="evcs" />
+			</xml-properties>
+		</java-type>
+
+	</java-types>
+</xml-bindings>