Add unit test cases to increase coverage to 30%

Remove classes that are already removed internally
Use a unified AAISetup class that uses common configuration

Issue-ID: AAI-213
Change-Id: If99b5230140ea300cd70eeaf9fd4064e4a07d99a
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

69 files changed, 4368 insertions, 20110 deletions

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 8008a1d..900acaa 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -443,6 +443,12 @@
             <artifactId>jersey-json</artifactId>
             <version>1.18</version>
         </dependency>
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.4.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>aai-resources</finalName>
diff --git a/aai-resources/src/main/java/org/openecomp/aai/dbgen/GraphMLReaderNew.java b/aai-resources/src/main/java/org/openecomp/aai/dbgen/GraphMLReaderNew.java
deleted file mode 100644
index 4f3fee0..0000000
--- a/aai-resources/src/main/java/org/openecomp/aai/dbgen/GraphMLReaderNew.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.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=========================================================
- */
-
-package org.openecomp.aai.dbgen;
-
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.lang.reflect.Array;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.events.XMLEvent;
-
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-
-//import com.infrasight.model.UnicodeUtil;
-import com.thinkaurelius.titan.core.TitanGraph;
-
-/**
- * GraphMLReader writes the data from a GraphML stream to a graph.
- */
-public class GraphMLReaderNew {
-	public static final Charset charset = Charset.forName("UTF8");
-
-    /**
-     * Input the GraphML stream data into the graph.
-     * In practice, usually the provided graph is empty.
-     *
-     * @param graph              the graph to populate with the GraphML data
-     * @param titanGraph the titan graph
-     * @param graphMLInputStream an InputStream of GraphML data
-     * @return the map
-     * @throws XMLStreamException thrown when the GraphML data is not correctly formatted
-     */
-    public static Map<String, Object> inputGraph(final Graph graph, final TitanGraph titanGraph, final InputStream graphMLInputStream) throws XMLStreamException {
-        return inputGraph(graph, titanGraph, new InputStreamReader(graphMLInputStream, charset), 1000);
-    }
-    
-/*    public static void inputGraphFiltered(final Graph graph, final InputStream graphMLInputStream) throws XMLStreamException {
-        inputGraph(graph, UnicodeUtil.createFilteredReader(new InputStreamReader(graphMLInputStream, charset)), 1000);
-    }*/
-
-    private static class KeySpec {
-		String attrName;
-		String attrType;
-		
-		/**
-		 * Instantiates a new key spec.
-		 *
-		 * @param name the name
-		 * @param type the type
-		 */
-		public KeySpec(String name, String type) {
-			this.attrName = name;
-			this.attrType = type;
-		}
-	}
-    
-    /**
-     * Input the GraphML stream data into the graph.
-     * More control over how data is streamed is provided by this method.
-     *
-     * @param graph              the graph to populate with the GraphML data
-     * @param titanGraph the titan graph
-     * @param inputReader        an Reader of GraphML character data
-     * @param bufferSize         the amount of elements to hold in memory before committing a transactions (only valid for TransactionalGraphs)
-     * @return the map
-     * @throws XMLStreamException thrown when the GraphML data is not correctly formatted
-     */
-    public static  Map<String, Object> inputGraph(final Graph graph, final TitanGraph titanGraph, final Reader inputReader, int bufferSize) throws XMLStreamException {
-
-        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-        inputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, false);
-        inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, false);
-        XMLStreamReader reader = inputFactory.createXMLStreamReader(inputReader);
-        
-        //final BatchGraph<?> graph = BatchGraph.wrap(inputGraph, bufferSize);
-
-        Map<String, KeySpec> keyMap = new HashMap<String, KeySpec>();
-
-        // Buffered Vertex Data
-        String vertexId = null;
-        Map<String, Object> vertexProps = null;
-        boolean inVertex = false;
-
-        // Buffered Edge Data
-        String edgeId = null;
-        String edgeLabel = null;
-        Vertex edgeInVertex = null;
-        Vertex edgeOutVertex = null;
-        Map<String, Object> edgeProps = null;
-        boolean inEdge = false;
-        Map<String, Object> vertexIdSetMap = new HashMap<String, Object>(); 
-
-        while (reader.hasNext()) {
-
-            Integer eventType = reader.next();
-            if (eventType.equals(XMLEvent.START_ELEMENT)) {
-                String elementName = reader.getName().getLocalPart();
-
-                if (elementName.equals(GraphMLTokens.KEY)) {
-                    String id = reader.getAttributeValue(null, GraphMLTokens.ID);
-                    String attributeName = reader.getAttributeValue(null, GraphMLTokens.ATTR_NAME);
-                    String attributeType = reader.getAttributeValue(null, GraphMLTokens.ATTR_TYPE);
-                    keyMap.put(id, new KeySpec(attributeName, attributeType));
-
-                } else if (elementName.equals(GraphMLTokens.NODE)) {
-                    vertexId = reader.getAttributeValue(null, GraphMLTokens.ID);
-                    inVertex = true;
-                    vertexProps = new HashMap<String, Object>();
-
-                } else if (elementName.equals(GraphMLTokens.EDGE)) {
-                	
-                	
-                    edgeId = reader.getAttributeValue(null, GraphMLTokens.ID);
-                    edgeLabel = reader.getAttributeValue(null, GraphMLTokens.LABEL);
-                    edgeLabel = edgeLabel == null ? GraphMLTokens._DEFAULT : edgeLabel;
-
-                    String outVertexId = reader.getAttributeValue(null, GraphMLTokens.SOURCE);
-                    String inVertexId = reader.getAttributeValue(null, GraphMLTokens.TARGET);
-                    
-                    edgeOutVertex = graph.vertices(outVertexId).next();
-                    edgeInVertex = graph.vertices(inVertexId).next();                 
-                    
-                    if (null == edgeOutVertex) {
-                        edgeOutVertex = graph.addVertex(outVertexId);
-                    }
-                    if (null == edgeInVertex) {
-                        edgeInVertex = graph.addVertex(inVertexId);
-                    }
-
-                    inEdge = true;
-                    edgeProps = new HashMap<String, Object>();
-
-                } else if (elementName.equals(GraphMLTokens.DATA)) {
-                    String key = reader.getAttributeValue(null, GraphMLTokens.KEY);
-                    KeySpec keySpec = keyMap.get(key);
-
-                    if (keySpec != null) {
-                    	Object value = readData(reader, keySpec.attrType);
-                    	if(value == null)
-                    		throw new RuntimeException("Empty data");
-                        if (inVertex == true) {
-                        	vertexProps.put(keySpec.attrName, value);
-                        } else if (inEdge == true) {
-                        	edgeProps.put(keySpec.attrName, value);
-                        }
-                    }
-
-                }
-            } else if (eventType.equals(XMLEvent.END_ELEMENT)) {
-                String elementName = reader.getName().getLocalPart();
-
-                if (elementName.equals(GraphMLTokens.NODE)) {
-                	
-                    Vertex currentVertex = graph.vertices(vertexId).next();
-                    if (currentVertex != null)
-                    	throw new RuntimeException("Duplicate vertex ID: "+vertexId);
-                    currentVertex = graph.addVertex(vertexId);
-                    Boolean hasCollection = false;
-                    for (Entry<String, Object> prop : vertexProps.entrySet()) {
-                    	// multi-properties need a addProperty and need to use a TitanVertex - BluePrint 
-                    	// Vertex does not support this
-                    	Object value = prop.getValue();
-                    	if (value instanceof Collection) { 
-                    		hasCollection = true; 
-	                        vertexIdSetMap.put(currentVertex.id().toString() + "." + prop.getKey(), vertexProps);
-	                        	currentVertex.property("has-collection", "true");
-                    	} else {
-	                            currentVertex.property(prop.getKey(), value);
-	                    }
-                    }
-                    if (hasCollection)
-                    	System.out.println("---Found node with SET property vertex id:" + vertexId + " properties:" + vertexProps.toString());
-                    vertexId = null;
-                    vertexProps = null;
-                    inVertex = false;
-                } else if (elementName.equals(GraphMLTokens.EDGE)) {
-                    Edge currentEdge = edgeOutVertex.addEdge(edgeLabel, edgeInVertex);
-                    		//addEdge(edgeId, edgeOutVertex, edgeInVertex, edgeLabel);
-
-                    for (Entry<String, Object> prop : edgeProps.entrySet()) {
-                        currentEdge.property(prop.getKey(), prop.getValue());
-                    }
-
-                    edgeId = null;
-                    edgeLabel = null;
-                    edgeInVertex = null;
-                    edgeOutVertex = null;
-                    edgeProps = null;
-                    inEdge = false;
-                }
-
-            }
-            
-        }
-
-        reader.close();
-        graph.tx().close();
-        
-        return vertexIdSetMap;
-
-    }
-
-    /**
-     * Read data.
-     *
-     * @param reader the reader
-     * @param type the type
-     * @return the object
-     * @throws XMLStreamException the XML stream exception
-     */
-    private static Object readData(XMLStreamReader reader, String type) throws XMLStreamException {
-    	Collection<Object> col = new ArrayList<Object>();
-    	
-    	int pos = type.indexOf('-');
-    	if(pos < 0)
-    		return typeCastValue(reader.getElementText(), type);
-    	String arrayType = type.substring(0, pos);
-    	type = type.substring(pos+1);
-
-    	boolean done = false;
-    	while(!done) {
-    		Integer eventType = reader.next();
-    		if(eventType.equals(XMLEvent.START_ELEMENT)) {
-    			String text = reader.getElementText();
-    			Object value = typeCastValue(text, type);
-    			col.add(value);
-    		}
-    		if(eventType.equals(XMLEvent.END_ELEMENT)) {
-    			String elementName = reader.getName().getLocalPart();
-    			if(elementName.equals(GraphMLTokens.DATA)) {
-    				done = true;
-    				continue;
-    			}
-    		}
-    	}
-    	
-    	if(arrayType.equals(GraphMLTokens.ARRAY)) {
-    		Object arr = Array.newInstance(typeToClass(type), col.size());
-    		int i = 0;
-    		for(Object obj : col) {
-    			Array.set(arr, i, obj);
-    			i++;
-    		}
-    		return arr;
-    	}
-    	else if(arrayType.equals(GraphMLTokens.SET))
-    		return new HashSet<Object>(col);
-    	else if(type.startsWith(GraphMLTokens.LIST))
-    		return new HashSet<Object>(col);
-
-    	return col;
-    }
-    
-    /**
-     * Type to class.
-     *
-     * @param type the type
-     * @return the class
-     */
-    private static Class<?> typeToClass(String type) {
-    	if (type.equals(GraphMLTokens.STRING))
-    		return String.class;
-        else if (type.equals(GraphMLTokens.FLOAT))
-        	return Float.TYPE;
-        else if (type.equals(GraphMLTokens.INT))
-        	return Integer.TYPE;
-        else if (type.equals(GraphMLTokens.DOUBLE))
-        	return Double.TYPE;
-        else if (type.equals(GraphMLTokens.BOOLEAN))
-        	return Boolean.TYPE;
-        else if (type.equals(GraphMLTokens.LONG))
-        	return Long.TYPE;
-        else
-        	throw new RuntimeException("Unsupported type: "+type);
-    }
-    
-    /**
-     * Type cast value.
-     *
-     * @param value the value
-     * @param type the type
-     * @return the object
-     */
-    private static Object typeCastValue(String value, String type) {
-    	if (type.equals(GraphMLTokens.STRING))
-            return value;
-        else if (type.equals(GraphMLTokens.FLOAT))
-            return Float.valueOf(value);
-        else if (type.equals(GraphMLTokens.INT))
-            return Integer.valueOf(value);
-        else if (type.equals(GraphMLTokens.DOUBLE))
-            return Double.valueOf(value);
-        else if (type.equals(GraphMLTokens.BOOLEAN))
-            return Boolean.valueOf(value);
-        else if (type.equals(GraphMLTokens.LONG))
-            return Long.valueOf(value);
-        else
-        	throw new RuntimeException("Unsupported type: "+type);
-    }
-    
-/*	TitanVertex titanVertex = (TitanVertex) titanGraph.getVertex(vertexId);
-    if (titanVertex != null)
-    	throw new RuntimeException("Duplicate vertex ID: "+vertexId);
-    titanVertex = (TitanVertex) titanGraph.addVertex(vertexId);
-    for (Entry<String, Object> prop : vertexProps.entrySet()) {
-    	// multi-properties need a addProperty and need to use a TitanVertex - BluePrint 
-    	// Vertex does not support this
-    	Object value = prop.getValue();
-    	if (value instanceof Collection) {
-			try { 
-    			for(Object obj : ((Collection<?>)value)) {
-        			System.out.println("vertex id:property name:property value="+ vertexId + ":" + prop.getKey() + ":" + obj.toString());
-    				titanVertex.addProperty(prop.getKey(), obj.toString());
-    			} 
-				} 
-			catch (Exception e) {
-				System.out.println("Can't set SET/LIST properties - skipping");
-			}
-
-    	} else 
-            titanVertex.setProperty(prop.getKey(), prop.getValue());
-    }*/
-}
diff --git a/aai-resources/src/main/java/org/openecomp/aai/dbgen/GraphMLWriterNew.java b/aai-resources/src/main/java/org/openecomp/aai/dbgen/GraphMLWriterNew.java
deleted file mode 100644
index 1704428..0000000
--- a/aai-resources/src/main/java/org/openecomp/aai/dbgen/GraphMLWriterNew.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.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=========================================================
- */
-
-package org.openecomp.aai.dbgen;
-
-
-import java.io.OutputStream;
-import java.lang.reflect.Array;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-
-/**
- * GraphMLWriter writes a Graph to a GraphML OutputStream.
- */
-public class GraphMLWriterNew {
-	
-	private static class KeySpec {
-		String attrName;
-		String attrType;
-		
-		/**
-		 * Instantiates a new key spec.
-		 *
-		 * @param name the name
-		 * @param type the type
-		 */
-		public KeySpec(String name, String type) {
-			this.attrName = name;
-			this.attrType = type;
-		}
-	}
-
-    /**
-     * Write the data in a Graph to a GraphML OutputStream.
-     *
-     * @param graph               the Graph to pull the data from
-     * @param graphMLOutputStream the GraphML OutputStream to write the Graph data to
-     * @throws XMLStreamException thrown if there is an error generating the GraphML data
-     */
-    public static void outputGraph(final Graph graph, final OutputStream graphMLOutputStream) throws XMLStreamException {
-        Map<String, KeySpec> vertexKeyTypes = new HashMap<String, KeySpec>();
-        Map<String, KeySpec> edgeKeyTypes = new HashMap<String, KeySpec>();
-
-        
-        Iterator<Vertex> vertices = graph.vertices();
-        Vertex vertex = null;
-        Iterator<VertexProperty<Object>> propertyIterator = null;
-        VertexProperty<Object> property = null;
-        while (vertices.hasNext()) {
-        	vertex = vertices.next();
-        	propertyIterator = vertex.properties();
-            while (propertyIterator.hasNext()) {
-            	property = propertyIterator.next();
-            	Object value = property.value();
-            	String key = property.key();
-            	if(value == null)
-            		continue;
-            	String type = getStringType(value);
-            	if(type == null)
-            		continue;
-            	String id = key+"-"+type;
-                if (!vertexKeyTypes.containsKey(id)) {
-                    vertexKeyTypes.put(id, new KeySpec(key, type));
-                }
-            }
-        }
-        Iterator<Edge> edges = graph.edges();
-        Edge edge = null;
-        Iterator<Property<Object>> edgePropertyIterator = null;
-        Property<Object> edgeProperty = null;
-
-        while (edges.hasNext()) {
-        	edge = edges.next();
-        	edgePropertyIterator = edge.properties();
-            while (edgePropertyIterator.hasNext()) {
-            	edgeProperty = edgePropertyIterator.next();
-            	Object value = edgeProperty.value();
-            	String key = edgeProperty.key();
-            	if(value == null)
-            		continue;
-            	String type = getStringType(value);
-            	if(type == null)
-            		continue;
-            	String id = key+"-"+type;
-                if (!edgeKeyTypes.containsKey(id)) {
-                    edgeKeyTypes.put(id, new KeySpec(key, type));
-                }
-            }
-        }
-        outputGraph(graph, graphMLOutputStream, vertexKeyTypes, edgeKeyTypes);
-    }
-
-    /**
-     * Write the data in a Graph to a GraphML OutputStream.
-     *
-     * @param graph               the Graph to pull the data from
-     * @param graphMLOutputStream the GraphML OutputStream to write the Graph data to
-     * @param vertexKeyTypes      a Map of the data types of the vertex keys
-     * @param edgeKeyTypes        a Map of the data types of the edge keys
-     * @throws XMLStreamException thrown if there is an error generating the GraphML data
-     */
-    public static void outputGraph(final Graph graph, final OutputStream graphMLOutputStream, final Map<String, KeySpec> vertexKeyTypes, final Map<String, KeySpec> edgeKeyTypes) throws XMLStreamException {
-        XMLOutputFactory inputFactory = XMLOutputFactory.newInstance();
-        XMLStreamWriter writer = inputFactory.createXMLStreamWriter(graphMLOutputStream, "UTF8");
-
-        writer.writeStartDocument("UTF-8", "1.0");
-        writer.writeStartElement(GraphMLTokens.GRAPHML);
-        writer.writeAttribute(GraphMLTokens.XMLNS, GraphMLTokens.GRAPHML_XMLNS);
-        //<key id="weight" for="edge" attr.name="weight" attr.type="float"/>
-        for (Map.Entry<String, KeySpec> entry : vertexKeyTypes.entrySet()) {
-            writer.writeStartElement(GraphMLTokens.KEY);
-            writer.writeAttribute(GraphMLTokens.ID, entry.getKey());
-            writer.writeAttribute(GraphMLTokens.FOR, GraphMLTokens.NODE);
-            writer.writeAttribute(GraphMLTokens.ATTR_NAME, entry.getValue().attrName);
-            writer.writeAttribute(GraphMLTokens.ATTR_TYPE, entry.getValue().attrType);
-            writer.writeEndElement();
-        }
-        for (Map.Entry<String, KeySpec> entry : edgeKeyTypes.entrySet()) {
-            writer.writeStartElement(GraphMLTokens.KEY);
-            writer.writeAttribute(GraphMLTokens.ID, entry.getKey());
-            writer.writeAttribute(GraphMLTokens.FOR, GraphMLTokens.EDGE);
-            writer.writeAttribute(GraphMLTokens.ATTR_NAME, entry.getValue().attrName);
-            writer.writeAttribute(GraphMLTokens.ATTR_TYPE, entry.getValue().attrType);
-            writer.writeEndElement();
-        }
-
-        writer.writeStartElement(GraphMLTokens.GRAPH);
-        writer.writeAttribute(GraphMLTokens.ID, GraphMLTokens.G);
-        writer.writeAttribute(GraphMLTokens.EDGEDEFAULT, GraphMLTokens.DIRECTED);
-        Iterator<Vertex> vertices = graph.vertices();
-        Vertex vertex = null;
-        Iterator<VertexProperty<Object>> propertyIterator = null;
-        VertexProperty<Object> property = null;
-        while (vertices.hasNext()) {
-        	vertex = vertices.next();
-            writer.writeStartElement(GraphMLTokens.NODE);
-            writer.writeAttribute(GraphMLTokens.ID, vertex.id().toString());
-            propertyIterator = vertex.properties();
-            while (propertyIterator.hasNext()) {
-            	property = propertyIterator.next();
-            	String key = property.key();
-            	writeData(writer, key, property.value());
-            }
-            writer.writeEndElement();
-        }
-
-        Iterator<Edge> edges = graph.edges();
-        Edge edge = null;
-        Iterator<Property<Object>> edgePropertyIterator = null;
-        Property<Object> edgeProperty = null;
-
-        while (edges.hasNext()) {
-        	edge = edges.next();
-        	edgePropertyIterator = edge.properties();
-            writer.writeStartElement(GraphMLTokens.EDGE);
-            writer.writeAttribute(GraphMLTokens.ID, edge.id().toString());
-            writer.writeAttribute(GraphMLTokens.SOURCE, edge.outVertex().id().toString());
-            writer.writeAttribute(GraphMLTokens.TARGET, edge.inVertex().id().toString());
-            writer.writeAttribute(GraphMLTokens.LABEL, edge.label());
-
-            while (edgePropertyIterator.hasNext()) {
-            	edgeProperty = edgePropertyIterator.next();
-            	String key = edgeProperty.key();
-            	writeData(writer, key, edgeProperty.value());
-            }
-            writer.writeEndElement();
-        }
-
-        writer.writeEndElement(); // graph
-        writer.writeEndElement(); // graphml
-        writer.writeEndDocument();
-
-        writer.flush();
-        writer.close();
-
-    }
-    
-    /**
-     * Write data.
-     *
-     * @param writer the writer
-     * @param key the key
-     * @param value the value
-     * @throws XMLStreamException the XML stream exception
-     */
-    private static void writeData(XMLStreamWriter writer, String key, Object value) throws XMLStreamException {
-    	if(value == null)
-    		return;
-    	String type = getStringType(value);
-    	if(type == null)
-    		return;
-    	String id = key+"-"+type;
-
-        writer.writeStartElement(GraphMLTokens.DATA);
-        writer.writeAttribute(GraphMLTokens.KEY, id);
-        if(type.startsWith(GraphMLTokens.ARRAY) ||
-        		type.startsWith(GraphMLTokens.LIST) ||
-        		type.startsWith(GraphMLTokens.SET))
-        	writeDataArray(writer, value);
-        else
-        	writer.writeCharacters(propertyValueToString(value));
-        writer.writeEndElement();
-    }
-
-    /**
-     * Write data array.
-     *
-     * @param writer the writer
-     * @param value the value
-     * @throws XMLStreamException the XML stream exception
-     */
-    private static void writeDataArray(XMLStreamWriter writer, Object value) throws XMLStreamException {
-    	if(value.getClass().isArray()) {
-			for(int i = 0; i < Array.getLength(value); i++) {
-				writer.writeStartElement(GraphMLTokens.ITEM);
-				writer.writeCharacters(Array.get(value, i).toString());
-				writer.writeEndElement();
-			}
-		}
-		else if(value instanceof Collection) {
-			for(Object obj : ((Collection<?>)value)) {
-				writer.writeStartElement(GraphMLTokens.ITEM);
-				writer.writeCharacters(obj.toString());
-				writer.writeEndElement();
-			}
-		}
-    }
-    
-    /**
-     * Gets the string type.
-     *
-     * @param object the object
-     * @return the string type
-     */
-    private static String getStringType(final Object object) {
-    	if(object.getClass().isArray())
-    		return GraphMLTokens.ARRAY+"-"+getStringType(object.getClass().getComponentType());
-    	if(object instanceof Collection) {
-    		String colType;
-    		if(object instanceof Set)
-    			colType = GraphMLTokens.SET;
-    		else if(object instanceof List)
-    			colType = GraphMLTokens.LIST;
-    		else
-    			throw new RuntimeException("Unhandled Collection type: "+object.getClass());
-    				
-    		Collection<?> col = (Collection<?>)object;
-    		if(col.size() == 0)
-    			return null;
-    		return colType+"-"+getStringType(col.iterator().next());
-    	}
-        if (object instanceof String)
-            return GraphMLTokens.STRING;
-        else if (object instanceof Integer)
-            return GraphMLTokens.INT;
-        else if (object instanceof Long)
-            return GraphMLTokens.LONG;
-        else if (object instanceof Float)
-            return GraphMLTokens.FLOAT;
-        else if (object instanceof Double)
-            return GraphMLTokens.DOUBLE;
-        else if (object instanceof Boolean)
-            return GraphMLTokens.BOOLEAN;
-        else
-        	throw new RuntimeException("Unsupported type: "+object.getClass());
-    }
-    
-    /**
-     * Gets the string type.
-     *
-     * @param clazz the clazz
-     * @return the string type
-     */
-    private static String getStringType(final Class<?> clazz) {
-    	if(clazz.equals(String.class))
-            return GraphMLTokens.STRING;
-    	else if(clazz.equals(Integer.TYPE) || clazz.equals(Integer.class))
-            return GraphMLTokens.INT;
-    	else if(clazz.equals(Long.TYPE) || clazz.equals(Long.class))
-            return GraphMLTokens.LONG;
-    	else if(clazz.equals(Float.TYPE) || clazz.equals(Float.class))
-            return GraphMLTokens.FLOAT;
-    	else if(clazz.equals(Double.TYPE) || clazz.equals(Double.class))
-            return GraphMLTokens.DOUBLE;
-    	else if(clazz.equals(Boolean.TYPE) || clazz.equals(Boolean.class))
-            return GraphMLTokens.BOOLEAN;
-        else
-        	throw new RuntimeException("Unsupported array item type: "+clazz);
-    }
-    
-    /**
-     * Property value to string.
-     *
-     * @param value the value
-     * @return the string
-     */
-    private static String propertyValueToString(Object value) {
-		if(value == null)
-			return null;
-
-		if(value.getClass().isArray()) {
-			String str = "[";
-			for(int i = 0; i < Array.getLength(value); i++) {
-				if(i > 0)
-					str += ", ";
-				str += Array.get(value, i);
-			}
-			str += "]";
-			return str;	
-		}
-		else if(value instanceof Collection) {
-			String str = "[";
-			int i = 0;
-			for(Object obj : ((Collection<?>)value)) {
-				if(i > 0)
-					str += ", ";
-				str += obj.toString();
-				i++;
-			}
-			str += "]";
-			return str;	
-		}
-		return value.toString();
-	}
-
-}
diff --git a/aai-resources/src/main/java/org/openecomp/aai/dbgen/PropertyNameChange.java b/aai-resources/src/main/java/org/openecomp/aai/dbgen/PropertyNameChange.java
deleted file mode 100644
index 3f7f351..0000000
--- a/aai-resources/src/main/java/org/openecomp/aai/dbgen/PropertyNameChange.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.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=========================================================
- */
-
-package org.openecomp.aai.dbgen;
-
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-
-import org.openecomp.aai.dbmap.AAIGraph;
-import org.openecomp.aai.logging.ErrorLogHelper;
-import org.openecomp.aai.util.AAIConfig;
-import org.openecomp.aai.util.AAIConstants;
-import com.att.eelf.configuration.Configuration;
-import com.thinkaurelius.titan.core.PropertyKey;
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.TitanProperty;
-import com.thinkaurelius.titan.core.TitanVertex;
-import com.thinkaurelius.titan.core.schema.TitanManagement;
-
-
-public class PropertyNameChange {
-
-	/**
-	 * The main method.
-	 *
-	 * @param args the arguments
-	 */
-	public static void main(String[] args) {
-	
-		// Set the logging file properties to be used by EELFManager
-		Properties props = System.getProperties();
-		props.setProperty(Configuration.PROPERTY_LOGGING_FILE_NAME, AAIConstants.AAI_SCHEMA_MOD_LOGBACK_PROPS);
-		props.setProperty(Configuration.PROPERTY_LOGGING_FILE_PATH, AAIConstants.AAI_HOME_ETC_APP_PROPERTIES);
-		
-		// NOTE -- We're just working with properties that are used for NODES for now. 
-	   
-    	TitanGraph graph = null;
-    	TitanManagement graphMgt = null;;
-    	Boolean preserveData = true;
-    	String propName = "";
-		String targetPropName = "";
-		String targetNodeType = "";
-		String skipCommit = "";
-		boolean noCommit = false;
-		
-		
-		String usageString = "Usage: PropertyNameChange propertyName targetPropertyName nodeType(or NA) skipCommit(true|false) \n";
-		if( args.length != 4 ){
-			String emsg = "Four Parameters are required.  \n" + usageString;
-			System.out.println( emsg );
-         	System.exit(1);
-		}
-		else {
-			propName = args[0];
-			targetPropName = args[1];
-			targetNodeType = args[2];
-			skipCommit = args[3];
-			if ( skipCommit.toLowerCase().equals("true"))
-				noCommit = true;
-		}
-				
-		if( propName.equals("") ){
-			 String emsg = "Bad parameter - propertyName cannot be empty.  \n" + usageString;
-			 System.out.println( emsg );
-          	 System.exit(1);
-		}
-
-
-		
-		try {
-			AAIConfig.init();
-			ErrorLogHelper.loadProperties();
-		}
-		catch( Exception ae ){
-			String emsg = "Problem with either AAIConfig.init() or ErrorLogHelper.LoadProperties(). ";
-			System.out.println( emsg + "[" + ae.getMessage() + "]");
-         	System.exit(1);
-		}
-
-       
-		System.out.println(">>> Processing will begin in 5 seconds (unless interrupted). <<<");
-		try {
-			// Give them a chance to back out of this
-			Thread.sleep(5000);
-		} catch ( java.lang.InterruptedException ie) {
-			System.out.println( " DB Schema Update has been aborted. ");
-			System.exit(1);
-		}
-		
-		try {
-			System.out.println("    ---- NOTE --- about to open graph (takes a little while)\n");
-
-			graph = AAIGraph.getInstance().getGraph();
-			if( graph == null ){
-				 String emsg = "Not able to get a graph object in SchemaMod.java\n";
-	          	 System.out.println( emsg );
-	          	 System.exit(1);
-	 		}
-	    	
-			// Make sure this property is in the DB.
-			graphMgt = graph.openManagement();
-			if( graphMgt == null ){
-				 String emsg = "Not able to get a graph Management object in SchemaMod.java\n";
-	          	 System.out.println( emsg );
-	          	 System.exit(1);
-	 		}
-			PropertyKey origPropKey = graphMgt.getPropertyKey(propName);
-			if( origPropKey == null ){
-				String emsg = "The propName = [" + propName + "] is not defined in our graph. ";
-	          	System.out.println( emsg );
-	          	System.exit(1);
-			}
-			origPropKey = graphMgt.getPropertyKey(targetPropName);
-			if( origPropKey == null ){
-				String emsg = "The targetPropName = [" + targetPropName + "] is not defined in our graph. ";
-	          	System.out.println( emsg );
-	          	System.exit(1);
-			}			
-			
-			if ( !targetNodeType.equals("NA")) {
-				if ( graphMgt.getVertexLabel(targetNodeType) == null ) {
-					String emsg = "The targetNodeType = [" + targetNodeType + "] is not defined in our graph. ";
-					System.out.println( emsg );
-					System.exit(1);
-				}
-			}
-			
-			// For each node that has this property, update the new from the old and then remove the 
-			// old property from that node
-			Iterable<TitanVertex> verts = null;
-			int vtxCount = 0;
-			String label;
-			long longId;
-			
-			int propertyCount;
-			
-			Iterator<VertexProperty<Object>> titanProperties = null;
-			
-			VertexProperty<Object> tmpProperty = null;
-			Object origVal;
-			Object targetVal;
-
-			if ( targetNodeType.equals("NA")) {
-				verts= graph.query().has(propName).vertices();
-				Iterator<TitanVertex> it = verts.iterator();
-
-				while( it.hasNext() ){
-					
-					TitanVertex tmpVtx = (TitanVertex)it.next();
-					String tmpVid = tmpVtx.id().toString();
-					
-					origVal = tmpVtx.<Object>property(propName).orElse(null);
-					targetVal = tmpVtx.<Object>property(targetPropName).orElse(null);
-						
-					label = tmpVtx.label();
-					longId = tmpVtx.longId();
-					
-					if ( targetVal != null ) {
-						System.out.println( "vertex [" + label + "] id " + tmpVid + " has " + targetPropName + 
-							" with value " + targetVal + ", skip adding with value " + origVal);
-						continue;
-					}
-					vtxCount++;
-					titanProperties = tmpVtx.properties(); // current properties
-					
-					propertyCount = 0;
-					
-					while( titanProperties.hasNext() ){
-						
-						tmpProperty = titanProperties.next(); 
-
-						if ( propertyCount == 0 )
-							System.out.print( "adding to [" + label + "] vertex id " + tmpVid + " with existing properties " +
-								tmpProperty.toString() );
-						else
-							System.out.print(", " + tmpProperty.toString());
-						++propertyCount;
-					}
-					
-					if ( propertyCount > 0 ) {
-						System.out.println("");
-
-						tmpVtx.property(targetPropName,origVal);					
-						System.out.println("INFO -- just did the add using " + longId +
-								" with label " + label + "] and updated it with the orig value (" +
-								origVal.toString() + ")");
-						titanProperties = tmpVtx.properties(); // current properties
-						propertyCount = 0;
-	
-						
-						while( titanProperties.hasNext() ){
-							tmpProperty = titanProperties.next(); 
-							if ( propertyCount == 0 )
-								System.out.print( "new property list for [" + label + "] vertex id " + tmpVid + " with existing properties " +
-									tmpProperty.toString() );
-							else
-								System.out.print(", " + tmpProperty.toString());
-							++propertyCount;
-						}
-						
-						if ( propertyCount > 0 )
-							System.out.println("");
-					}
-				}
-			} else {
-				// targetNodeType is NA
-
-                verts= graph.query().has("aai-node-type", targetNodeType).vertices();
-                if( verts != null ){
-                      // We did find some matching vertices
-                	Iterator <?> it = verts.iterator();
-                	Object propVal;
-                	while( it.hasNext() ){
-                		TitanVertex v = (TitanVertex)it.next();
-     	  				label = v.label();
-    	  				longId = v.longId();
-    					targetVal = v.<Object>property(targetPropName).orElse(null);
-    					origVal = v.<Object>property(propName).orElse(null);
-    					
-    					if ( origVal == null)
-    						continue;
-    					
-    					if ( targetVal != null ) {
-    						System.out.println( "vertex  [" + label + "] id " + longId + " has " + targetPropName + 
-    							" with value " + targetVal + ", skip adding with value " + origVal);
-    						continue;
-    					}
-    					titanProperties = v.properties(); // current properties
-    					propertyCount = 0;
-                         if ( v.<Object>property(propName).orElse(null) != null ) {
-                               propVal = v.<Object>property(propName).orElse(null);
-                                v.property(targetPropName, propVal);
-                               ++vtxCount;
-           					while( titanProperties.hasNext() ){
-        						
-        						tmpProperty = titanProperties.next(); 
-        						if ( propertyCount == 0 )
-        							System.out.print( "adding to vertex id " + longId + " with existing properties " +
-        								tmpProperty.toString() );
-        						else
-        							System.out.print(", " + tmpProperty.toString());
-        						++propertyCount;
-        					}
-        					
-        					if ( propertyCount > 0 )
-        						System.out.println("");
-           					System.out.println("INFO -- just did the add target [" + targetNodeType + "] using " + longId +
-        							" with label " + label + "] and updated it with the orig value (" +
-        							propVal.toString() + ")");
-           					propertyCount = 0;
-           					while( titanProperties.hasNext() ){
-        						
-        						tmpProperty = titanProperties.next(); 
-        						if ( propertyCount == 0 )
-        							System.out.print( "new property list for vertex [" + label + "] id " + longId + " with existing properties " +
-        								tmpProperty.toString() );
-        						else
-        							System.out.print(", " + tmpProperty.toString());
-        						++propertyCount;
-        					}
-        					
-        					if ( propertyCount > 0 )
-        						System.out.println("");
-                         }
-                	}
-                }
-
-			}
-			
-			System.out.println("added properties data for " + vtxCount + " vertexes.  noCommit " + noCommit);
-			if ( !noCommit )
-				graph.tx().commit();
-		}
-	    catch (Exception ex) {
-	    	System.out.print("Threw a regular Exception:\n");
-	    	System.out.println(ex.getMessage());
-	    }
-	    finally {
-	    	if( graphMgt != null && graphMgt.isOpen() ){
-	  	    	// Any changes that worked correctly should have already done their commits.
-	  	    	graphMgt.rollback();
-	  	    }
-	    	if( graph != null ){
-	  	    	// Any changes that worked correctly should have already done their commits.
-	  	    	graph.tx().rollback();
-	  		    graph.close();
-	  	    }
-	    }
-	   
-	    System.exit(0);
-	    
-	}// End of main()
-	
-
-}
-
-
diff --git a/aai-resources/src/main/java/org/openecomp/aai/util/GenerateMethodMapper.java b/aai-resources/src/main/java/org/openecomp/aai/util/GenerateMethodMapper.java
deleted file mode 100644
index dd72530..0000000
--- a/aai-resources/src/main/java/org/openecomp/aai/util/GenerateMethodMapper.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.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=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import org.openecomp.aai.audit.ListEndpoints;
-import org.openecomp.aai.introspection.Version;
-
-public class GenerateMethodMapper {
-
-	private final static String filePath = "bundleconfig-local/etc/appprops/methodMapper.properties";
-
-	/**
-	 * The main method.
-	 *
-	 * @param args the arguments
-	 * @throws Exception the exception
-	 */
-	public static void main(String[] args) throws Exception {
-
-		ListEndpoints le = null;
-		JSONObject jo = new JSONObject();
-		JSONArray ja = new JSONArray();
-
-		for (Version version : Version.values()) {
-
-			le = new ListEndpoints(version);
-			Map<String, String> ln = le.getLogicalNames();
-			List<String> keys = new ArrayList<String>(ln.keySet());
-			Collections.sort(keys);
-			for (String key : keys) {
-				addEndpointToJsonArray(key, ln.get(key), ja, version.toString());
-			}
-
-		}
-
-		addUniqueEndpoints(ja);
-
-		jo.put("ActiveAndAvailableInventory-CloudNetwork", ja);
-		try (FileWriter file = new FileWriter(filePath)) {
-			file.write(jo.toString(4));
-		}
-
-		System.exit(0);
-
-	}
-
-	/**
-	 * Adds the unique endpoints.
-	 *
-	 * @param ja the ja
-	 * @throws JSONException the JSON exception
-	 */
-	private static void addUniqueEndpoints(JSONArray ja) throws JSONException {
-		JSONObject joItem = new JSONObject();
-		joItem.put("url", "/aai/{version}/service-design-and-creation/models*");
-		joItem.put("method", "get");
-		joItem.put("logicalName", "GetModel");
-		ja.put(joItem);
-		joItem = new JSONObject();
-		joItem.put("url", "/aai/{version}/service-design-and-creation/models*");
-		joItem.put("method", "put");
-		joItem.put("logicalName", "PutModel");
-		ja.put(joItem);
-		joItem = new JSONObject();
-		joItem.put("url", "/aai/{version}/service-design-and-creation/models*");
-		joItem.put("method", "delete");
-		joItem.put("logicalName", "DeleteModel");
-		ja.put(joItem);
-		joItem = new JSONObject();
-		joItem.put("url", "/aai/{version}/service-design-and-creation/named-queries/*");
-		joItem.put("method", "get");
-		joItem.put("logicalName", "GetNamedQuery");
-		ja.put(joItem);
-	}
-
-	/**
-	 * Adds the endpoint to json array.
-	 *
-	 * @param url the url
-	 * @param name the name
-	 * @param ja the ja
-	 * @param apiVersion the api version
-	 * @throws JSONException the JSON exception
-	 */
-	private static void addEndpointToJsonArray(String url, String name, JSONArray ja, String apiVersion)
-			throws JSONException {
-
-		JSONObject joGet = new JSONObject();
-		JSONObject joPut = new JSONObject();
-		JSONObject joDel = new JSONObject();
-
-		if (!url.endsWith("relationship")) {
-			joGet.put("url", url);
-			joGet.put("method", "get");
-			joGet.put("logicalName", apiVersion + "Get" + name);
-			ja.put(joGet);
-		}
-
-		if (url.endsWith("}") || url.endsWith("relationship")) {
-			joPut.put("url", url);
-			joPut.put("method", "put");
-			joPut.put("logicalName", apiVersion + "Put" + name);
-			ja.put(joPut);
-
-			joDel.put("url", url);
-			joDel.put("method", "delete");
-			joDel.put("logicalName", apiVersion + "Delete" + name);
-			ja.put(joDel);
-
-		}
-
-	}
-
-}
diff --git a/aai-resources/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java b/aai-resources/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
deleted file mode 100644
index 000ebd0..0000000
--- a/aai-resources/src/main/java/org/openecomp/aai/util/HttpsAuthClient.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.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=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import java.io.FileInputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-
-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 org.openecomp.aai.domain.yang.Customers;
-import org.openecomp.aai.exceptions.AAIException;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
-import com.sun.jersey.api.client.filter.LoggingFilter;
-import com.sun.jersey.api.json.JSONConfiguration;
-import com.sun.jersey.client.urlconnection.HTTPSProperties;
-
-import static java.util.Base64.getEncoder;
-
-public class HttpsAuthClient{
-
-	/**
-	 * The main method.
-	 *
-	 * @param args the arguments
-	 */
-	public static void main(String[] args) {
-		try {
-			String url = AAIConfig.get(AAIConstants.AAI_SERVER_URL) + "business/customers";
-			System.out.println("Making Jersey https call...");
-			Client client = HttpsAuthClient.getTwoWaySSLClient();
-		
-			ClientResponse res = client.resource(url)
-					.accept("application/json")
-					.header("X-TransactionId", "PROV001")
-					.header("X-FromAppId",  "AAI")
-					.type("application/json")
-					.get(ClientResponse.class);
-			
-//			System.out.println("Jersey result: ");
-//			System.out.println(res.getEntity(String.class).toString());
-			
-			Customers customers = res.getEntity(Customers.class);
-			System.out.println("Jersey result: ");
-			System.out.println("Number of customers: " + customers.getCustomer().size());	
-			
-		} catch (KeyManagementException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	
-	/**
-	 * Gets the client.
-	 *
-	 * @return the client
-	 * @throws KeyManagementException the key management exception
-	 */
-	public static Client getTwoWaySSLClient() throws KeyManagementException {
-		
-		ClientConfig config = new DefaultClientConfig();
-		config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
-		config.getClasses().add(org.openecomp.aai.restcore.CustomJacksonJaxBJsonProvider.class);
-	
-		SSLContext ctx = null;
-		try {
-			String truststore_path = AAIConstants.AAI_HOME_ETC_AUTH + AAIConfig.get(AAIConstants.AAI_TRUSTSTORE_FILENAME);
-			String truststore_password = AAIConfig.get(AAIConstants.AAI_TRUSTSTORE_PASSWD);
-			String keystore_path = AAIConstants.AAI_HOME_ETC_AUTH + AAIConfig.get(AAIConstants.AAI_KEYSTORE_FILENAME);
-			String keystore_password = AAIConfig.get(AAIConstants.AAI_KEYSTORE_PASSWD);
-
-		    System.setProperty("javax.net.ssl.trustStore", truststore_path);
-		    System.setProperty("javax.net.ssl.trustStorePassword", truststore_password);
-			HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
-			    public boolean verify(String string,SSLSession ssls) {
-			        return true;
-			    }
-			});
-						
-			ctx = SSLContext.getInstance("TLSv1.2");
-			KeyManagerFactory kmf = null;
-			try {
-				kmf = KeyManagerFactory.getInstance("SunX509");
-				FileInputStream fin = new FileInputStream(keystore_path);
-				KeyStore ks = KeyStore.getInstance("PKCS12");
-				char[] pwd = keystore_password.toCharArray();
-				ks.load(fin, pwd);
-				kmf.init(ks, pwd);
-			} catch (Exception e) {
-				System.out.println("Error setting up kmf: exiting");
-				e.printStackTrace();
-				System.exit(1);
-			}
-
-			ctx.init(kmf.getKeyManagers(), null, null);
-			config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES, 
-										new HTTPSProperties( new HostnameVerifier() {
-				@Override
-				public boolean verify( String s, SSLSession sslSession ) {
-					return true;
-				}
-			}, ctx));
-		} catch (Exception e) {
-			System.out.println("Error setting up config: exiting");
-			e.printStackTrace();
-			System.exit(1);
-		}
-			
-		Client client = Client.create(config);
-		// uncomment this line to get more logging for the request/response
-		// client.addFilter(new LoggingFilter(System.out));
-		
-		return client;
-	}
-	
-    public static Client getBasicAuthClient() throws AAIException {
-
-        String truststore_path = AAIConstants.AAI_HOME_ETC_AUTH + AAIConfig.get(AAIConstants.AAI_TRUSTSTORE_FILENAME);
-        System.setProperty("javax.net.ssl.trustStore", truststore_path);
-
-        javax.net.ssl.HttpsURLConnection.setDefaultHostnameVerifier(new javax.net.ssl.HostnameVerifier() {
-            public boolean verify(String hostname, javax.net.ssl.SSLSession sslSession) {
-                return true;
-            }
-        });
-
-        String userName = AAIConfig.get("aai.tools.username");
-        String password = AAIConfig.get("aai.tools.password");
-    //  ClientConfig config = new DefaultClientConfig();
-        Client client = Client.create();
-	//client.addFilter(new HTTPBasicAuthFilter(userName, password));
-
-
-
-
-        return client;
-    }
-
-    public static String getBasicAuthHeaderValue() throws AAIException {
-
-
-        String userName = AAIConfig.get("aai.tools.username", "");
-        String password = AAIConfig.get("aai.tools.password", "");
-        String authString = userName + ":" + password;
-        byte[] s = getEncoder().encode(authString.getBytes());
-        String basicauthStringEnc = new String(s);
-
-        return "Basic " + basicauthStringEnc;
-
-    }
-
-
-	public static Client getClient() throws KeyManagementException {
-
-		ClientConfig config = new DefaultClientConfig();
-		config.getFeatures().put(JSONConfiguration.FEATURE_POJO_MAPPING, Boolean.TRUE);
-		config.getClasses().add(org.openecomp.aai.restcore.CustomJacksonJaxBJsonProvider.class);
-
-		SSLContext ctx = null;
-		try {
-			String truststore_path = AAIConstants.AAI_HOME_ETC_AUTH + AAIConfig.get(AAIConstants.AAI_TRUSTSTORE_FILENAME);
-			String truststore_password = AAIConfig.get(AAIConstants.AAI_TRUSTSTORE_PASSWD);
-			String keystore_path = AAIConstants.AAI_HOME_ETC_AUTH + AAIConfig.get(AAIConstants.AAI_KEYSTORE_FILENAME);
-			String keystore_password = AAIConfig.get(AAIConstants.AAI_KEYSTORE_PASSWD);
-
-			System.setProperty("javax.net.ssl.trustStore", truststore_path);
-			System.setProperty("javax.net.ssl.trustStorePassword", truststore_password);
-			HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
-				public boolean verify(String string,SSLSession ssls) {
-					return true;
-				}
-			});
-
-			ctx = SSLContext.getInstance("TLSv1.2");
-			KeyManagerFactory kmf = null;
-			try {
-				kmf = KeyManagerFactory.getInstance("SunX509");
-				FileInputStream fin = new FileInputStream(keystore_path);
-				KeyStore ks = KeyStore.getInstance("PKCS12");
-				char[] pwd = keystore_password.toCharArray();
-				ks.load(fin, pwd);
-				kmf.init(ks, pwd);
-			} catch (Exception e) {
-				System.out.println("Error setting up kmf: exiting");
-				e.printStackTrace();
-				System.exit(1);
-			}
-
-			ctx.init(kmf.getKeyManagers(), null, null);
-			config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES,
-					new HTTPSProperties( new HostnameVerifier() {
-						@Override
-						public boolean verify( String s, SSLSession sslSession ) {
-							return true;
-						}
-					}, ctx));
-		} catch (Exception e) {
-			System.out.println("Error setting up config: exiting");
-			e.printStackTrace();
-			System.exit(1);
-		}
-
-		Client client = Client.create(config);
-		// uncomment this line to get more logging for the request/response
-		// client.addFilter(new LoggingFilter(System.out));
-
-		return client;
-	}
-
-}  
diff --git a/aai-resources/src/test/java/org/openecomp/aai/AAISetup.java b/aai-resources/src/test/java/org/openecomp/aai/AAISetup.java
new file mode 100644
index 0000000..0f2480d
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/AAISetup.java
@@ -0,0 +1,37 @@
+package org.openecomp.aai;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.BeforeClass;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.introspection.ModelInjestor;
+import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper;
+import org.openecomp.aai.util.AAIConstants;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.junit.Assert.assertNotNull;
+
+public abstract class AAISetup {
+
+    @BeforeClass
+    public static void setupBundleconfig() throws Exception {
+        System.setProperty("AJSC_HOME", ".");
+        System.setProperty("BUNDLECONFIG_DIR", "src/test/resources/bundleconfig-local");
+        QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"),
+                "src/test/resources/bundleconfig-local/etc/oxm/");
+    }
+
+    public String getPayload(String filename) throws IOException {
+
+        InputStream inputStream = getClass()
+                .getClassLoader()
+                .getResourceAsStream(filename);
+
+        String message = String.format("Unable to find the %s in src/test/resources", filename);
+        assertNotNull(message, inputStream);
+
+        String resource = IOUtils.toString(inputStream);
+        return resource;
+    }
+}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptorTest.java b/aai-resources/src/test/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptorTest.java
new file mode 100644
index 0000000..a61feba
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/interceptors/AAILogJAXRSInInterceptorTest.java
@@ -0,0 +1,39 @@
+package org.openecomp.aai.interceptors;
+
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.ExchangeImpl;
+import org.apache.cxf.message.Message;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.aai.AAISetup;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class AAILogJAXRSInInterceptorTest extends AAISetup {
+
+    private AAILogJAXRSInInterceptor aaiLogJAXRSInInterceptor;
+
+    @Before
+    public void setup(){
+        aaiLogJAXRSInInterceptor = new AAILogJAXRSInInterceptor();
+    }
+
+    @Test
+    public void testHandleMessageWhenNotCamelRequest() throws IOException {
+
+        Message message = mock(Message.class);
+        Exchange exchange = new ExchangeImpl();
+        InputStream is = getClass().getClassLoader().getResourceAsStream("logback.xml");
+
+        when(message.getExchange()).thenReturn(exchange);
+        when(message.getContent(InputStream.class)).thenReturn(is);
+
+//        when(message.get(Message.QUERY_STRING)).thenReturn("/somestring");
+        when(message.get("CamelHttpUrl")).thenReturn("/somestring");
+        aaiLogJAXRSInInterceptor.handleMessage(message);
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/interceptors/PostAaiAjscInterceptorTest.java b/aai-resources/src/test/java/org/openecomp/aai/interceptors/PostAaiAjscInterceptorTest.java
new file mode 100644
index 0000000..dc6879d
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/interceptors/PostAaiAjscInterceptorTest.java
@@ -0,0 +1,53 @@
+package org.openecomp.aai.interceptors;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.logging.LoggingContext;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class PostAaiAjscInterceptorTest {
+
+    private PostAaiAjscInterceptor postAaiAjscInterceptor;
+
+    @Before
+    public void setup(){
+        postAaiAjscInterceptor = new PostAaiAjscInterceptor();
+    }
+
+    @Test
+    public void getInstance() throws Exception {
+        PostAaiAjscInterceptor interceptor = PostAaiAjscInterceptor.getInstance();
+        assertNotNull(interceptor);
+    }
+
+    @Test
+    public void testAllowOrRejectIfSuccess() throws Exception {
+
+        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+
+        LoggingContext.put(LoggingContext.LoggingField.RESPONSE_CODE.toString(), "SUCCESS");
+        Mockito.when(request.getRequestURL()).thenReturn(new StringBuffer("/fadsjoifj"));
+
+        boolean success = postAaiAjscInterceptor.allowOrReject(request, null, null);
+
+        assertTrue("Expecting the post interceptor to return success regardless", success);
+    }
+
+    @Test
+    public void testAllowOrRejectIfFailure() throws Exception {
+
+        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+
+        LoggingContext.put(LoggingContext.LoggingField.RESPONSE_CODE.toString(), "ERR.");
+        Mockito.when(request.getRequestURL()).thenReturn(new StringBuffer("/fadsjoifj"));
+
+        boolean success = postAaiAjscInterceptor.allowOrReject(request, null, null);
+
+        assertTrue("Expecting the post interceptor to return success regardless", success);
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/interceptors/PreAaiAjscInterceptorTest.java b/aai-resources/src/test/java/org/openecomp/aai/interceptors/PreAaiAjscInterceptorTest.java
new file mode 100644
index 0000000..5debe72
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/interceptors/PreAaiAjscInterceptorTest.java
@@ -0,0 +1,41 @@
+package org.openecomp.aai.interceptors;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import javax.servlet.http.HttpServletRequest;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.anyString;
+
+public class PreAaiAjscInterceptorTest {
+
+    private PreAaiAjscInterceptor preAaiAjscInterceptor;
+
+    @Before
+    public void setup(){
+        preAaiAjscInterceptor = new PreAaiAjscInterceptor();
+    }
+
+    @Test
+    public void getInstance() throws Exception {
+        PreAaiAjscInterceptor interceptor = PreAaiAjscInterceptor.getInstance();
+        assertNotNull(interceptor);
+    }
+
+    @Test
+    public void testAllowOrRejectIfSuccess() throws Exception {
+
+        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
+
+        Mockito.when(request.getRequestURI()).thenReturn("/fadsjoifj");
+        Mockito.when(request.getHeader(anyString())).thenReturn("JUNIT-Test");
+        Mockito.when(request.getMethod()).thenReturn("GET");
+
+        boolean success = preAaiAjscInterceptor.allowOrReject(request, null, null);
+
+        assertTrue("Expecting the post interceptor to return success regardless", success);
+    }
+
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/migration/VertexMergeTest.java b/aai-resources/src/test/java/org/openecomp/aai/migration/VertexMergeTest.java
index 5b71cf7..71e3827 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/migration/VertexMergeTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/migration/VertexMergeTest.java
@@ -20,26 +20,15 @@
 
 package org.openecomp.aai.migration;
 
-import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
+import com.thinkaurelius.titan.core.Cardinality;
+import com.thinkaurelius.titan.core.TitanFactory;
+import com.thinkaurelius.titan.core.TitanGraph;
+import com.thinkaurelius.titan.core.schema.TitanManagement;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
+import org.openecomp.aai.AAISetup;
 import org.openecomp.aai.db.props.AAIProperties;
 import org.openecomp.aai.dbmap.DBConnectionType;
 import org.openecomp.aai.introspection.Loader;
@@ -51,36 +40,36 @@ import org.openecomp.aai.serialization.db.EdgeRules;
 import org.openecomp.aai.serialization.engines.QueryStyle;
 import org.openecomp.aai.serialization.engines.TitanDBEngine;
 import org.openecomp.aai.serialization.engines.TransactionalGraphEngine;
-import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper;
-import org.openecomp.aai.util.AAIConstants;
 
-import com.thinkaurelius.titan.core.Cardinality;
-import com.thinkaurelius.titan.core.TitanFactory;
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.schema.TitanManagement;
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+
+import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 @Ignore
-public class VertexMergeTest {
+public class VertexMergeTest extends AAISetup {
 	
 	
 	private final static Version version = Version.v10;
 	private final static ModelType introspectorFactoryType = ModelType.MOXY;
 	private final static QueryStyle queryStyle = QueryStyle.TRAVERSAL;
 	private final static DBConnectionType type = DBConnectionType.REALTIME;
-	private static Loader loader;
-	private static TransactionalGraphEngine dbEngine;
-	private static TitanGraph graph;
-	private static EdgeRules rules;
-	private static GraphTraversalSource g;
-	private static Graph tx;
-	@BeforeClass
-	public static void setUp() throws NoSuchFieldException, SecurityException, Exception {
+	private Loader loader;
+	private TransactionalGraphEngine dbEngine;
+	private TitanGraph graph;
+	private EdgeRules rules;
+	private GraphTraversalSource g;
+	private Graph tx;
+
+	@Before
+	public void setUp() throws Exception {
 		graph = TitanFactory.build().set("storage.backend","inmemory").open();
 		tx = graph.newTransaction();
 		g = tx.traversal();
-		System.setProperty("AJSC_HOME", ".");
-		System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local");
-		QueryFormatTestHelper.setFinalStatic(AAIConstants.class.getField("AAI_HOME_ETC_OXM"), "src/test/resources/org/openecomp/aai/introspection/");
 		loader = LoaderFactory.createLoaderForVersion(introspectorFactoryType, version);
 		dbEngine = new TitanDBEngine(
 				queryStyle,
@@ -164,8 +153,9 @@ public class VertexMergeTest {
 		VertexMerge merge = new VertexMerge.Builder(loader, spy, serializer).build();
 		merge.performMerge(pserverCanopi, pserverSkeleton, forceCopy);
 	}
-	@AfterClass
-	public static void cleanUp() {
+
+	@After
+	public void cleanUp() {
 		tx.tx().rollback();
 		graph.close();
 	}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/BulkAddConsumerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/BulkAddConsumerTest.java
new file mode 100644
index 0000000..2804566
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/BulkAddConsumerTest.java
@@ -0,0 +1,168 @@
+package org.openecomp.aai.rest;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.apache.commons.io.IOUtils;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.AAISetup;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.introspection.ModelInjestor;
+import org.openecomp.aai.introspection.Version;
+
+import javax.ws.rs.core.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+public class BulkAddConsumerTest extends AAISetup {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    protected static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    protected BulkConsumer bulkConsumer;
+
+    protected HttpHeaders httpHeaders;
+
+    protected UriInfo uriInfo;
+
+    protected MultivaluedMap<String, String> headersMultiMap;
+    protected MultivaluedMap<String, String> queryParameters;
+
+    protected List<String> aaiRequestContextList;
+
+    protected List<MediaType> outputMediaTypes;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(BulkAddConsumerTest.class.getName());
+
+    @BeforeClass
+    public static void setupRest(){
+        AAIGraph.getInstance();
+        ModelInjestor.getInstance();
+    }
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        bulkConsumer     = getConsumer();
+        httpHeaders         = Mockito.mock(HttpHeaders.class);
+        uriInfo             = Mockito.mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+
+    @Test
+    public void testBulkAdd() throws IOException {
+
+        String uri = "/aai/v11/bulkadd";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = getBulkPayload("pserver-transactions");
+        Response response = bulkConsumer.bulkAdd(
+                payload,
+                Version.getLatest().toString(),
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        System.out.println("Code: " + response.getStatus() + "\tResponse: " + response.getEntity());
+        assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+    }
+
+    @Test
+    public void testBulkAddThrowExceptionWhenPayloadContainsNoTransactions(){
+
+        String uri = "/aai/v11/bulkadd";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = "{\"transactions\":[]}";
+        Response response = bulkConsumer.bulkAdd(
+                payload,
+                Version.getLatest().toString(),
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        System.out.println("Code: " + response.getStatus() + "\tResponse: " + response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+    }
+
+    @Test
+    public void testBulkAddThrowExceptionWhenInvalidJson() throws IOException {
+
+        String uri = "/aai/v11/bulkadd";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = "{";
+        Response response = bulkConsumer.bulkAdd(
+                payload,
+                Version.getLatest().toString(),
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        System.out.println("Code: " + response.getStatus() + "\tResponse: " + response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+
+        // TODO - Verify the result output and check if it contains an 400 in the list
+    }
+
+    public String getBulkPayload(String bulkName) throws IOException {
+        return getPayload("payloads/bulk/" + bulkName + ".json");
+    }
+
+    public BulkConsumer getConsumer(){
+        return new BulkAddConsumer();
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/BulkProcessConsumerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/BulkProcessConsumerTest.java
new file mode 100644
index 0000000..64639d4
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/BulkProcessConsumerTest.java
@@ -0,0 +1,54 @@
+package org.openecomp.aai.rest;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.apache.commons.io.IOUtils;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.AAISetup;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.introspection.ModelInjestor;
+import org.openecomp.aai.introspection.Version;
+
+import javax.ws.rs.core.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+public class BulkProcessConsumerTest extends BulkAddConsumerTest {
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(BulkProcessConsumerTest.class.getName());
+
+    @Test
+    public void testBulkAddCreatedWhenOneTransactionInPayloadContainsNotAllowedVerb() throws IOException {
+
+        String uri = "/aai/v11/bulkadd";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String payload = getBulkPayload("pserver-transactions-invalid");
+        Response response = bulkConsumer.bulkAdd(
+                payload,
+                Version.getLatest().toString(),
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        System.out.println("Code: " + response.getStatus() + "\tResponse: " + response.getEntity());
+        assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+    }
+
+    @Override
+    public BulkConsumer getConsumer(){
+        return new BulkProcessConsumer();
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/ExampleConsumerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/ExampleConsumerTest.java
new file mode 100644
index 0000000..28d5527
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/ExampleConsumerTest.java
@@ -0,0 +1,131 @@
+package org.openecomp.aai.rest;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.AAISetup;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.introspection.ModelInjestor;
+import org.openecomp.aai.introspection.Version;
+
+import javax.ws.rs.core.*;
+
+import java.util.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+public class ExampleConsumerTest extends AAISetup {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    private static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    private ExampleConsumer exampleConsumer;
+
+    private HttpHeaders httpHeaders;
+
+    private UriInfo uriInfo;
+
+    private MultivaluedMap<String, String> headersMultiMap;
+    private MultivaluedMap<String, String> queryParameters;
+
+    private List<String> aaiRequestContextList;
+
+    private List<MediaType> outputMediaTypes;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(LegacyMoxyConsumerTest.class.getName());
+
+    @BeforeClass
+    public static void setupRest(){
+        AAIGraph.getInstance();
+        ModelInjestor.getInstance();
+    }
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        exampleConsumer  = new ExampleConsumer();
+        httpHeaders         = Mockito.mock(HttpHeaders.class);
+        uriInfo             = Mockito.mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+
+    @Test
+    public void testGetExampleRespondsWithOkStatusForValidObject(){
+
+        Response response = exampleConsumer.getExample(
+                Version.getLatest().toString(),
+                "pserver",
+                httpHeaders,
+                uriInfo,
+                null);
+
+        assertNotNull("Response from the example consumer returned null", response);
+
+        int code = Response.Status.OK.getStatusCode();
+
+        assertEquals(response.getStatus(), code);
+    }
+
+    @Test
+    public void testGetExampleFailureForInvalidObject(){
+
+        when(uriInfo.getPath()).thenReturn("examples/fakeObject");
+        when(uriInfo.getPath(false)).thenReturn("examples/fakeObject");
+
+        Response response = exampleConsumer.getExample(
+                Version.getLatest().toString(),
+                "testRandomCrazyObject",
+                httpHeaders,
+                uriInfo,
+                null);
+
+        assertNotNull("Response from the example consumer returned null", response);
+
+        int code = Response.Status.BAD_REQUEST.getStatusCode();
+
+        assertEquals(response.getStatus(), code);
+    }
+
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/ExceptionHandlerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/ExceptionHandlerTest.java
new file mode 100644
index 0000000..2c47a2e
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/ExceptionHandlerTest.java
@@ -0,0 +1,138 @@
+package org.openecomp.aai.rest;
+
+import com.fasterxml.jackson.core.JsonLocation;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.sun.istack.SAXParseException2;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.openecomp.aai.AAISetup;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.Response;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class ExceptionHandlerTest extends AAISetup {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    @Mock
+    private HttpHeaders httpHeaders;
+
+    @Mock
+    private HttpServletRequest request;
+
+    @InjectMocks
+    private ExceptionHandler handler = new ExceptionHandler();
+
+    @Before
+    public void setup(){
+        MockitoAnnotations.initMocks(this);
+
+        MultivaluedHashMap headersMultiMap     = new MultivaluedHashMap<>();
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        List<MediaType> outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+    }
+
+    @Test
+    public void testConversionOfWebApplicationResponse() throws Exception {
+
+        Exception exception = new WebApplicationException();
+        Response response = handler.toResponse(exception);
+
+        assertNotNull(response);
+        assertNull(response.getEntity());
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),  response.getStatus());
+    }
+
+    @Test
+    public void testConversionOfWebApplicationResponseWhenUmarshalExceptionResultBadRequest() throws Exception {
+
+        SAXParseException2 mockSaxParseException = mock(SAXParseException2.class);
+        Exception exception = new WebApplicationException(mockSaxParseException);
+        Response response = handler.toResponse(exception);
+
+        assertNotNull(response);
+        assertNotNull(response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(),  response.getStatus());
+    }
+
+    @Test
+    public void testConversionWhenJsonParseExceptionResultBadRequest() throws Exception {
+
+        JsonLocation jsonLocation = mock(JsonLocation.class);
+        Exception exception = new JsonParseException("", jsonLocation);
+        Response response = handler.toResponse(exception);
+
+        assertNotNull(response);
+        assertNotNull(response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(),  response.getStatus());
+    }
+
+    @Test
+    public void testConversionWhenJsonMappingExceptionResultBadRequest() throws Exception {
+
+        JsonLocation jsonLocation = mock(JsonLocation.class);
+        Exception exception = new JsonMappingException("", jsonLocation);
+        Response response = handler.toResponse(exception);
+
+        assertNotNull(response);
+        assertNotNull(response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(),  response.getStatus());
+    }
+
+    @Test
+    public void testConversionWhenUnknownExceptionResultBadRequest() throws Exception {
+
+        Exception exception = mock(Exception.class);
+        Response response = handler.toResponse(exception);
+
+        when(request.getMethod()).thenReturn("GET");
+
+        assertNotNull(response);
+        assertNotNull(response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(),  response.getStatus());
+
+
+    }
+
+    @Test
+    public void testConversionWhenUnknownExceptionResultBadRequestForXmlResponseType() throws Exception {
+
+        List<MediaType> outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(MediaType.valueOf("application/xml"));
+        when(request.getMethod()).thenReturn("GET");
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+
+        Exception exception = mock(Exception.class);
+        Response response = handler.toResponse(exception);
+
+        assertNotNull(response);
+        assertNotNull(response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(),  response.getStatus());
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/LegacyMoxyConsumerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/LegacyMoxyConsumerTest.java
new file mode 100644
index 0000000..1620f3e
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/LegacyMoxyConsumerTest.java
@@ -0,0 +1,617 @@
+package org.openecomp.aai.rest;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.AAISetup;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.exceptions.AAIException;
+import org.openecomp.aai.introspection.ModelInjestor;
+import org.openecomp.aai.introspection.Version;
+import org.skyscreamer.jsonassert.JSONAssert;
+
+import javax.ws.rs.core.*;
+import java.io.IOException;
+import java.util.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+public class LegacyMoxyConsumerTest extends AAISetup {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    private static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    private LegacyMoxyConsumer legacyMoxyConsumer;
+
+    private HttpHeaders httpHeaders;
+
+    private UriInfo uriInfo;
+
+    private MultivaluedMap<String, String> headersMultiMap;
+    private MultivaluedMap<String, String> queryParameters;
+
+    private List<String> aaiRequestContextList;
+
+    private List<MediaType> outputMediaTypes;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(LegacyMoxyConsumerTest.class.getName());
+
+    @BeforeClass
+    public static void setupRest(){
+        AAIGraph.getInstance();
+        ModelInjestor.getInstance();
+    }
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        legacyMoxyConsumer  = new LegacyMoxyConsumer();
+        httpHeaders         = Mockito.mock(HttpHeaders.class);
+        uriInfo             = Mockito.mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+
+    @Test
+    public void testResponsePutGetDeleteOnResource() throws JSONException, IOException, AAIException {
+
+        String uri = getUri();
+        String payload = getResourcePayload(getObjectName());
+
+        assertNotNull("Introspector returned invalid string when marshalling the object", payload);
+        assertNotNull("Introspector failed to return a valid uri", uri);
+
+        if(uri.length() != 0 && uri.charAt(0) == '/'){
+            uri = uri.substring(1);
+        }
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        Response response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+
+        response = legacyMoxyConsumer.update(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        int code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+
+        assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+
+        queryParameters.add("depth", "10000");
+
+        response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "10000",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+
+        String pserverEntity        = response.getEntity().toString();
+        JSONObject pserverJsonbject = new JSONObject(pserverEntity);
+
+        assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+
+        JSONAssert.assertEquals(payload, pserverEntity, false);
+
+        String resourceVersion = pserverJsonbject.getString("resource-version");
+
+        queryParameters.add("resource-version", resourceVersion);
+
+        response = legacyMoxyConsumer.delete(
+                "v11",
+                uri,
+                httpHeaders,
+                uriInfo,
+                "",
+                null
+        );
+
+        code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+
+        assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus());
+
+        response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+    }
+
+    @Test
+    public void testPutPserverAndCloudRegionRelationship() throws IOException, JSONException {
+
+        String pserverData = getRelationshipPayload("pserver");
+        String complexData = getRelationshipPayload("complex");
+
+        String hostname = "590a8943-1200-43b3-825b-75dde6b8f44a";
+        String physicalLocationId ="e13d4587-19ad-4bf5-80f5-c021efb5b61c";
+
+        String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", hostname);
+        String cloudRegionUri = String.format("cloud-infrastructure/complexes/complex/%s", physicalLocationId);
+
+        doSetupResource(pserverUri, pserverData);
+        doSetupResource(cloudRegionUri, complexData);
+
+        String cloudToPserverRelationshipData = getRelationshipPayload("pserver-complex-relationship");
+        String cloudToPserverRelationshipUri = String.format(
+                "cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname);
+
+        Response response = legacyMoxyConsumer.updateRelationship(
+                cloudToPserverRelationshipData,
+                Version.getLatest().toString(),
+                cloudToPserverRelationshipUri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertNotNull("Response from the legacy moxy consumer returned null", response);
+        int code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+
+        assertEquals("Expected to return status created from the response",
+                Response.Status.OK.getStatusCode(), response.getStatus());
+        logger.info("Response Code: " + code + "\tEntity: " +  response.getEntity());
+
+        // TODO - Need to actually verify the relationship between pserver and cloud-region
+
+        response = legacyMoxyConsumer.deleteRelationship(
+                cloudToPserverRelationshipData,
+                Version.getLatest().toString(),
+                cloudToPserverRelationshipUri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+
+        assertEquals(Response.Status.NO_CONTENT.getStatusCode(), response.getStatus());
+    }
+
+    @Test
+    public void testPutPassWithEmptyData() throws JSONException {
+
+        String payload = "{}";
+        String pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", UUID.randomUUID().toString());
+
+        doSetupResource(pserverUri, payload);
+
+        payload = "";
+        pserverUri = String.format("cloud-infrastructure/pservers/pserver/%s", UUID.randomUUID().toString());
+        doSetupResource(pserverUri, payload);
+    }
+
+    @Test
+    public void testFailureWithInvalidUri() throws JSONException {
+
+        String payload = "{}";
+        String uri = "fake-infrastructure/pservers/pserver/fajsidj";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        Response response = legacyMoxyConsumer.update(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        int code = response.getStatus();
+        System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code);
+    }
+
+    @Test
+    public void testInvalidUriThrowRandomException() throws JSONException {
+
+        String payload = "{}";
+        String uri = "fake-infrastructure/pservers/pserver/fajsidj";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenThrow(new IllegalArgumentException());
+
+        Response response = legacyMoxyConsumer.update(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        int code = response.getStatus();
+        assertNotNull("Response from the legacy moxy consumer returned null", response);
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+        System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+
+        response = legacyMoxyConsumer.updateRelationship(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        code = response.getStatus();
+        assertNotNull("Response from the legacy moxy consumer returned null", response);
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+        System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+
+        response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertNotNull("Response from the legacy moxy consumer returned null", response);
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+
+        response = legacyMoxyConsumer.delete(
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                "",
+                null
+        );
+
+        code = response.getStatus();
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+
+        response = legacyMoxyConsumer.deleteRelationship(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+        code = response.getStatus();
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+    }
+
+    @Test
+    public void testInvalidUriContainingRelatedToShouldThrowAAIException() throws JSONException {
+
+        String payload = "{}";
+        String uri = "cloud-infrastructure/related-to/fsdf";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        Response response = legacyMoxyConsumer.update(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        int code = response.getStatus();
+        System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+
+        response = legacyMoxyConsumer.updateRelationship(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        code = response.getStatus();
+        System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+
+        response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertNotNull("Response from the legacy moxy consumer returned null", response);
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+
+        queryParameters.add("resource-version", "3434394839483");
+        response = legacyMoxyConsumer.delete(
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                "",
+                null
+        );
+
+        code = response.getStatus();
+        System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code);
+
+        response = legacyMoxyConsumer.deleteRelationship(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+        code = response.getStatus();
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), code);
+    }
+
+    @Test
+    @Ignore("Unable to test this method due to WRITE_BIGDECIMAL_AS_PLAIN error")
+    public void testPatchWithValidData() throws IOException {
+
+        String payload = getResourcePayload("pserver-patch-test");
+        String uri     = getUri("pserver-patch-test");
+
+        if(uri.length() != 0 && uri.charAt(0) == '/'){
+            uri = uri.substring(1);
+        }
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        Response response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+
+        response = legacyMoxyConsumer.update(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        int code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+
+        assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+
+        String patchData = "{\"in-maint\": false}";
+
+        headersMultiMap.add("Content-Type", "application/json");
+
+        outputMediaTypes.remove(APPLICATION_JSON);
+        outputMediaTypes.add(MediaType.valueOf("application/merge-patch+json"));
+
+        response = legacyMoxyConsumer.patch(
+                patchData,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        code = response.getStatus();
+        assertNotNull("Response from the patch returned null", response);
+        System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        assertEquals(Response.Status.OK.getStatusCode(), code);
+
+    }
+
+    protected void doSetupResource(String uri, String payload) throws JSONException {
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        Response response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertNotNull("Response from the legacy moxy consumer returned null", response);
+        assertEquals("Expected to not have the data already in memory",
+                Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+
+        response = legacyMoxyConsumer.update(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertNotNull("Response from the legacy moxy consumer returned null", response);
+        int code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+        assertEquals("Expected to return status created from the response",
+                Response.Status.CREATED.getStatusCode(), response.getStatus());
+
+        queryParameters.add("depth", "10000");
+        response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertNotNull("Response from the legacy moxy consumer returned null", response);
+        assertEquals("Expected to return the pserver data that was just put in memory",
+                Response.Status.OK.getStatusCode(), response.getStatus());
+
+        if("".equalsIgnoreCase(payload)){
+            payload = "{}";
+        }
+
+        JSONAssert.assertEquals(payload, response.getEntity().toString(), false);
+    }
+
+    @Test
+    public void testDeleteRelationshipThrowsException(){
+
+        String payload = "";
+        String hostname = "testData";
+        String uri = String.format("cloud-infrastructure/pservers/pserver/%s/relationship-list/relationship", hostname);
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        Response response = legacyMoxyConsumer.deleteRelationship(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        int code = response.getStatus();
+        System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), code);
+    }
+
+    // TODO - Change this to be abstract and inheritable
+    public String getObjectName(){
+        return "pserver";
+    }
+
+    public String getResourcePayload(String resourceName) throws IOException {
+        return getPayload("payloads/resource/" + resourceName + ".json");
+    }
+
+    public String getRelationshipPayload(String relationshipName) throws IOException {
+        return getPayload("payloads/relationship/" + relationshipName + ".json");
+    }
+
+    public String getUri(String hostname){
+        return String.format("cloud-infrastructure/pservers/pserver/%s", hostname);
+    }
+
+    public String getUri(){
+        return getUri("pserver-hostname-test");
+    }
+}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/URLFromVertexIdConsumerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/URLFromVertexIdConsumerTest.java
new file mode 100644
index 0000000..5ba9ea6
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/URLFromVertexIdConsumerTest.java
@@ -0,0 +1,179 @@
+package org.openecomp.aai.rest;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.json.JSONException;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.AAISetup;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.exceptions.AAIException;
+import org.openecomp.aai.introspection.ModelInjestor;
+import org.openecomp.aai.introspection.Version;
+
+import javax.ws.rs.core.*;
+import java.io.IOException;
+import java.util.*;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+public class URLFromVertexIdConsumerTest extends AAISetup {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    private static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    private URLFromVertexIdConsumer urlFromVertexIdConsumer;
+    private LegacyMoxyConsumer legacyMoxyConsumer;
+
+    private HttpHeaders httpHeaders;
+
+    private UriInfo uriInfo;
+
+    private MultivaluedMap<String, String> headersMultiMap;
+    private MultivaluedMap<String, String> queryParameters;
+
+    private List<String> aaiRequestContextList;
+
+    private List<MediaType> outputMediaTypes;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(LegacyMoxyConsumerTest.class.getName());
+
+    @BeforeClass
+    public static void setupRest(){
+        AAIGraph.getInstance();
+        ModelInjestor.getInstance();
+    }
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        urlFromVertexIdConsumer = new URLFromVertexIdConsumer();
+        legacyMoxyConsumer      = new LegacyMoxyConsumer();
+
+        httpHeaders         = Mockito.mock(HttpHeaders.class);
+        uriInfo             = Mockito.mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+
+    @Test
+    public void testResponsePutGetDeleteOnResource() throws JSONException, IOException, AAIException {
+
+        String uri = "cloud-infrastructure/pservers/pserver/" + UUID.randomUUID().toString();
+        String payload = "{}";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        Response response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+
+        response = legacyMoxyConsumer.update(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        int code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+
+        assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+
+        MultivaluedMap<String, Object> responseHeaders = response.getMetadata();
+
+        assertNotNull("Unable to retrieve the response headers from response object", responseHeaders);
+        assertTrue("Response doesn't contain the key vertexId", responseHeaders.containsKey("vertex-id"));
+
+        String vertexId = responseHeaders.get("vertex-id").get(0).toString();
+
+        response = urlFromVertexIdConsumer.generateUrlFromVertexId(
+                "",
+                Version.getLatest().toString(),
+                Long.valueOf(vertexId).longValue(),
+                httpHeaders,
+                uriInfo,
+                null
+                );
+
+        assertNotNull(response);
+        assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+    }
+
+    @Test
+    public void testObjectNotFoundInDBReturnsNotFoundStatus() throws JSONException, IOException, AAIException {
+
+        String uri = "cloud-infrastructure/pservers/pserver/testRandom";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        String vertexId = "384584";
+
+        Response response = urlFromVertexIdConsumer.generateUrlFromVertexId(
+                "",
+                Version.getLatest().toString(),
+                Long.valueOf(vertexId).longValue(),
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertNotNull("Check if the response is not null", response);
+
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/VertexIdConsumerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/VertexIdConsumerTest.java
new file mode 100644
index 0000000..12e2411
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/VertexIdConsumerTest.java
@@ -0,0 +1,158 @@
+package org.openecomp.aai.rest;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.json.JSONException;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.AAISetup;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.exceptions.AAIException;
+import org.openecomp.aai.introspection.ModelInjestor;
+import org.openecomp.aai.introspection.Version;
+
+import javax.ws.rs.core.*;
+import java.io.IOException;
+import java.util.*;
+
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+public class VertexIdConsumerTest extends AAISetup {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    private static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    private VertexIdConsumer vertexIdConsumer;
+    private LegacyMoxyConsumer legacyMoxyConsumer;
+
+    private HttpHeaders httpHeaders;
+
+    private UriInfo uriInfo;
+
+    private MultivaluedMap<String, String> headersMultiMap;
+    private MultivaluedMap<String, String> queryParameters;
+
+    private List<String> aaiRequestContextList;
+
+    private List<MediaType> outputMediaTypes;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(LegacyMoxyConsumerTest.class.getName());
+
+    @BeforeClass
+    public static void setupRest(){
+        AAIGraph.getInstance();
+        ModelInjestor.getInstance();
+    }
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        vertexIdConsumer    = new VertexIdConsumer();
+        legacyMoxyConsumer  = new LegacyMoxyConsumer();
+
+        httpHeaders         = Mockito.mock(HttpHeaders.class);
+        uriInfo             = Mockito.mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+
+    @Test
+    public void testResponsePutGetDeleteOnResource() throws JSONException, IOException, AAIException {
+
+        String uri = "cloud-infrastructure/pservers/pserver/" + UUID.randomUUID().toString();
+        String payload = "{}";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        Response response = legacyMoxyConsumer.getLegacy(
+                "",
+                Version.getLatest().toString(),
+                uri,
+                "all",
+                "false",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), response.getStatus());
+
+        response = legacyMoxyConsumer.update(
+                payload,
+                Version.getLatest().toString(),
+                uri,
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        int code = response.getStatus();
+        if(!VALID_HTTP_STATUS_CODES.contains(code)){
+            System.out.println("Response Code: " + code + "\tEntity: " +  response.getEntity());
+        }
+
+        assertEquals(Response.Status.CREATED.getStatusCode(), response.getStatus());
+
+        MultivaluedMap<String, Object> responseHeaders = response.getMetadata();
+
+        assertNotNull("Unable to retrieve the response headers from response object", responseHeaders);
+        assertTrue("Response doesn't contain the key vertexId", responseHeaders.containsKey("vertex-id"));
+
+        String vertexId = responseHeaders.get("vertex-id").get(0).toString();
+
+        response = vertexIdConsumer.getByVertexId(
+                "",
+                Version.getLatest().toString(),
+                Long.valueOf(vertexId).longValue(),
+                "10000",
+                httpHeaders,
+                uriInfo,
+                null
+        );
+
+        assertNotNull(response);
+        String pserverObject = response.getEntity().toString();
+
+        System.out.println(pserverObject);
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/RetiredConsumerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/retired/RetiredConsumerTest.java
new file mode 100644
index 0000000..1f204f5
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/retired/RetiredConsumerTest.java
@@ -0,0 +1,107 @@
+package org.openecomp.aai.rest.retired;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.introspection.Version;
+
+import javax.ws.rs.core.*;
+import java.util.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+public abstract class RetiredConsumerTest {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    private static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    protected RetiredConsumer retiredConsumer;
+    protected HttpHeaders httpHeaders;
+    protected UriInfo uriInfo;
+
+    private MultivaluedMap<String, String> headersMultiMap;
+    private MultivaluedMap<String, String> queryParameters;
+
+    private List<String> aaiRequestContextList;
+
+    private List<MediaType> outputMediaTypes;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(RetiredConsumer.class.getName());
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        retiredConsumer     = getRetiredConsumer();
+        httpHeaders         = Mockito.mock(HttpHeaders.class);
+        uriInfo             = Mockito.mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+
+    @Test
+    public void testRetiredForAllEndPoints(){
+        when(uriInfo.getPath()).thenReturn("/aai/v3/cloud-infrastructure/pservers/pserver/test-pserver1");
+
+        Response response = retiredConsumer.createMessageGet(Version.getLatest().toString(), httpHeaders, uriInfo, null);
+        assertNotNull(response);
+        assertEquals(Response.Status.GONE.getStatusCode(), response.getStatus());
+
+        response = retiredConsumer.createMessagePost(Version.getLatest().toString(), httpHeaders, uriInfo, null);
+        assertNotNull(response);
+        assertEquals(Response.Status.GONE.getStatusCode(), response.getStatus());
+
+        response = retiredConsumer.createMessagePatch(Version.getLatest().toString(), httpHeaders, uriInfo, null);
+        assertNotNull(response);
+        assertEquals(Response.Status.GONE.getStatusCode(), response.getStatus());
+
+        response = retiredConsumer.createMessagePut(Version.getLatest().toString(), httpHeaders, uriInfo, null);
+        assertNotNull(response);
+        assertEquals(Response.Status.GONE.getStatusCode(), response.getStatus());
+
+        response = retiredConsumer.createMessageDelete(Version.getLatest().toString(), httpHeaders, uriInfo, null);
+        assertNotNull(response);
+        assertEquals(Response.Status.GONE.getStatusCode(), response.getStatus());
+    }
+
+    public abstract RetiredConsumer getRetiredConsumer();
+}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V3ThroughV7ConsumerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V3ThroughV7ConsumerTest.java
new file mode 100644
index 0000000..8dc1c10
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V3ThroughV7ConsumerTest.java
@@ -0,0 +1,9 @@
+package org.openecomp.aai.rest.retired;
+
+public class V3ThroughV7ConsumerTest extends RetiredConsumerTest {
+
+    @Override
+    public RetiredConsumer getRetiredConsumer() {
+        return new V3ThroughV7Consumer();
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8ModelsTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8ModelsTest.java
new file mode 100644
index 0000000..b6c340e
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8ModelsTest.java
@@ -0,0 +1,9 @@
+package org.openecomp.aai.rest.retired;
+
+public class V7V8ModelsTest extends RetiredConsumerTest {
+
+    @Override
+    public RetiredConsumer getRetiredConsumer() {
+        return new V7V8Models();
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8NamedQueriesTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8NamedQueriesTest.java
new file mode 100644
index 0000000..db4d35d
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/retired/V7V8NamedQueriesTest.java
@@ -0,0 +1,9 @@
+package org.openecomp.aai.rest.retired;
+
+public class V7V8NamedQueriesTest extends RetiredConsumerTest {
+
+    @Override
+    public RetiredConsumer getRetiredConsumer() {
+        return new V7V8NamedQueries();
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/tools/ModelVersionTransformerTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/tools/ModelVersionTransformerTest.java
new file mode 100644
index 0000000..75d25df
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/tools/ModelVersionTransformerTest.java
@@ -0,0 +1,116 @@
+package org.openecomp.aai.rest.tools;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.AAISetup;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.introspection.ModelInjestor;
+import org.skyscreamer.jsonassert.JSONAssert;
+
+import javax.ws.rs.core.*;
+import java.util.*;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.when;
+
+public class ModelVersionTransformerTest extends AAISetup {
+
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    private static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    private ModelVersionTransformer modelVersionTransformer;
+
+    private HttpHeaders httpHeaders;
+
+    private UriInfo uriInfo;
+
+    private MultivaluedMap<String, String> headersMultiMap;
+    private MultivaluedMap<String, String> queryParameters;
+
+    private List<String> aaiRequestContextList;
+
+    private List<MediaType> outputMediaTypes;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(ModelVersionTransformerTest.class.getName());
+
+    @BeforeClass
+    public static void setupRest(){
+        AAIGraph.getInstance();
+        ModelInjestor.getInstance();
+    }
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        modelVersionTransformer  = new ModelVersionTransformer();
+        httpHeaders         = Mockito.mock(HttpHeaders.class);
+        uriInfo             = Mockito.mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Content-Type", "application/xml");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+
+    @Test
+    public void modelTransform() throws Exception {
+
+        String modelXmlPayload  = getPayload("payloads/modeltransforms/model.xml");
+        String modelJsonPayload = getPayload("payloads/modeltransforms/model.json");
+
+        String uri = "modeltransform";
+
+        when(uriInfo.getPath()).thenReturn(uri);
+        // Comment the following line for the null pointer exception
+        when(uriInfo.getPath(false)).thenReturn(uri);
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(MediaType.valueOf("application/xml"));
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+        when(httpHeaders.getMediaType()).thenReturn(MediaType.valueOf("application/xml"));
+
+        Response response = modelVersionTransformer.modelTransform(modelXmlPayload,uri, httpHeaders, uriInfo, null);
+
+        assertNotNull(response);
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/util/EchoResponseTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/util/EchoResponseTest.java
new file mode 100644
index 0000000..c4d435a
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/util/EchoResponseTest.java
@@ -0,0 +1,116 @@
+package org.openecomp.aai.rest.util;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.aai.AAISetup;
+
+import javax.ws.rs.core.*;
+import java.util.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class EchoResponseTest extends AAISetup {
+
+    protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");
+
+    private static final Set<Integer> VALID_HTTP_STATUS_CODES = new HashSet<>();
+
+    static {
+        VALID_HTTP_STATUS_CODES.add(200);
+        VALID_HTTP_STATUS_CODES.add(201);
+        VALID_HTTP_STATUS_CODES.add(204);
+    }
+
+    private EchoResponse echoResponse;
+
+    private HttpHeaders httpHeaders;
+
+    private UriInfo uriInfo;
+
+    private MultivaluedMap<String, String> headersMultiMap;
+    private MultivaluedMap<String, String> queryParameters;
+
+    private List<String> aaiRequestContextList;
+
+    private List<MediaType> outputMediaTypes;
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(EchoResponseTest.class.getName());
+
+    @Before
+    public void setup(){
+        logger.info("Starting the setup for the integration tests of Rest Endpoints");
+
+        echoResponse  = new EchoResponse();
+        httpHeaders         = mock(HttpHeaders.class);
+        uriInfo             = mock(UriInfo.class);
+
+        headersMultiMap     = new MultivaluedHashMap<>();
+        queryParameters     = Mockito.spy(new MultivaluedHashMap<>());
+
+        headersMultiMap.add("X-FromAppId", "JUNIT");
+        headersMultiMap.add("X-TransactionId", UUID.randomUUID().toString());
+        headersMultiMap.add("Real-Time", "true");
+        headersMultiMap.add("Accept", "application/json");
+        headersMultiMap.add("aai-request-context", "");
+
+        outputMediaTypes = new ArrayList<>();
+        outputMediaTypes.add(APPLICATION_JSON);
+
+        aaiRequestContextList = new ArrayList<>();
+        aaiRequestContextList.add("");
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenReturn(outputMediaTypes);
+        when(httpHeaders.getRequestHeaders()).thenReturn(headersMultiMap);
+        when(httpHeaders.getRequestHeader("X-FromAppId")).thenReturn(Arrays.asList("JUNIT"));
+        when(httpHeaders.getRequestHeader("X-TransactionId")).thenReturn(Arrays.asList("JUNIT"));
+
+        when(httpHeaders.getRequestHeader("aai-request-context")).thenReturn(aaiRequestContextList);
+
+
+        when(uriInfo.getQueryParameters()).thenReturn(queryParameters);
+        when(uriInfo.getQueryParameters(false)).thenReturn(queryParameters);
+
+        // TODO - Check if this is valid since RemoveDME2QueryParameters seems to be very unreasonable
+        Mockito.doReturn(null).when(queryParameters).remove(anyObject());
+
+        when(httpHeaders.getMediaType()).thenReturn(APPLICATION_JSON);
+    }
+
+    @Test
+    public void testEchoResultWhenValidHeaders() throws Exception {
+
+        Response response = echoResponse.echoResult(httpHeaders, null, "");
+
+        assertNotNull(response);
+        assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+    }
+
+    @Test
+    public void testEchoResultWhenInValidHeadersThrowsBadRequest() throws Exception {
+
+        httpHeaders = mock(HttpHeaders.class);
+        Response response = echoResponse.echoResult(httpHeaders, null, "");
+
+        assertNotNull(response);
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+    }
+
+    @Test
+    public void testEchoResultWhenValidHeadersButMediaTypeWrong() throws Exception {
+
+        when(httpHeaders.getAcceptableMediaTypes()).thenThrow(new IllegalStateException())
+        .thenReturn(outputMediaTypes);
+
+        Response response = echoResponse.echoResult(httpHeaders, null, "");
+
+        assertNotNull(response);
+        assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatus());
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/util/LogFormatToolsTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/util/LogFormatToolsTest.java
new file mode 100644
index 0000000..55d8ce3
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/util/LogFormatToolsTest.java
@@ -0,0 +1,15 @@
+package org.openecomp.aai.rest.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+
+public class LogFormatToolsTest {
+
+    @Test
+    public void testLogFormatTools(){
+
+        String dateTime = new LogFormatTools().getCurrentDateTime();
+        assertNotNull(dateTime);
+    }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/java/org/openecomp/aai/rest/util/ValidateEncodingTest.java b/aai-resources/src/test/java/org/openecomp/aai/rest/util/ValidateEncodingTest.java
index 8c6450d..220d7d3 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/rest/util/ValidateEncodingTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/rest/util/ValidateEncodingTest.java
@@ -20,16 +20,15 @@
 
 package org.openecomp.aai.rest.util;
 
-import static org.junit.Assert.*;
-
-import java.io.UnsupportedEncodingException;
+import org.junit.Test;
+import org.mockito.Mockito;
 
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriInfo;
+import java.io.UnsupportedEncodingException;
 
-import org.junit.Test;
-import org.mockito.Mockito;
+import static org.junit.Assert.assertEquals;
 
 public class ValidateEncodingTest {
 
diff --git a/aai-resources/src/test/java/org/openecomp/aai/schema/db/AuditOXMTest.java b/aai-resources/src/test/java/org/openecomp/aai/schema/db/AuditOXMTest.java
index 8e9e322..f76c151 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/schema/db/AuditOXMTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/schema/db/AuditOXMTest.java
@@ -20,36 +20,25 @@
 
 package org.openecomp.aai.schema.db;
 
-import java.io.IOException;
-
+import com.thinkaurelius.titan.core.TitanFactory;
+import com.thinkaurelius.titan.core.TitanGraph;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-
+import org.openecomp.aai.AAISetup;
 import org.openecomp.aai.db.schema.AuditDoc;
 import org.openecomp.aai.db.schema.AuditOXM;
 import org.openecomp.aai.db.schema.Auditor;
 import org.openecomp.aai.db.schema.AuditorFactory;
 import org.openecomp.aai.introspection.Version;
-import com.thinkaurelius.titan.core.TitanFactory;
-import com.thinkaurelius.titan.core.TitanGraph;
+
+import java.io.IOException;
 
 @Ignore("not ready for testing")
-public class AuditOXMTest {
-	
-	/**
-	 * Before.
-	 */
-	@BeforeClass
-	public static void before() {
-		System.setProperty("AJSC_HOME", ".");
-		System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local");
-	
-	}
-	
+public class AuditOXMTest extends AAISetup {
+
 	
 	/**
 	 * Gets the graph audit.
diff --git a/aai-resources/src/test/java/org/openecomp/aai/schema/db/ManageSchemaTest.java b/aai-resources/src/test/java/org/openecomp/aai/schema/db/ManageSchemaTest.java
index 9dade87..c11358f 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/schema/db/ManageSchemaTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/schema/db/ManageSchemaTest.java
@@ -20,34 +20,27 @@
 
 package org.openecomp.aai.schema.db;
 
-import java.io.IOException;
-import java.util.Set;
-
+import com.thinkaurelius.titan.core.TitanFactory;
+import com.thinkaurelius.titan.core.TitanGraph;
+import com.thinkaurelius.titan.core.schema.TitanManagement;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-
+import org.openecomp.aai.AAISetup;
 import org.openecomp.aai.db.schema.DBIndex;
 import org.openecomp.aai.db.schema.ManageTitanSchema;
-import com.thinkaurelius.titan.core.TitanFactory;
-import com.thinkaurelius.titan.core.TitanGraph;
-import com.thinkaurelius.titan.core.schema.TitanManagement;
+
+import java.io.IOException;
+import java.util.Set;
 
 @Ignore("not ready yet")
-public class ManageSchemaTest {
+public class ManageSchemaTest extends AAISetup {
 
 	private TitanGraph graph = null;
-	@BeforeClass
-	public static void before() {
-		System.setProperty("AJSC_HOME", ".");
-		System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local");
-	
-	}
-	
+
 	@Before
 	public void beforeTest() {
 		//graph = TitanFactory.open("src/test/resources/inmemory_titan.properties");
diff --git a/aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java b/aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java
index 7df2790..d691545 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java
@@ -21,13 +21,12 @@
 package org.openecomp.aai.transforms;
 
 
-import java.io.IOException;
-
-import org.junit.Assert;
-
 import com.bazaarvoice.jolt.ArrayOrderObliviousDiffy;
 import com.bazaarvoice.jolt.Diffy;
 import com.bazaarvoice.jolt.JsonUtils;
+import org.junit.Assert;
+
+import java.io.IOException;
 
 public class JoltTestUtil {
 
diff --git a/aai-resources/src/test/java/org/openecomp/aai/transforms/LowerHyphenToLowerCamelConverterTest.java b/aai-resources/src/test/java/org/openecomp/aai/transforms/LowerHyphenToLowerCamelConverterTest.java
new file mode 100644
index 0000000..4f408b0
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/transforms/LowerHyphenToLowerCamelConverterTest.java
@@ -0,0 +1,73 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.openecomp.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=========================================================
+ */
+
+package org.openecomp.aai.transforms;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class LowerHyphenToLowerCamelConverterTest {
+
+    private Converter converter = new LowerHyphenToLowerCamelConverter();
+
+    private String input;
+    private String expected;
+
+    public LowerHyphenToLowerCamelConverterTest(String input, String expected){
+        this.input  = input;
+        this.expected = expected;
+    }
+
+    /**
+     * Data Provider for the Lower Hyphen to Camel Converter Tests
+     * Make sure the capitalization is not lost during the conversion
+     * @return
+     */
+    @Parameters
+    public static Collection<Object[]> data(){
+
+        return Arrays.asList(new Object[][]{
+            {null, null},
+            {"test-name", "testName"},
+            {"test---name", "testName"},            // Case multiple
+            {"testName", "testName"},               // Case where upper case word shouldn't be lowercased
+            {"test-name-cool", "testNameCool"},
+            {"test-name-Cool", "testNameCool"},
+            {"test-name-Cool-Name-wow----Rest", "testNameCoolNameWowRest"},
+            {"test-name#fast#", "testName#fast#"},
+            {"test-name---", "testName"},
+            {"----test-name", "TestName"},
+        });
+    }
+
+    @Test
+    public void testIfInputSuccessfullyModified(){
+        String actual = converter.convert(input);
+        assertEquals(expected, actual);
+    }
+}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/transforms/MapTraverserTest.java b/aai-resources/src/test/java/org/openecomp/aai/transforms/MapTraverserTest.java
new file mode 100644
index 0000000..78fc88d
--- /dev/null
+++ b/aai-resources/src/test/java/org/openecomp/aai/transforms/MapTraverserTest.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.openecomp.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=========================================================
+ */
+
+package org.openecomp.aai.transforms;
+
+import com.bazaarvoice.jolt.JsonUtils;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Map;
+
+public class MapTraverserTest {
+
+    private final String testResources = "src/test/resources/maputils/testcases/";
+
+    private String[] testCases = { "TestCase1.json", "TestCase2.json" };
+    private MapTraverser traverser = new MapTraverser(new LowerCamelToLowerHyphenConverter());
+
+    @Test(expected = NullPointerException.class)
+    public void testIfMapIsNullThrowNullPointerException(){
+        Map<String, Object> map = null;
+        traverser.convertKeys(map);
+    }
+
+    @Test
+    public void runTestCases() throws IOException {
+
+        for(String testCase : testCases){
+            Map<String, Object> values = JsonUtils.filepathToMap(testResources + testCase);
+
+            Object input = values.get("input");
+            Object actual = traverser.convertKeys((Map<String, Object>)input);
+            Object output = values.get("output");
+            JoltTestUtil.runArrayOrderObliviousDiffy( "failed case " + testCase, output, actual );
+        }
+    }
+}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAIApiServerURLBaseTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/AAIApiServerURLBaseTest.java
deleted file mode 100644
index 394f636..0000000
--- a/aai-resources/src/test/java/org/openecomp/aai/util/AAIApiServerURLBaseTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.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=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import static org.mockito.Mockito.*;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.modules.agent.PowerMockAgent;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.modules.junit4.rule.PowerMockRule;
-
-@PrepareForTest({PhaseInterceptorChain.class, AAIConfig.class})
-
-public class AAIApiServerURLBaseTest {
-	@Rule
-	public PowerMockRule rule = new PowerMockRule();
-	
-	static {
-	     PowerMockAgent.initializeIfNeeded();
-	 }
-	
-	 /**
- 	 * Test get hostname.
- 	 *
- 	 * @throws Exception the exception
- 	 */
- 	@Test
-	  public void testGetHostname() throws Exception {
-	    PowerMockito.mockStatic(PhaseInterceptorChain.class);	    
-	    Map <String, List<String>> hm = new HashMap<String, List<String>>();
-	    List<String> host = new ArrayList<String>();
-	    host.add("my-localhost");
-	    hm.put("host", host);
-	    
-	    Message outMessage = new MessageImpl();
-	    outMessage.put(Message.PROTOCOL_HEADERS, hm);
-	    
-	    when(PhaseInterceptorChain.getCurrentMessage()).thenReturn(outMessage);
-	    assertEquals("https://my-localhost/aai/", AAIApiServerURLBase.get());
-	  }
-	 
-	 /**
- 	 * Test get with null hostname.
- 	 *
- 	 * @throws Exception the exception
- 	 */
- 	@Test
-	  public void testGetWithNullHostname() throws Exception {
-		 PowerMockito.mockStatic(AAIConfig.class);
-	    String defaultHostname = "default-name";
-	    when(AAIConfig.get(AAIConstants.AAI_SERVER_URL_BASE)).thenReturn(defaultHostname);
-	    assertEquals(defaultHostname, AAIApiServerURLBase.get());
-	  }	 
-}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAIApiVersionTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/AAIApiVersionTest.java
deleted file mode 100644
index f82fc5d..0000000
--- a/aai-resources/src/test/java/org/openecomp/aai/util/AAIApiVersionTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.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=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import static org.junit.Assert.*;
-
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.junit.Rule;
-import org.junit.Test;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import static org.mockito.Mockito.*;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.modules.agent.PowerMockAgent;
-import org.powermock.modules.junit4.rule.PowerMockRule;
-
-@PrepareForTest({PhaseInterceptorChain.class, AAIConfig.class})
-
-public class AAIApiVersionTest {
-	@Rule
-	public PowerMockRule rule = new PowerMockRule();
-	  
-	  static { PowerMockAgent.initializeIfNeeded();}
-	
-	  /**
-  	 * Test get version.
-  	 *
-  	 * @throws Exception the exception
-  	 */
-  	@Test
-	  public void testGetVersion() throws Exception {
-	    PowerMockito.mockStatic(PhaseInterceptorChain.class);
-	    Message outMessage = new MessageImpl();
-	    String msg = "/v2/";
-	    outMessage.put(Message.REQUEST_URI, msg);
-	    when(PhaseInterceptorChain.getCurrentMessage()).thenReturn(outMessage);
-	    assertEquals("v2", AAIApiVersion.get()); 
-	  }
-	  
-	  /**
-  	 * Test get with null version.
-  	 *
-  	 * @throws Exception the exception
-  	 */
-  	@Test
-	  public void testGetWithNullVersion() throws Exception {
-	    PowerMockito.mockStatic(AAIConfig.class);
-	    String defaultURI = "default-v2";
-	    when(AAIConfig.get(AAIConstants.AAI_DEFAULT_API_VERSION_PROP, AAIConstants.AAI_DEFAULT_API_VERSION)).thenReturn(defaultURI);
-	    assertEquals(defaultURI, AAIApiVersion.get());
-	  }
-	  
-	  /**
-  	 * Test incorrect version pattern.
-  	 *
-  	 * @throws Exception the exception
-  	 */
-  	@Test
-	  public void testIncorrectVersionPattern() throws Exception {
-	    PowerMockito.mockStatic(PhaseInterceptorChain.class);
-	    PowerMockito.mockStatic(AAIConfig.class);
-	    Message outMessage = new MessageImpl();
-	    String msg = "2.0.1";
-	    String defaultURI = "default-v2";
-	    outMessage.put(Message.REQUEST_URI, msg);
-	    when(PhaseInterceptorChain.getCurrentMessage()).thenReturn(outMessage);
-	    when(AAIConfig.get(AAIConstants.AAI_DEFAULT_API_VERSION_PROP, AAIConstants.AAI_DEFAULT_API_VERSION)).thenReturn(defaultURI);
-	    assertEquals(defaultURI, AAIApiVersion.get());
-	  }
-
-}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAIAppServletContextListenerTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/AAIAppServletContextListenerTest.java
index deafd5b..a148bea 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/AAIAppServletContextListenerTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/AAIAppServletContextListenerTest.java
@@ -20,31 +20,28 @@
 
 package org.openecomp.aai.util;
 
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletContextEvent;
-
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.AppenderBase;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
+import org.openecomp.aai.dbmap.AAIGraph;
+import org.openecomp.aai.logging.ErrorLogHelper;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.agent.PowerMockAgent;
 import org.powermock.modules.junit4.rule.PowerMockRule;
 import org.slf4j.LoggerFactory;
 
-import org.openecomp.aai.dbmap.AAIGraph;
-import org.openecomp.aai.logging.ErrorLogHelper;
+import javax.servlet.ServletContextEvent;
+import java.util.ArrayList;
+import java.util.List;
 
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.PatternLayout;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.AppenderBase;
+import static org.junit.Assert.assertTrue;
 
 @PrepareForTest({AAIGraph.class, AAIConfig.class, ErrorLogHelper.class})
 public class AAIAppServletContextListenerTest {
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAICSVWriterTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/AAICSVWriterTest.java
index c3e525c..4f2dfd1 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/AAICSVWriterTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/AAICSVWriterTest.java
@@ -20,18 +20,6 @@
 
 package org.openecomp.aai.util;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -39,6 +27,13 @@ import org.junit.Test;
 import org.powermock.modules.agent.PowerMockAgent;
 import org.powermock.modules.junit4.rule.PowerMockRule;
 
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class AAICSVWriterTest {
 	
 	@Rule
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAIConfigPasswordDecodingTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/AAIConfigPasswordDecodingTest.java
deleted file mode 100644
index bdf0fb1..0000000
--- a/aai-resources/src/test/java/org/openecomp/aai/util/AAIConfigPasswordDecodingTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * org.openecomp.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=========================================================
- */
-
-package org.openecomp.aai.util;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import org.openecomp.aai.exceptions.AAIException;
-
-public class AAIConfigPasswordDecodingTest {
-
-	/**
-	 * Configure.
-	 *
-	 * @throws AAIException the AAI exception
-	 */
-	@BeforeClass
-	public static void configure() throws AAIException {
-		System.setProperty("AJSC_HOME", "./src/test/resources/");
-		System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local");; //fake prop file for testing
-	}
-	
-	/**
-	 * Password check.
-	 *
-	 * @throws AAIException the AAI exception
-	 */
-	@Test
-	public void passwordCheck() throws AAIException {
-		assertEquals("password", "aaiuser123", AAIConfig.get("ecm.auth.password"));
-	}
-
-}
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/AAIRSyncUtilityTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/AAIRSyncUtilityTest.java
index c15a99f..c8765f6 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/AAIRSyncUtilityTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/AAIRSyncUtilityTest.java
@@ -21,9 +21,10 @@
 package org.openecomp.aai.util;
 
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.openecomp.aai.AAISetup;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -38,14 +39,10 @@ import java.util.List;
 import java.util.StringTokenizer;
 import java.util.UUID;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.aai.exceptions.AAIException;
+import static org.junit.Assert.*;
 
 @Ignore
-public class AAIRSyncUtilityTest {
+public class AAIRSyncUtilityTest extends AAISetup {
 
   AAIRSyncUtility syncUtil; 
   AAIRSyncUtility syncUtilOmitDoCommand;
@@ -53,12 +50,6 @@ public class AAIRSyncUtilityTest {
   String hostName;
   String transId = UUID.randomUUID().toString();
 
-  @BeforeClass
-  public static void configure() throws AAIException {
-    System.setProperty("AJSC_HOME", "./src/test/resources/");
-    System.setProperty("BUNDLECONFIG_DIR", "bundleconfig-local");; //fake prop file for testing
-  }
-
   /**
    * Initialize.
    */
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DataConversionHelperTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/DataConversionHelperTest.java
index 356010a..860c56c 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/DataConversionHelperTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/DataConversionHelperTest.java
@@ -20,13 +20,13 @@
 
 package org.openecomp.aai.util;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.powermock.modules.agent.PowerMockAgent;
 import org.powermock.modules.junit4.rule.PowerMockRule;
 
+import static org.junit.Assert.assertEquals;
+
 public class DataConversionHelperTest {	
 	
 	@Rule
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestConfig.java b/aai-resources/src/test/java/org/openecomp/aai/util/DbTestConfig.java
index 4f84519..20a4307 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestConfig.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/DbTestConfig.java
@@ -20,17 +20,9 @@
 
 package org.openecomp.aai.util;
 
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.TimerTask;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Timer;
+import java.io.*;
 import java.net.InetAddress;
+import java.util.*;
 
 public class DbTestConfig {
 
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestFileWatcher.java b/aai-resources/src/test/java/org/openecomp/aai/util/DbTestFileWatcher.java
index 05a4cfe..55caba8 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestFileWatcher.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/DbTestFileWatcher.java
@@ -20,8 +20,8 @@
 
 package org.openecomp.aai.util;
 
-import java.util.*;
-import java.io.*;
+import java.io.File;
+import java.util.TimerTask;
 
 public abstract class DbTestFileWatcher extends TimerTask {
   private long timeStamp;
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestProcessBuilder.java b/aai-resources/src/test/java/org/openecomp/aai/util/DbTestProcessBuilder.java
index 8d8ebe0..306e46e 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/DbTestProcessBuilder.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/DbTestProcessBuilder.java
@@ -20,11 +20,7 @@
 
 package org.openecomp.aai.util;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.nio.file.attribute.FileTime;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/HbaseSaltPrefixerTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/HbaseSaltPrefixerTest.java
index 4e19c35..ba15e00 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/HbaseSaltPrefixerTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/HbaseSaltPrefixerTest.java
@@ -20,10 +20,10 @@
 
 package org.openecomp.aai.util;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+
 public class HbaseSaltPrefixerTest {
 
 	/**
diff --git a/aai-resources/src/test/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtilTest.java b/aai-resources/src/test/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtilTest.java
index e1fb24a..96150da 100644
--- a/aai-resources/src/test/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtilTest.java
+++ b/aai-resources/src/test/java/org/openecomp/aai/util/JettyObfuscationConversionCommandLineUtilTest.java
@@ -20,14 +20,14 @@
 
 package org.openecomp.aai.util;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.junit.Test;
+import static org.junit.Assert.assertTrue;
 
 
 public class JettyObfuscationConversionCommandLineUtilTest {
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/aaiconfig.properties b/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/aaiconfig.properties
index f829b3b..c226e38 100644
--- a/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/aaiconfig.properties
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/aaiconfig.properties
@@ -140,3 +140,5 @@ aai.realtime.clients=RO,SDNC,MSO
 aai.server.rebind=g
 aai.run.migrations=false
 ecm.auth.password.x=OBF:1igd1i9a1jnb1yte1vv11vu91yt81jk71i6o1idt
+
+aai.jms.enable=false
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/titan-cached.properties b/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/titan-cached.properties
new file mode 100644
index 0000000..04aca4e
--- /dev/null
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/titan-cached.properties
@@ -0,0 +1,17 @@
+query.fast-property=true
+# the following parameters are not reloaded automatically and require a manual bounce
+storage.backend=inmemory
+storage.hostname=localhost
+
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=aaigraph-dev1.dev
+storage.hbase.ext.zookeeper.znode.parent=/hbase-unsecure
+#caching on
+cache.db-cache = true
+cache.db-cache-clean-wait = 20
+cache.db-cache-time = 180000
+cache.db-cache-size = 0.3
+
+#load graphson file on startup
+load.snapshot.file=false
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/titan-realtime.properties b/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/titan-realtime.properties
new file mode 100644
index 0000000..72af2df
--- /dev/null
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/appprops/titan-realtime.properties
@@ -0,0 +1,14 @@
+query.fast-property=true
+# the following parameters are not reloaded automatically and require a manual bounce
+storage.backend=inmemory
+storage.hostname=localhost
+
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=aaigraph-dev1.dev
+storage.hbase.ext.zookeeper.znode.parent=/hbase-unsecure
+# Setting db-cache to false ensure the fastest propagation of changes across servers
+cache.db-cache = false
+
+#load graphson file on startup
+load.snapshot.file=false
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml
index 01bc525..318e300 100644
--- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v10" xml-mapping-metadata-complete="true">
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v10" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
 		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10" />
 	</xml-schema>
@@ -27,14 +27,15 @@
 		<java-type name="Inventory">
 			<xml-root-element name="inventory" />
 			<java-attributes>
-				<xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v10.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v10.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v10.CloudInfrastructure" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v10.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v10.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v10.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v10.AaiInternal" />
-				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v10.Nodes"/>
+				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v10.Search" />
+				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v10.Actions" />
+				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v10.CloudInfrastructure" />
+				<xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v10.LicenseManagement" />
+				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v10.Business" />
+				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v10.ServiceDesignAndCreation" />
+				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v10.Network" />
+				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v10.AaiInternal" />
+				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v10.Nodes"/>
 			</java-attributes>
 		</java-type>
 
@@ -44,24 +45,24 @@
 		<java-type name="Search">
 			<xml-root-element name="search" />
 			<java-attributes>
-				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.openecomp.org.v10.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v10.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v10.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v10.SdnZoneResponse" />
+				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v10.EdgeTagQueryResult" />
+				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v10.EdgeTagQueryRequest" />
+				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v10.SearchResults" />
+				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.InventoryItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v10.InventoryItem" />
 			</java-attributes>
 		</java-type>
 
@@ -70,8 +71,8 @@
 			<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.openecomp.org.v10.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v10.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v10.InventoryItemData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v10.TaggedInventoryItemList" />
 			</java-attributes>
 		</java-type>
 
@@ -89,9 +90,9 @@
 				<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.openecomp.org.v10.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v10.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v10.SecondaryFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v10.StartNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v10.IncludeNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v10.SecondaryFilter" />
 			</java-attributes>
 		</java-type>
 
@@ -122,7 +123,7 @@
 		<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.openecomp.org.v10.ResultData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v10.ResultData" />
 			</java-attributes>
 		</java-type>
 
@@ -145,16 +146,16 @@
 		<java-type name="SdnZoneResponse">
 			<xml-root-element name="sdn-zone-response" />
 			<java-attributes>
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v10.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v10.AzAndDvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v10.AvailabilityZone" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches" />
+				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone" />
 			</java-attributes>
 		</java-type>
 
@@ -164,8 +165,8 @@
 			</xml-properties>
 			<xml-root-element name="actions" />
 			<java-attributes>
-				<xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v10.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v10.Notify" />
+				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v10.Update" />
+				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v10.Notify" />
 			</java-attributes>
 		</java-type>
 
@@ -176,9 +177,9 @@
 			<xml-root-element name="update" />
 			<java-attributes>
 				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v10.UpdateNodeKey" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.Action" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v10.Action" />
 			</java-attributes>
 		</java-type>
 
@@ -186,7 +187,7 @@
 			<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.openecomp.org.v10.ActionData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v10.ActionData" />
 			</java-attributes>
 		</java-type>
 
@@ -212,7 +213,7 @@
 				<xml-element java-attribute="eventId" name="event-id" required="true" 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.openecomp.org.v10.KeyData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v10.KeyData" />
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
 			</java-attributes>
 		</java-type>
@@ -231,18 +232,18 @@
 			</xml-properties>
 			<xml-root-element name="cloud-infrastructure" />
 			<java-attributes>
-				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.openecomp.org.v10.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v10.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v10.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v10.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v10.VirtualDataCenters" />
+				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v10.Complexes" />
+				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v10.CloudRegions" />
+				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v10.NetworkProfiles" />
+				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v10.Pservers" />
+				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v10.VirtualDataCenters" />
 			</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.openecomp.org.v10.CloudRegion" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v10.CloudRegion" />
 			</java-attributes>
             <xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -254,7 +255,7 @@
 			<java-attributes>
 				<xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" 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-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
@@ -297,19 +298,19 @@
 						<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.openecomp.org.v10.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v10.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v10.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v10.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v10.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v10.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v10.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v10.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v10.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v10.VolumeGroups" />
+				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v10.Tenants" />
+				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v10.Flavors" />
+				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v10.GroupAssignments" />
+				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v10.Snapshots" />
+				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v10.Images" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v10.DvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v10.OamNetworks" />
+				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v10.AvailabilityZones" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</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="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
 				<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" />
@@ -322,7 +323,7 @@
 			</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.openecomp.org.v10.VolumeGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v10.VolumeGroup" />
 			</java-attributes>
 		</java-type>
 
@@ -369,7 +370,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Persistent block-level storage." />
@@ -383,7 +384,7 @@
 		<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.openecomp.org.v10.Relationship" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v10.Relationship" />
 			</java-attributes>
 		</java-type>
 
@@ -400,8 +401,8 @@
 						<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.openecomp.org.v10.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v10.RelatedToProperty" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v10.RelationshipData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v10.RelatedToProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -443,7 +444,7 @@
 			</xml-properties>
 			<xml-root-element name="complexes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.openecomp.org.v10.Complex" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v10.Complex" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -494,8 +495,8 @@
 				<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.openecomp.org.v10.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v10.CtagPools" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
@@ -510,7 +511,7 @@
 		<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.openecomp.org.v10.CtagPool" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v10.CtagPool" />
 			</java-attributes>
 		</java-type>
 
@@ -542,7 +543,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
@@ -558,7 +559,7 @@
 			</xml-properties>
 			<xml-root-element name="tenants" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v10.Tenant" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v10.Tenant" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -583,8 +584,8 @@
 						<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.openecomp.org.v10.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v10.Vservers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack tenant" />
@@ -602,7 +603,7 @@
 			</xml-properties>
 			<xml-root-element name="vservers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v10.Vserver" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v10.Vserver" />
 			</java-attributes>
 		</java-type>
 
@@ -651,9 +652,9 @@
 						<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.openecomp.org.v10.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+				<xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v10.Volumes" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
@@ -671,7 +672,7 @@
 			</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.openecomp.org.v10.LInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v10.LInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -740,12 +741,12 @@
 						<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="vlans" name="vlans" type="inventory.aai.openecomp.org.v10.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v10.SriovVfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv6AddressList" />
+				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v10.Vlans" />
+				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v10.SriovVfs" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
@@ -761,7 +762,7 @@
 			</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.openecomp.org.v10.SriovVf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v10.SriovVf" />
 			</java-attributes>
 		</java-type>
 		<java-type name="SriovVf">
@@ -837,7 +838,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
@@ -890,7 +891,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPv4 Address Range" />
@@ -902,7 +903,7 @@
 		<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.openecomp.org.v10.Vlan" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v10.Vlan" />
 			</java-attributes>
 		</java-type>
 
@@ -949,7 +950,7 @@
 						<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="vpnId" name="vpn-id" type="java.lang.String">
+				<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>
@@ -965,14 +966,13 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv6AddressList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v10.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-				<xml-property name="uniqueProps" value="vpn-id" />
+				<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>
@@ -1021,7 +1021,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPv6 Address Range" />
@@ -1036,7 +1036,7 @@
 			</xml-properties>
 			<xml-root-element name="volumes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v10.Volume" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v10.Volume" />
 			</java-attributes>
 		</java-type>
 
@@ -1058,7 +1058,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Ephemeral Block storage volume." />
@@ -1074,7 +1074,7 @@
 			</xml-properties>
 			<xml-root-element name="flavors" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v10.Flavor" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v10.Flavor" />
 			</java-attributes>
 		</java-type>
 
@@ -1136,7 +1136,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack flavor." />
@@ -1153,7 +1153,7 @@
 			</xml-properties>
 			<xml-root-element name="snapshots" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v10.Snapshot" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v10.Snapshot" />
 			</java-attributes>		
 		</java-type>
 		
@@ -1215,7 +1215,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />				
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack snapshot" />
@@ -1233,7 +1233,7 @@
 			</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.openecomp.org.v10.GroupAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v10.GroupAssignment" />
 			</java-attributes>
 		</java-type>
 		
@@ -1265,12 +1265,13 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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>
@@ -1282,7 +1283,7 @@
 			</xml-properties>
 			<xml-root-element name="images" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v10.Image" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v10.Image" />
 			</java-attributes>
 		</java-type>
 
@@ -1339,8 +1340,8 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack image." />
@@ -1357,7 +1358,7 @@
 			</xml-properties>
 			<xml-root-element name="metadata" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v10.Metadatum" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v10.Metadatum" />
 			</java-attributes>
 		</java-type>
 
@@ -1386,7 +1387,7 @@
 			</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.openecomp.org.v10.DvsSwitch" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v10.DvsSwitch" />
 			</java-attributes>
 		</java-type>
 
@@ -1408,7 +1409,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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. " />
@@ -1424,7 +1425,7 @@
 			</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.openecomp.org.v10.NetworkProfile" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v10.NetworkProfile" />
 			</java-attributes>
 		</java-type>
 
@@ -1446,7 +1447,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
@@ -1462,7 +1463,7 @@
 			</xml-properties>
 			<xml-root-element name="pservers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v10.Pserver" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v10.Pserver" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -1598,9 +1599,9 @@
 						<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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.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." />
@@ -1618,7 +1619,7 @@
 			</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.openecomp.org.v10.PInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v10.PInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -1676,8 +1677,8 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Physical interface (e.g., nic)" />
@@ -1694,7 +1695,7 @@
 			</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.openecomp.org.v10.LagInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v10.LagInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -1747,8 +1748,8 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Link aggregate interface" />
@@ -1764,7 +1765,7 @@
 			</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.openecomp.org.v10.OamNetwork" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v10.OamNetwork" />
 			</java-attributes>
 		</java-type>
 
@@ -1801,7 +1802,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
@@ -1818,7 +1819,7 @@
 			</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.openecomp.org.v10.AvailabilityZone" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v10.AvailabilityZone" />
 			</java-attributes>
 		</java-type>
 
@@ -1835,7 +1836,7 @@
 						<xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
+				<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>
@@ -1845,7 +1846,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
@@ -1861,7 +1862,7 @@
 			</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.openecomp.org.v10.VirtualDataCenter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v10.VirtualDataCenter" />
 			</java-attributes>
 		</java-type>
 
@@ -1883,7 +1884,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
@@ -1894,8 +1895,50 @@
 			</xml-properties>
 		</java-type>
 
+		<java-type name="LicenseManagement">
+			<xml-root-element name="license-management" />
+			<java-attributes>
+				<xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v10.LicenseKeyResources" />
+			</java-attributes>
+		</java-type>
 
+		<java-type name="LicenseKeyResources">
+			<xml-root-element name="license-key-resources" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v10.LicenseKeyResource" />
+			</java-attributes>
+		</java-type>
 
+		<java-type name="LicenseKeyResource">
+			<xml-root-element name="license-key-resource" />
+			<java-attributes>
+				<xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" />
+				<xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" />
+				<xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" />
+				<xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" />
+				<xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" />
+				<xml-element java-attribute="name" name="name" type="java.lang.String" />
+				<xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" />
+				<xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" />
+				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" />
+				<xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" 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>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="OBSOLETE OBJECT:  do not use" />
+				<xml-property name="nameProps" value="name" />
+				<xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" />
+				<xml-property name="uniqueProps" value="att-uuid" />
+				<xml-property name="container" value="license-key-resources" />
+				<xml-property name="namespace" value="license-management" />
+			</xml-properties>
+		</java-type>
 
 		<java-type name="Business">
 			<xml-properties>
@@ -1903,8 +1946,8 @@
 			</xml-properties>
 			<xml-root-element name="business" />
 			<java-attributes>
-				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.openecomp.org.v10.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v10.Customers" />
+				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v10.Connectors" />
+				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v10.Customers" />
 			</java-attributes>
 		</java-type>
 
@@ -1914,7 +1957,7 @@
 			</xml-properties>
 			<xml-root-element name="connectors" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.openecomp.org.v10.Connector" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v10.Connector" />
 			</java-attributes>
 		</java-type>
 
@@ -1935,6 +1978,7 @@
 					<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>
@@ -1942,6 +1986,7 @@
 					<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>
@@ -1949,7 +1994,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -1962,8 +2007,8 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
@@ -1979,7 +2024,7 @@
 			</xml-properties>
 			<xml-root-element name="customers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v10.Customer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v10.Customer" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -2010,8 +2055,8 @@
 						<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.openecomp.org.v10.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v10.ServiceSubscriptions" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
@@ -2030,7 +2075,7 @@
 			</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.openecomp.org.v10.ServiceSubscription" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v10.ServiceSubscription" />
 			</java-attributes>
 		</java-type>
 
@@ -2052,9 +2097,9 @@
 						<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.openecomp.org.v10.ServiceInstances">
+				<xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v10.ServiceInstances">
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Object that group service instances." />
@@ -2071,7 +2116,7 @@
 			</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.openecomp.org.v10.ServiceInstance" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v10.ServiceInstance" />
 			</java-attributes>
 		</java-type>
 
@@ -2092,6 +2137,7 @@
 					<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>
@@ -2099,6 +2145,7 @@
 					<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>
@@ -2106,7 +2153,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -2149,11 +2196,6 @@
 						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational status of the service-instance." />
-					</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." />
@@ -2174,9 +2216,9 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v10.AllottedResources" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
+				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v10.AllottedResources" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Instance of a service" />
@@ -2195,11 +2237,11 @@
 			</xml-properties>
 			<xml-root-element name="service-design-and-creation" />
 			<java-attributes>
-				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.openecomp.org.v10.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v10.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v10.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v10.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v10.NamedQueries" />
+				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v10.VnfImages" />
+				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v10.Services" />
+				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v10.ServiceCapabilities" />
+				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v10.Models" />
+				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v10.NamedQueries" />
 			</java-attributes>
 		</java-type>
 
@@ -2209,16 +2251,17 @@
 			</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.openecomp.org.v10.VnfImage" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v10.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" required="true" type="java.lang.String" xml-key="true">
+				<xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
 						<xml-property name="description" value="Unique ID of this asset" />
+						<xml-property name="dbAlias" value="vnf-image-uuid" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
@@ -2246,12 +2289,12 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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="indexedProps" value="application,att-uuid,application-vendor,application-version" />
+				<xml-property name="uniqueProps" value="att-uuid" />
 				<xml-property name="container" value="vnf-images" />
 				<xml-property name="namespace" value="service-design-and-creation" />
 			</xml-properties>
@@ -2263,7 +2306,7 @@
 			</xml-properties>
 			<xml-root-element name="services" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v10.Service" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v10.Service" />
 			</java-attributes>
 		</java-type>
 
@@ -2295,7 +2338,7 @@
 						<xml-property name="description" value="service version" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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." />
@@ -2311,7 +2354,7 @@
 			</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.openecomp.org.v10.ServiceCapability" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v10.ServiceCapability" />
 			</java-attributes>
 		</java-type>
 
@@ -2333,7 +2376,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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." />
@@ -2349,24 +2392,24 @@
 			</xml-properties>
 			<xml-root-element name="network" />
 			<java-attributes>
-				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v10.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v10.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v10.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v10.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v10.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v10.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v10.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v10.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v10.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v10.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v10.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v10.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v10.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v10.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v10.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v10.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v10.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v10.Zones" />
+				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v10.LogicalLinks" />
+				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v10.SitePairSets" />
+				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v10.VpnBindings" />
+				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v10.VplsPes" />
+				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v10.MulticastConfigurations" />
+				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v10.Vces" />
+				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v10.Vnfcs" />
+				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v10.L3Networks" />
+				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v10.NetworkPolicies" />
+				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v10.GenericVnfs" />
+				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v10.LagLinks" />
+				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v10.Newvces" />
+				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v10.Pnfs" />
+				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v10.PhysicalLinks" />
+				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v10.IpsecConfigurations" />
+				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v10.RouteTableReferences" />
+				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v10.InstanceGroups" />
+				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v10.Zones" />
 			</java-attributes>
 		</java-type>
 
@@ -2376,7 +2419,7 @@
 			</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.openecomp.org.v10.LogicalLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v10.LogicalLink" />
 			</java-attributes>
 		</java-type>
 
@@ -2405,7 +2448,7 @@
 				</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-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
@@ -2422,6 +2465,7 @@
 					<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>
@@ -2429,6 +2473,7 @@
 					<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>
@@ -2436,7 +2481,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -2484,7 +2529,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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" />
@@ -2502,7 +2547,7 @@
 			</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.openecomp.org.v10.SitePairSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v10.SitePairSet" />
 			</java-attributes>
 		</java-type>
 
@@ -2519,8 +2564,8 @@
 						<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.openecomp.org.v10.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v10.RoutingInstances" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
@@ -2537,7 +2582,7 @@
 			</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.openecomp.org.v10.RoutingInstance" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v10.RoutingInstance" />
 			</java-attributes>
 		</java-type>
 
@@ -2559,8 +2604,8 @@
 						<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.openecomp.org.v10.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v10.SitePairs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="routing-instance-id" />
@@ -2576,7 +2621,7 @@
 			</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.openecomp.org.v10.SitePair" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v10.SitePair" />
 			</java-attributes>
 		</java-type>
 
@@ -2610,7 +2655,7 @@
 				</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, etc." />
+						<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">
@@ -2618,8 +2663,8 @@
 						<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.openecomp.org.v10.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v10.ClassesOfService" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="site-pair-id" />
@@ -2635,7 +2680,7 @@
 			</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.openecomp.org.v10.ClassOfService" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v10.ClassOfService" />
 			</java-attributes>
 		</java-type>
 
@@ -2662,7 +2707,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="cos" />
@@ -2674,7 +2719,7 @@
 		<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.openecomp.org.v10.VpnBinding" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v10.VpnBinding" />
 			</java-attributes>
 		</java-type>
 
@@ -2691,11 +2736,6 @@
 						<xml-property name="description" value="VPN Name" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
-					</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" />
@@ -2711,17 +2751,13 @@
 						<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="routeTargetRole" name="route-target-role" 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.openecomp.org.v10.RelationshipList">
+				<xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v10.RouteTargets" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList">
 					<xml-properties>
 						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
 					</xml-properties>
@@ -2730,7 +2766,7 @@
 			<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,global-route-target,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" />
@@ -2744,7 +2780,7 @@
 			</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.openecomp.org.v10.VplsPe" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v10.VplsPe" />
 			</java-attributes>
 		</java-type>
 
@@ -2777,9 +2813,9 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="VPLS Provider Edge routers." />
@@ -2795,7 +2831,7 @@
 			</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.openecomp.org.v10.MulticastConfiguration" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v10.MulticastConfiguration" />
 			</java-attributes>
 		</java-type>
 
@@ -2822,7 +2858,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="multicast-configuration-id" />
@@ -2838,7 +2874,7 @@
 			</xml-properties>
 			<xml-root-element name="vces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.openecomp.org.v10.Vce" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v10.Vce" />
 			</java-attributes>
 		</java-type>
 
@@ -2880,7 +2916,7 @@
 						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
+				<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>
@@ -2940,10 +2976,10 @@
 						<xml-property name="description" value="OBSOLETE -  see child relationships" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.openecomp.org.v10.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v10.PortGroups" />
+				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses" />
+				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
@@ -2960,7 +2996,7 @@
 		<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.openecomp.org.v10.PortGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v10.PortGroup" />
 			</java-attributes>
 		</java-type>
 
@@ -3022,8 +3058,8 @@
 						<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.openecomp.org.v10.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v10.CvlanTags" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
@@ -3037,7 +3073,7 @@
 		<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.openecomp.org.v10.CvlanTagEntry" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v10.CvlanTagEntry" />
 			</java-attributes>
 		</java-type>
 
@@ -3054,7 +3090,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="dependentOn" value="port-group" />
@@ -3071,7 +3107,7 @@
 			</xml-properties>
 			<xml-root-element name="vnfcs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v10.Vnfc" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v10.Vnfc" />
 			</java-attributes>
 		</java-type>
 
@@ -3086,11 +3122,13 @@
 				<xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="function code" />
+						<xml-property name="dbAlias" value="nfc-naming-code" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="type" />
+						<xml-property name="dbAlias" value="nfc-function" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
@@ -3130,7 +3168,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
@@ -3143,7 +3181,7 @@
 		<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.openecomp.org.v10.L3Network" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v10.L3Network" />
 			</java-attributes>
 		</java-type>
 
@@ -3225,6 +3263,7 @@
 					<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>
@@ -3232,6 +3271,7 @@
 					<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>
@@ -3239,7 +3279,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -3290,10 +3330,10 @@
 						<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.openecomp.org.v10.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v10.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v10.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" >
+				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v10.Subnets" />
+				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v10.CtagAssignments" />
+				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v10.SegmentationAssignments" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" >
 					<xml-properties>
 						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
 					</xml-properties>
@@ -3312,7 +3352,7 @@
 		<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.openecomp.org.v10.NetworkPolicy" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v10.NetworkPolicy" />
 			</java-attributes>
 		</java-type>
 		<java-type name="NetworkPolicy">
@@ -3338,7 +3378,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="nameProps" value="network-policy-fqdn" />
@@ -3352,7 +3392,7 @@
 		<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.openecomp.org.v10.CtagAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v10.CtagAssignment" />
 			</java-attributes>
 		</java-type>
 
@@ -3369,7 +3409,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vlan-id-inner" />
@@ -3381,7 +3421,7 @@
 		<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.openecomp.org.v10.Subnet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v10.Subnet" />
 			</java-attributes>
 		</java-type>
 
@@ -3449,7 +3489,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
@@ -3466,7 +3506,7 @@
 			</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.openecomp.org.v10.GenericVnf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v10.GenericVnf" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -3509,9 +3549,10 @@
 				<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="operationalState" name="operational-state" type="java.lang.String">
+				<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>
@@ -3529,6 +3570,7 @@
 				<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="heatStackId" name="heat-stack-id" type="java.lang.String">
@@ -3543,7 +3585,7 @@
 				</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 company or customer" />
+						<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">
@@ -3568,32 +3610,32 @@
 				</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 in some usecases" />
+						<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 in some usecases" />
+						<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 in some usecases" />
+						<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 in some usecases" />
+						<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 in some usecases" />
+						<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 in some usecases" />
+						<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 default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
@@ -3647,6 +3689,7 @@
 					<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>
@@ -3654,6 +3697,7 @@
 					<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>
@@ -3661,7 +3705,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -3714,12 +3758,12 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v10.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.LInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
+				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v10.VfModules" />
+				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v10.Licenses" />
+				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v10.Entitlements" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="General purpose VNF" />
@@ -3730,6 +3774,8 @@
 				<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>
 
@@ -3739,7 +3785,7 @@
 			</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.openecomp.org.v10.VfModule" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v10.VfModule" />
 			</java-attributes>
 		</java-type>
 
@@ -3781,6 +3827,7 @@
 					<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>
@@ -3788,6 +3835,7 @@
 					<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>
@@ -3795,7 +3843,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -3828,7 +3876,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="a deployment unit of VNFCs" />
@@ -3846,7 +3894,7 @@
 			</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.openecomp.org.v10.LagLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v10.LagLink" />
 			</java-attributes>
 		</java-type>
 
@@ -3863,7 +3911,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="LAG links can connect lag-interfaces" />
@@ -3879,7 +3927,7 @@
 			</xml-properties>
 			<xml-root-element name="newvces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.openecomp.org.v10.Newvce" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v10.Newvce" />
 			</java-attributes>
 		</java-type>
 
@@ -3911,7 +3959,7 @@
 						<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="operationalState" name="operational-state" type="java.lang.String">
+				<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>
@@ -3956,8 +4004,8 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v10.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." />
@@ -3976,7 +4024,7 @@
 			</xml-properties>
 			<xml-root-element name="pnfs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v10.Pnf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v10.Pnf" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -4023,7 +4071,7 @@
 				</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 company or customer" />
+						<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">
@@ -4097,12 +4145,12 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v10.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v10.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
+				<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" />
@@ -4117,7 +4165,7 @@
 			</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.openecomp.org.v10.PhysicalLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v10.PhysicalLink" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -4167,7 +4215,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
@@ -4182,7 +4230,7 @@
 		<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.openecomp.org.v10.VigServer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v10.VigServer" />
 			</java-attributes>
 		</java-type>
 
@@ -4209,7 +4257,7 @@
 						<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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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" />
@@ -4222,7 +4270,7 @@
 		<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.openecomp.org.v10.IpsecConfiguration" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v10.IpsecConfiguration" />
 			</java-attributes>
 		</java-type>
 
@@ -4246,7 +4294,7 @@
 				</xml-element>
 				<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer" />
+						<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">
@@ -4271,7 +4319,7 @@
 				</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-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">
@@ -4301,7 +4349,7 @@
 				</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-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">
@@ -4316,7 +4364,7 @@
 				</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, ,nmteHostName" />
+						<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">
@@ -4339,8 +4387,8 @@
 						<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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v10.VigServers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
+				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v10.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" />
@@ -4356,7 +4404,7 @@
 			<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.openecomp.org.v10.NotificationEventHeader" />
+				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v10.NotificationEventHeader" />
 				<xml-any-element java-attribute="entity" />
 			</java-attributes>
 		</java-type>
@@ -4381,8 +4429,8 @@
 		<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.openecomp.org.v10.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v10.EdgePropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v10.ReservedPropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v10.EdgePropNames" />
 			</java-attributes>
 		</java-type>
 		<java-type name="ReservedPropNames">
@@ -4413,11 +4461,10 @@
 				<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="isParent" name="isParent" type="java.lang.Boolean" />
-				<xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-				<xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-				<xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" 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" />
 			</java-attributes>
 		</java-type>
 
@@ -4427,7 +4474,7 @@
 			</xml-properties>
 			<xml-root-element name="models" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v10.Model" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v10.Model" />
 			</java-attributes>
 		</java-type>
 
@@ -4457,8 +4504,8 @@
 						<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.openecomp.org.v10.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
@@ -4466,7 +4513,7 @@
 		<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.openecomp.org.v10.ModelVer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v10.ModelVer" />
 			</java-attributes>
 		</java-type>
 		
@@ -4505,16 +4552,16 @@
 						<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.openecomp.org.v10.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v10.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.ModelElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v10.ModelElement" />
 			</java-attributes>
 		</java-type>
 
@@ -4551,24 +4598,24 @@
 						<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.openecomp.org.v10.ModelElements">
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.ModelConstraints">
+				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.ModelConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v10.ModelConstraint" />
 			</java-attributes>
 		</java-type>
 
@@ -4589,7 +4636,7 @@
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v10.ConstrainedElementSets" />
+				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v10.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." />
@@ -4601,7 +4648,7 @@
 		<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.openecomp.org.v10.ConstrainedElementSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v10.ConstrainedElementSet" />
 			</java-attributes>
 		</java-type>
 
@@ -4624,15 +4671,15 @@
 				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
 				<xml-element java-attribute="checkType" name="check-type" required="true" 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.openecomp.org.v10.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v10.ElementChoiceSets" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.ElementChoiceSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v10.ElementChoiceSet" />
 			</java-attributes>
 		</java-type>
 
@@ -4655,15 +4702,15 @@
 				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" 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.openecomp.org.v10.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v10.ModelElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.NamedQuery" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery" />
 			</java-attributes>
 		</java-type>
 
@@ -4686,15 +4733,15 @@
 				</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.openecomp.org.v10.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.NamedQueryElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v10.NamedQueryElement" />
 			</java-attributes>
 		</java-type>
 
@@ -4718,17 +4765,17 @@
 				<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.openecomp.org.v10.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v10.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v10.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v10.NamedQueryElements" />
+				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v10.RelatedLookups" />
+				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v10.PropertyConstraints" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.RelatedLookup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v10.RelatedLookup" />
 			</java-attributes>
 		</java-type>
 
@@ -4754,14 +4801,14 @@
 				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" 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.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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.openecomp.org.v10.PropertyConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v10.PropertyConstraint" />
 			</java-attributes>
 		</java-type>
 
@@ -4794,9 +4841,9 @@
 			</xml-properties>
 			<xml-root-element name="model-and-named-query-search" />
 			<java-attributes>
-				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v10.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v10.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v10.SecondaryFilts" />
+				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v10.QueryParameters" />
+				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v10.InstanceFilters" />
+				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v10.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>
@@ -4808,8 +4855,8 @@
 			</xml-properties>
 			<xml-root-element name="query-parameters" />
 			<java-attributes>
-				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v10.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v10.OverloadedModel" />
+				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v10.NamedQuery" />
+				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v10.OverloadedModel" />
 			</java-attributes>
 		</java-type>
 
@@ -4859,8 +4906,8 @@
 						<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.openecomp.org.v10.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v10.ModelVers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
@@ -4870,7 +4917,7 @@
 			</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.openecomp.org.v10.InstanceFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v10.InstanceFilter" />
 			</java-attributes>
 		</java-type>
 
@@ -4891,7 +4938,7 @@
 			</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.openecomp.org.v10.SecondaryFilt" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v10.SecondaryFilt" />
 			</java-attributes>
 		</java-type>
 		
@@ -4922,7 +4969,7 @@
 			</xml-properties>
 			<xml-root-element name="response-list" />
 			<java-attributes>
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v10.InventoryResponseItems" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems" />
 			</java-attributes>
 		</java-type>
 
@@ -4933,7 +4980,7 @@
 			</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.openecomp.org.v10.InventoryResponseItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v10.InventoryResponseItem" />
 			</java-attributes>
 		</java-type>
 
@@ -4946,8 +4993,8 @@
 			<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.openecomp.org.v10.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v10.InventoryResponseItems" />
+				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v10.ExtraProperties" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v10.InventoryResponseItems" />
 			</java-attributes>
 		</java-type>
 
@@ -4957,7 +5004,7 @@
 			</xml-properties>
 			<xml-root-element name="extra-properties" />
 			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v10.ExtraProperty" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v10.ExtraProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -4965,7 +5012,7 @@
 			<xml-root-element name="extra-property" />
 			<java-attributes>
 				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-any-element java-attribute="propertyValue" lax="true" name="property-value" />
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
 			</java-attributes>
 		</java-type>
 		
@@ -4975,7 +5022,7 @@
 			</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.openecomp.org.v10.RouteTableReference" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v10.RouteTableReference" />
 			</java-attributes>
 		</java-type>
 		
@@ -4997,7 +5044,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			
 			<xml-properties>
@@ -5016,7 +5063,7 @@
 			</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.openecomp.org.v10.InstanceGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v10.InstanceGroup" />
 			</java-attributes>
 		</java-type>
 		
@@ -5048,13 +5095,14 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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" />
@@ -5068,7 +5116,7 @@
 			</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.openecomp.org.v10.SegmentationAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v10.SegmentationAssignment" />
 			</java-attributes>
 		</java-type>
 				
@@ -5085,7 +5133,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack segmentation assignment." />
@@ -5101,7 +5149,7 @@
 			</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.openecomp.org.v10.AllottedResource" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v10.AllottedResource" />
 			</java-attributes>
 		</java-type>
 		
@@ -5127,6 +5175,7 @@
 					<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>
@@ -5134,6 +5183,7 @@
 					<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>
@@ -5141,7 +5191,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -5169,8 +5219,8 @@
 						<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.openecomp.org.v10.TunnelXconnects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v10.TunnelXconnects" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			
 			<xml-properties>
@@ -5190,7 +5240,7 @@
 			</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.openecomp.org.v10.TunnelXconnect" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v10.TunnelXconnect" />
 			</java-attributes>
 		</java-type>
 		
@@ -5227,7 +5277,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			
 			<xml-properties>
@@ -5246,7 +5296,7 @@
 			</xml-properties>
 			<xml-root-element name="entitlements" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.openecomp.org.v10.Entitlement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v10.Entitlement" />
 			</java-attributes>
 		</java-type>
 				
@@ -5268,7 +5318,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Metadata for entitlement group." />
@@ -5285,7 +5335,7 @@
 			</xml-properties>
 			<xml-root-element name="licenses" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.openecomp.org.v10.License" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v10.License" />
 			</java-attributes>
 		</java-type>
 				
@@ -5307,7 +5357,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Metadata for license group." />
@@ -5341,7 +5391,7 @@
 			</xml-properties>
 			<xml-root-element name="zones" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.openecomp.org.v10.Zone" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v10.Zone" />
 			</java-attributes>
 		</java-type>
 
@@ -5360,7 +5410,7 @@
 				</xml-element>
 				<xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Design of zone [Medium/Large?]" />
+						<xml-property name="description" value="Design of zone [Medium/Large…]" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
@@ -5378,7 +5428,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v10.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" />
@@ -5389,6 +5439,41 @@
 				<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.v10.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" required="true" 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" required="true" 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.v10.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-types>
 </xml-bindings>
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml
index d9e4675..d6bb8d5 100644
--- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml
@@ -21,7 +21,7 @@
 
 <xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v11" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" />
+		<xml-ns namespace-uri="http://org.onap.aai.inventory/v11" />
 	</xml-schema>
 	<java-types>
 		<java-type name="Inventory">
@@ -30,6 +30,7 @@
 				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v11.Search" />
 				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" />
 				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" />
+				<xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v11.LicenseManagement" />
 				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" />
 				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" />
 				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" />
@@ -254,7 +255,7 @@
 			<java-attributes>
 				<xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" 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-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
@@ -292,6 +293,12 @@
 						<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" required="true" 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="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." />
@@ -307,9 +314,11 @@
 				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" />
 				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" />
 				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v11.VipIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList" />
 			</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="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
 				<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" />
@@ -578,6 +587,11 @@
 						<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." />
@@ -589,7 +603,7 @@
 			<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" />
+				<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" />
@@ -739,6 +753,22 @@
 						<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" required="true" 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.v11.Vlans" />
 				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" />
@@ -895,7 +925,7 @@
 			<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" />
+				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
 			</xml-properties>
 		</java-type>
 
@@ -949,7 +979,7 @@
 						<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="vpnId" name="vpn-id" type="java.lang.String">
+				<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>
@@ -964,6 +994,17 @@
 						<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" required="true" 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.v11.RelationshipList" />
 				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
@@ -971,8 +1012,7 @@
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-				<xml-property name="uniqueProps" value="vpn-id" />
+				<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>
@@ -1026,7 +1066,7 @@
 			<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" />
+				<xml-property name="dependentOn" value="vlan,l-interface,vnfc" />
 			</xml-properties>
 		</java-type>
 
@@ -1215,7 +1255,7 @@
 						<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.v11.RelationshipList" />				
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack snapshot" />
@@ -1271,6 +1311,7 @@
 				<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>
@@ -1598,6 +1639,16 @@
 						<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.v11.RelationshipList" />
 				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
 				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
@@ -1676,7 +1727,13 @@
 						<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.v11.RelationshipList" />
+				<xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v11.SriovPfs" />
 				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
@@ -1835,7 +1892,7 @@
 						<xml-property name="description" value="Type of hypervisor.  Source of truth should define valid values." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
+				<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>
@@ -1894,6 +1951,51 @@
 			</xml-properties>
 		</java-type>
 
+		<java-type name="LicenseManagement">
+			<xml-root-element name="license-management" />
+			<java-attributes>
+				<xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v11.LicenseKeyResources" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="LicenseKeyResources">
+			<xml-root-element name="license-key-resources" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v11.LicenseKeyResource" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="LicenseKeyResource">
+			<xml-root-element name="license-key-resource" />
+			<java-attributes>
+				<xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" />
+				<xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" />
+				<xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" />
+				<xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" />
+				<xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" />
+				<xml-element java-attribute="name" name="name" type="java.lang.String" />
+				<xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" />
+				<xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" />
+				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" />
+				<xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" 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>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="OBSOLETE OBJECT:  do not use" />
+				<xml-property name="nameProps" value="name" />
+				<xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" />
+				<xml-property name="uniqueProps" value="att-uuid" />
+				<xml-property name="container" value="license-key-resources" />
+				<xml-property name="namespace" value="license-management" />
+			</xml-properties>
+		</java-type>
+
 		<java-type name="Business">
 			<xml-properties>
 				<xml-property name="description" value="Namespace for business related constructs" />
@@ -1902,7 +2004,45 @@
 			<java-attributes>
 				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v11.Connectors" />
 				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" />
+				<xml-element java-attribute="linesOfBusiness" name="lines-of-business" type="inventory.aai.onap.org.v11.LinesOfBusiness" />
+				<xml-element java-attribute="owningEntities" name="owning-entities" type="inventory.aai.onap.org.v11.OwningEntities" />
+				<xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v11.Platforms" />
+				<xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v11.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.v11.Project" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Project">
+			<xml-root-element name="project" />
+			<java-attributes>
+				<xml-element java-attribute="projectName" name="project-name" required="true" 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.v11.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">
@@ -1932,6 +2072,7 @@
 					<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>
@@ -1939,6 +2080,7 @@
 					<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>
@@ -1946,7 +2088,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -2020,7 +2162,115 @@
 				<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.v11.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" required="true" 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.v11.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.v11.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" required="true" 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" required="true" 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.v11.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.v11.Platform" />
+			</java-attributes>
+		</java-type>
+		
+		<java-type name="Platform">
+			<xml-root-element name="platform" />
+			<java-attributes>
+				<xml-element java-attribute="platformName" name="platform-name" required="true" 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.v11.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." />
@@ -2085,10 +2335,31 @@
 						<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="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>
@@ -2096,6 +2367,7 @@
 					<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>
@@ -2103,7 +2375,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -2146,11 +2418,6 @@
 						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational status of the service-instance." />
-					</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." />
@@ -2177,7 +2444,7 @@
 			</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" />
+				<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" />
@@ -2364,9 +2631,94 @@
 				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" />
 				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" />
 				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" />
+				<xml-element java-attribute="configurations" name="configurations" type="inventory.aai.onap.org.v11.Configurations" />
+			</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="configurations" type="inventory.aai.onap.org.v11.Configuration" />
 			</java-attributes>
 		</java-type>
 
+		<java-type name="Configuration">
+			<xml-root-element name="configuration" />
+			<java-attributes>
+				<xml-element java-attribute="configurationId" name="configuration-id" required="true" 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="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" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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="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.v11.RelationshipList" />
+			</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-properties>
+		</java-type>
+
 		<java-type name="LogicalLinks">
 			<xml-properties>
 				<xml-property name="description" value="Collection of logical connections" />
@@ -2385,6 +2737,12 @@
 						<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" required="true" 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" required="true" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Type of logical link, e.g., evc" />
@@ -2402,7 +2760,7 @@
 				</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-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
@@ -2419,6 +2777,7 @@
 					<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>
@@ -2426,6 +2785,7 @@
 					<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>
@@ -2433,7 +2793,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -2561,7 +2921,6 @@
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="routing-instance-id" />
-				<xml-property name="uniqueProps" value="routing-instance-id" />
 				<xml-property name="dependentOn" value="site-pair-set" />
 				<xml-property name="container" value="routing-instances" />
 			</xml-properties>
@@ -2688,11 +3047,6 @@
 						<xml-property name="description" value="VPN Name" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
-					</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" />
@@ -2703,14 +3057,19 @@
 						<xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
+				<xml-element java-attribute="vpnRegion" name="vpn-region" 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-property name="description" value="region of customer vpn" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="routeTargetRole" name="route-target-role" type="java.lang.String">
+				<xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Role assigned to this route target" />
+						<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">
@@ -2718,6 +3077,7 @@
 						<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.v11.RouteTargets" />
 				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList">
 					<xml-properties>
 						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
@@ -2727,7 +3087,7 @@
 			<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,global-route-target,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" />
@@ -2877,7 +3237,7 @@
 						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
+				<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>
@@ -3080,14 +3440,14 @@
 						<xml-property name="description" value="Unique ID of vnfc." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
+				<xml-element java-attribute="nfcNamingCode" name="nfc-naming-code" required="true" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="function code" />
+						<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="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
+				<xml-element java-attribute="nfcFunction" name="nfc-function" required="true" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="type" />
+						<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">
@@ -3122,15 +3482,31 @@
 						<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.v11.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
+				<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" />
@@ -3222,6 +3598,7 @@
 					<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>
@@ -3229,6 +3606,7 @@
 					<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>
@@ -3236,7 +3614,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -3441,12 +3819,28 @@
 						<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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+				<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.v11.HostRoutes" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />				
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
@@ -3506,9 +3900,10 @@
 				<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="operationalState" name="operational-state" type="java.lang.String">
+				<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>
@@ -3526,6 +3921,7 @@
 				<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="heatStackId" name="heat-stack-id" type="java.lang.String">
@@ -3644,6 +4040,7 @@
 					<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>
@@ -3651,6 +4048,7 @@
 					<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>
@@ -3658,7 +4056,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -3689,6 +4087,7 @@
 				<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">
@@ -3699,6 +4098,7 @@
 				<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">
@@ -3710,7 +4110,27 @@
 					<xml-properties>
 						<xml-property name="description" value="Path to the controller object." />
 					</xml-properties>
-				</xml-element>				
+				</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.v11.RelationshipList" />
 				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
 				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
@@ -3727,6 +4147,8 @@
 				<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>
 
@@ -3778,6 +4200,7 @@
 					<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>
@@ -3785,6 +4208,7 @@
 					<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>
@@ -3792,7 +4216,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -3908,7 +4332,7 @@
 						<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="operationalState" name="operational-state" type="java.lang.String">
+				<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>
@@ -4158,6 +4582,26 @@
 					<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>
@@ -4268,7 +4712,7 @@
 				</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-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">
@@ -4298,7 +4742,7 @@
 				</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-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">
@@ -4410,11 +4854,10 @@
 				<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="isParent" name="isParent" type="java.lang.Boolean" />
-				<xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-				<xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-				<xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" 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" />
 			</java-attributes>
 		</java-type>
 
@@ -4954,7 +5397,7 @@
 			</xml-properties>
 			<xml-root-element name="extra-properties" />
 			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.ExtraProperty" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.ExtraProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -4962,7 +5405,7 @@
 			<xml-root-element name="extra-property" />
 			<java-attributes>
 				<xml-element java-attribute="propertyName" name="property-name" type="java.lang.String" />
-				<xml-any-element java-attribute="propertyValue" lax="true" name="property-value" />
+				<xml-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
 			</java-attributes>
 		</java-type>
 		
@@ -5020,6 +5463,23 @@
 		<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" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
 						<xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
@@ -5052,6 +5512,7 @@
 				<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" />
@@ -5124,6 +5585,7 @@
 					<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>
@@ -5131,6 +5593,7 @@
 					<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>
@@ -5138,7 +5601,7 @@
 					<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="dataLocation" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+						<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">
@@ -5357,7 +5820,7 @@
 				</xml-element>
 				<xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Design of zone [Medium/Large?]" />
+						<xml-property name="description" value="Design of zone [Medium/Large…]" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
@@ -5386,6 +5849,220 @@
 				<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.v11.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" required="true" 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" required="true" 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.v11.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.v11.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" required="true" 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.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.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" required="true" 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.v11.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" required="true" 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.v11.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-types>
 </xml-bindings>
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml
index fd476cd..a3fe382 100644
--- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v8" xml-mapping-metadata-complete="true">
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v8" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
 		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v8" />
 	</xml-schema>
@@ -27,37 +27,38 @@
 		<java-type name="Inventory">
 			<xml-root-element name="inventory" />
 			<java-attributes>
-				<xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v8.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v8.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v8.CloudInfrastructure" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v8.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v8.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v8.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v8.AaiInternal" />
+				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v8.Search" />
+				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v8.Actions" />
+				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v8.CloudInfrastructure" />
+				<xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v8.LicenseManagement" />
+				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v8.Business" />
+				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v8.ServiceDesignAndCreation" />
+				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v8.Network" />
+				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v8.AaiInternal" />
 			</java-attributes>
 		</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.openecomp.org.v8.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v8.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v8.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v8.SdnZoneResponse" />
+				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v8.EdgeTagQueryResult" />
+				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v8.EdgeTagQueryRequest" />
+				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v8.SearchResults" />
+				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.InventoryItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v8.InventoryItem" />
 			</java-attributes>
 		</java-type>
 
@@ -66,8 +67,8 @@
 			<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.openecomp.org.v8.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v8.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v8.InventoryItemData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v8.TaggedInventoryItemList" />
 			</java-attributes>
 		</java-type>
 
@@ -85,9 +86,9 @@
 				<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.openecomp.org.v8.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v8.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v8.SecondaryFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v8.StartNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v8.IncludeNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v8.SecondaryFilter" />
 			</java-attributes>
 		</java-type>
 
@@ -118,7 +119,7 @@
 		<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.openecomp.org.v8.ResultData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v8.ResultData" />
 			</java-attributes>
 		</java-type>
 
@@ -141,16 +142,16 @@
 		<java-type name="SdnZoneResponse">
 			<xml-root-element name="sdn-zone-response" />
 			<java-attributes>
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v8.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v8.AzAndDvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v8.OamNetworks" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v8.AvailabilityZone" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v8.DvsSwitches" />
+				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v8.AvailabilityZone" />
 			</java-attributes>
 		</java-type>
 
@@ -160,8 +161,8 @@
 			</xml-properties>
 			<xml-root-element name="actions" />
 			<java-attributes>
-				<xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v8.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v8.Notify" />
+				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v8.Update" />
+				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v8.Notify" />
 			</java-attributes>
 		</java-type>
 
@@ -172,9 +173,9 @@
 			<xml-root-element name="update" />
 			<java-attributes>
 				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v8.UpdateNodeKey" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.Action" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v8.Action" />
 			</java-attributes>
 		</java-type>
 
@@ -182,7 +183,7 @@
 			<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.openecomp.org.v8.ActionData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v8.ActionData" />
 			</java-attributes>
 		</java-type>
 
@@ -208,7 +209,7 @@
 				<xml-element java-attribute="eventId" name="event-id" required="true" 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.openecomp.org.v8.KeyData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v8.KeyData" />
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
 			</java-attributes>
 		</java-type>
@@ -227,18 +228,18 @@
 			</xml-properties>
 			<xml-root-element name="cloud-infrastructure" />
 			<java-attributes>
-				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.openecomp.org.v8.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v8.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v8.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v8.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v8.VirtualDataCenters" />
+				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v8.Complexes" />
+				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v8.CloudRegions" />
+				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v8.NetworkProfiles" />
+				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v8.Pservers" />
+				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v8.VirtualDataCenters" />
 			</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.openecomp.org.v8.CloudRegion" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v8.CloudRegion" />
 			</java-attributes>
 		</java-type>
 
@@ -247,7 +248,7 @@
 			<java-attributes>
 				<xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" 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-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
@@ -290,19 +291,19 @@
 						<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.openecomp.org.v8.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v8.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v8.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v8.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v8.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v8.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v8.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v8.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v8.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v8.VolumeGroups" />
+				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v8.Tenants" />
+				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v8.Flavors" />
+				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v8.GroupAssignments" />
+				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v8.Snapshots" />
+				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v8.Images" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v8.DvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v8.OamNetworks" />
+				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v8.AvailabilityZones" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</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="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
 				<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" />
@@ -315,7 +316,7 @@
 			</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.openecomp.org.v8.VolumeGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v8.VolumeGroup" />
 			</java-attributes>
 		</java-type>
 
@@ -352,7 +353,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Persistent block-level storage." />
@@ -365,7 +366,7 @@
 		<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.openecomp.org.v8.Relationship" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v8.Relationship" />
 			</java-attributes>
 		</java-type>
 
@@ -382,8 +383,8 @@
 						<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.openecomp.org.v8.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v8.RelatedToProperty" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v8.RelationshipData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v8.RelatedToProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -425,7 +426,7 @@
 			</xml-properties>
 			<xml-root-element name="complexes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.openecomp.org.v8.Complex" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v8.Complex" />
 			</java-attributes>
 		</java-type>
 
@@ -473,8 +474,8 @@
 				<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.openecomp.org.v8.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v8.CtagPools" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
@@ -489,7 +490,7 @@
 		<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.openecomp.org.v8.CtagPool" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v8.CtagPool" />
 			</java-attributes>
 		</java-type>
 
@@ -521,7 +522,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
@@ -537,7 +538,7 @@
 			</xml-properties>
 			<xml-root-element name="tenants" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v8.Tenant" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v8.Tenant" />
 			</java-attributes>
 		</java-type>
 
@@ -559,8 +560,8 @@
 						<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.openecomp.org.v8.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v8.Vservers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack tenant" />
@@ -577,7 +578,7 @@
 			</xml-properties>
 			<xml-root-element name="vservers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v8.Vserver" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v8.Vserver" />
 			</java-attributes>
 		</java-type>
 
@@ -626,9 +627,9 @@
 						<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.openecomp.org.v8.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+				<xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v8.Volumes" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
@@ -646,7 +647,7 @@
 			</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.openecomp.org.v8.LInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v8.LInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -698,11 +699,11 @@
 						<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="vlans" name="vlans" type="inventory.aai.openecomp.org.v8.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v8.SriovVfs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv6AddressList" />
+				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v8.Vlans" />
+				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v8.SriovVfs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
@@ -718,7 +719,7 @@
 			</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.openecomp.org.v8.SriovVf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v8.SriovVf" />
 			</java-attributes>
 		</java-type>
 		<java-type name="SriovVf">
@@ -794,7 +795,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
@@ -847,7 +848,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPv4 Address Range" />
@@ -859,7 +860,7 @@
 		<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.openecomp.org.v8.Vlan" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v8.Vlan" />
 			</java-attributes>
 		</java-type>
 
@@ -906,19 +907,18 @@
 						<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="vpnId" name="vpn-id" type="java.lang.String">
+				<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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v8.L3InterfaceIpv6AddressList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v8.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-				<xml-property name="uniqueProps" value="vpn-id" />
+				<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>
@@ -967,7 +967,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPv6 Address Range" />
@@ -982,7 +982,7 @@
 			</xml-properties>
 			<xml-root-element name="volumes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v8.Volume" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v8.Volume" />
 			</java-attributes>
 		</java-type>
 
@@ -1004,7 +1004,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Ephemeral Block storage volume." />
@@ -1020,7 +1020,7 @@
 			</xml-properties>
 			<xml-root-element name="flavors" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v8.Flavor" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v8.Flavor" />
 			</java-attributes>
 		</java-type>
 
@@ -1082,7 +1082,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack flavor." />
@@ -1099,7 +1099,7 @@
 			</xml-properties>
 			<xml-root-element name="snapshots" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v8.Snapshot" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v8.Snapshot" />
 			</java-attributes>		
 		</java-type>
 		
@@ -1161,7 +1161,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />				
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack snapshot" />
@@ -1179,7 +1179,7 @@
 			</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.openecomp.org.v8.GroupAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v8.GroupAssignment" />
 			</java-attributes>
 		</java-type>
 		
@@ -1211,7 +1211,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
@@ -1228,7 +1228,7 @@
 			</xml-properties>
 			<xml-root-element name="images" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v8.Image" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v8.Image" />
 			</java-attributes>
 		</java-type>
 
@@ -1285,8 +1285,8 @@
 						<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.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack image." />
@@ -1303,7 +1303,7 @@
 			</xml-properties>
 			<xml-root-element name="metadata" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v8.Metadatum" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v8.Metadatum" />
 			</java-attributes>
 		</java-type>
 
@@ -1332,7 +1332,7 @@
 			</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.openecomp.org.v8.DvsSwitch" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v8.DvsSwitch" />
 			</java-attributes>
 		</java-type>
 
@@ -1354,7 +1354,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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. " />
@@ -1370,7 +1370,7 @@
 			</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.openecomp.org.v8.NetworkProfile" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v8.NetworkProfile" />
 			</java-attributes>
 		</java-type>
 
@@ -1392,7 +1392,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
@@ -1408,7 +1408,7 @@
 			</xml-properties>
 			<xml-root-element name="pservers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v8.Pserver" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v8.Pserver" />
 			</java-attributes>
 		</java-type>
 
@@ -1506,9 +1506,9 @@
 						<xml-property name="description" value="purpose of pserver" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.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." />
@@ -1526,7 +1526,7 @@
 			</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.openecomp.org.v8.PInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v8.PInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -1573,8 +1573,8 @@
 						<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.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Physical interface (e.g., nic)" />
@@ -1590,7 +1590,7 @@
 			</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.openecomp.org.v8.LagInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v8.LagInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -1617,8 +1617,8 @@
 						<xml-property name="description" value="Captures the units corresponding to the speed" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Link aggregate interface" />
@@ -1634,7 +1634,7 @@
 			</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.openecomp.org.v8.OamNetwork" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v8.OamNetwork" />
 			</java-attributes>
 		</java-type>
 
@@ -1671,7 +1671,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
@@ -1688,7 +1688,7 @@
 			</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.openecomp.org.v8.AvailabilityZone" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v8.AvailabilityZone" />
 			</java-attributes>
 		</java-type>
 
@@ -1708,6 +1708,7 @@
 				<xml-element java-attribute="operationalState" name="operational-state" 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-property name="dbAlias" value="operational-status" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -1715,7 +1716,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
@@ -1731,7 +1732,7 @@
 			</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.openecomp.org.v8.VirtualDataCenter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v8.VirtualDataCenter" />
 			</java-attributes>
 		</java-type>
 
@@ -1753,7 +1754,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
@@ -1764,8 +1765,49 @@
 			</xml-properties>
 		</java-type>
 
+		<java-type name="LicenseManagement">
+			<xml-root-element name="license-management" />
+			<java-attributes>
+				<xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v8.LicenseKeyResources" />
+			</java-attributes>
+		</java-type>
 
+		<java-type name="LicenseKeyResources">
+			<xml-root-element name="license-key-resources" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v8.LicenseKeyResource" />
+			</java-attributes>
+		</java-type>
 
+		<java-type name="LicenseKeyResource">
+			<xml-root-element name="license-key-resource" />
+			<java-attributes>
+				<xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" />
+				<xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" />
+				<xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" />
+				<xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" />
+				<xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" />
+				<xml-element java-attribute="name" name="name" type="java.lang.String" />
+				<xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" />
+				<xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" />
+				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" />
+				<xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" 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>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="nameProps" value="name" />
+				<xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" />
+				<xml-property name="uniqueProps" value="att-uuid" />
+				<xml-property name="container" value="license-key-resources" />
+				<xml-property name="namespace" value="license-management" />
+			</xml-properties>
+		</java-type>
 
 		<java-type name="Business">
 			<xml-properties>
@@ -1773,8 +1815,8 @@
 			</xml-properties>
 			<xml-root-element name="business" />
 			<java-attributes>
-				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.openecomp.org.v8.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v8.Customers" />
+				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v8.Connectors" />
+				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v8.Customers" />
 			</java-attributes>
 		</java-type>
 
@@ -1784,7 +1826,7 @@
 			</xml-properties>
 			<xml-root-element name="connectors" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.openecomp.org.v8.Connector" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v8.Connector" />
 			</java-attributes>
 		</java-type>
 
@@ -1805,6 +1847,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -1812,6 +1855,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -1819,7 +1863,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -1832,8 +1876,8 @@
 						<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.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
@@ -1849,7 +1893,7 @@
 			</xml-properties>
 			<xml-root-element name="customers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v8.Customer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v8.Customer" />
 			</java-attributes>
 		</java-type>
 
@@ -1877,8 +1921,8 @@
 						<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.openecomp.org.v8.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v8.ServiceSubscriptions" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
@@ -1897,7 +1941,7 @@
 			</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.openecomp.org.v8.ServiceSubscription" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v8.ServiceSubscription" />
 			</java-attributes>
 		</java-type>
 
@@ -1919,9 +1963,9 @@
 						<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.openecomp.org.v8.ServiceInstances">
+				<xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v8.ServiceInstances">
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Object that group service instances." />
@@ -1937,7 +1981,7 @@
 			</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.openecomp.org.v8.ServiceInstance" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v8.ServiceInstance" />
 			</java-attributes>
 		</java-type>
 
@@ -1958,6 +2002,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -1965,6 +2010,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -1972,7 +2018,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -2015,11 +2061,6 @@
 						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational status of the service-instance." />
-					</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." />
@@ -2030,8 +2071,8 @@
 						<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.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Instance of a service" />
@@ -2050,11 +2091,11 @@
 			</xml-properties>
 			<xml-root-element name="service-design-and-creation" />
 			<java-attributes>
-				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.openecomp.org.v8.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v8.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v8.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v8.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v8.NamedQueries" />
+				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v8.VnfImages" />
+				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v8.Services" />
+				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v8.ServiceCapabilities" />
+				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v8.Models" />
+				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v8.NamedQueries" />
 			</java-attributes>
 		</java-type>
 
@@ -2064,16 +2105,17 @@
 			</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.openecomp.org.v8.VnfImage" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v8.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" required="true" type="java.lang.String" xml-key="true">
+				<xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
 						<xml-property name="description" value="Unique ID of this asset" />
+						<xml-property name="dbAlias" value="vnf-image-uuid" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
@@ -2101,12 +2143,12 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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="indexedProps" value="application,att-uuid,application-vendor,application-version" />
+				<xml-property name="uniqueProps" value="att-uuid" />
 				<xml-property name="container" value="vnf-images" />
 				<xml-property name="namespace" value="service-design-and-creation" />
 			</xml-properties>
@@ -2118,7 +2160,7 @@
 			</xml-properties>
 			<xml-root-element name="services" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v8.Service" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v8.Service" />
 			</java-attributes>
 		</java-type>
 
@@ -2150,7 +2192,7 @@
 						<xml-property name="description" value="service version" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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." />
@@ -2166,7 +2208,7 @@
 			</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.openecomp.org.v8.ServiceCapability" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v8.ServiceCapability" />
 			</java-attributes>
 		</java-type>
 
@@ -2188,7 +2230,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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." />
@@ -2204,22 +2246,22 @@
 			</xml-properties>
 			<xml-root-element name="network" />
 			<java-attributes>
-				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v8.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v8.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v8.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v8.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v8.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v8.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v8.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v8.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v8.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v8.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v8.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v8.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v8.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v8.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v8.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v8.RouteTableReferences" />
+				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v8.LogicalLinks" />
+				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v8.SitePairSets" />
+				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v8.VpnBindings" />
+				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v8.VplsPes" />
+				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v8.MulticastConfigurations" />
+				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v8.Vces" />
+				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v8.Vnfcs" />
+				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v8.L3Networks" />
+				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v8.NetworkPolicies" />
+				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v8.GenericVnfs" />
+				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v8.LagLinks" />
+				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v8.Newvces" />
+				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v8.Pnfs" />
+				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v8.PhysicalLinks" />
+				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v8.IpsecConfigurations" />
+				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v8.RouteTableReferences" />
 			</java-attributes>
 		</java-type>
 
@@ -2229,7 +2271,7 @@
 			</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.openecomp.org.v8.LogicalLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v8.LogicalLink" />
 			</java-attributes>
 		</java-type>
 
@@ -2258,7 +2300,7 @@
 				</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-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
@@ -2275,6 +2317,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -2282,6 +2325,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -2289,7 +2333,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -2322,7 +2366,7 @@
 						<xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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" />
@@ -2339,7 +2383,7 @@
 			</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.openecomp.org.v8.SitePairSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v8.SitePairSet" />
 			</java-attributes>
 		</java-type>
 
@@ -2356,8 +2400,8 @@
 						<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.openecomp.org.v8.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v8.RoutingInstances" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
@@ -2374,7 +2418,7 @@
 			</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.openecomp.org.v8.RoutingInstance" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v8.RoutingInstance" />
 			</java-attributes>
 		</java-type>
 
@@ -2396,8 +2440,8 @@
 						<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.openecomp.org.v8.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v8.SitePairs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="routing-instance-id" />
@@ -2413,7 +2457,7 @@
 			</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.openecomp.org.v8.SitePair" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v8.SitePair" />
 			</java-attributes>
 		</java-type>
 
@@ -2447,7 +2491,7 @@
 				</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, etc." />
+						<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">
@@ -2455,8 +2499,8 @@
 						<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.openecomp.org.v8.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v8.ClassesOfService" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="site-pair-id" />
@@ -2472,7 +2516,7 @@
 			</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.openecomp.org.v8.ClassOfService" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v8.ClassOfService" />
 			</java-attributes>
 		</java-type>
 
@@ -2499,7 +2543,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="cos" />
@@ -2511,7 +2555,7 @@
 		<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.openecomp.org.v8.VpnBinding" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v8.VpnBinding" />
 			</java-attributes>
 		</java-type>
 
@@ -2543,7 +2587,7 @@
 						<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.openecomp.org.v8.RelationshipList">
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList">
 					<xml-properties>
 						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
 					</xml-properties>
@@ -2565,7 +2609,7 @@
 			</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.openecomp.org.v8.VplsPe" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v8.VplsPe" />
 			</java-attributes>
 		</java-type>
 
@@ -2598,9 +2642,9 @@
 						<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.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="VPLS Provider Edge routers." />
@@ -2616,7 +2660,7 @@
 			</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.openecomp.org.v8.MulticastConfiguration" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v8.MulticastConfiguration" />
 			</java-attributes>
 		</java-type>
 
@@ -2643,7 +2687,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="multicast-configuration-id" />
@@ -2659,7 +2703,7 @@
 			</xml-properties>
 			<xml-root-element name="vces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.openecomp.org.v8.Vce" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v8.Vce" />
 			</java-attributes>
 		</java-type>
 
@@ -2704,6 +2748,7 @@
 				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
+						<xml-property name="dbAlias" value="operational-status" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
@@ -2761,8 +2806,8 @@
 						<xml-property name="description" value="Entitlement resource uuid" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.openecomp.org.v8.PortGroups" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v8.PortGroups" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
@@ -2779,7 +2824,7 @@
 		<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.openecomp.org.v8.PortGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v8.PortGroup" />
 			</java-attributes>
 		</java-type>
 
@@ -2841,8 +2886,8 @@
 						<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.openecomp.org.v8.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v8.CvlanTags" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
@@ -2856,7 +2901,7 @@
 		<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.openecomp.org.v8.CvlanTagEntry" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v8.CvlanTagEntry" />
 			</java-attributes>
 		</java-type>
 
@@ -2873,7 +2918,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="dependentOn" value="port-group" />
@@ -2890,7 +2935,7 @@
 			</xml-properties>
 			<xml-root-element name="vnfcs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v8.Vnfc" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v8.Vnfc" />
 			</java-attributes>
 		</java-type>
 
@@ -2949,7 +2994,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
@@ -2961,7 +3006,7 @@
 		<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.openecomp.org.v8.L3Network" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v8.L3Network" />
 			</java-attributes>
 		</java-type>
 
@@ -3043,6 +3088,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -3050,6 +3096,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -3057,7 +3104,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -3093,10 +3140,10 @@
 						<xml-property name="description" value="boolean indicatating whether or not network is an external network." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.openecomp.org.v8.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v8.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v8.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" >
+				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v8.Subnets" />
+				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v8.CtagAssignments" />
+				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v8.SegmentationAssignments" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" >
 					<xml-properties>
 						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
 					</xml-properties>
@@ -3114,7 +3161,7 @@
 		<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.openecomp.org.v8.NetworkPolicy" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v8.NetworkPolicy" />
 			</java-attributes>
 		</java-type>
 		<java-type name="NetworkPolicy">
@@ -3140,7 +3187,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="nameProps" value="network-policy-fqdn" />
@@ -3153,7 +3200,7 @@
 		<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.openecomp.org.v8.CtagAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v8.CtagAssignment" />
 			</java-attributes>
 		</java-type>
 
@@ -3170,7 +3217,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vlan-id-inner" />
@@ -3182,7 +3229,7 @@
 		<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.openecomp.org.v8.Subnet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v8.Subnet" />
 			</java-attributes>
 		</java-type>
 
@@ -3250,7 +3297,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
@@ -3267,7 +3314,7 @@
 			</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.openecomp.org.v8.GenericVnf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v8.GenericVnf" />
 			</java-attributes>
 		</java-type>
 
@@ -3312,6 +3359,7 @@
 				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
+						<xml-property name="dbAlias" value="operational-status" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
@@ -3341,7 +3389,7 @@
 				</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 company or customer" />
+						<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">
@@ -3421,30 +3469,11 @@
 						<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" />
-					</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" />
-					</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" />
-					</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" />
-					</xml-properties>
-				</xml-element>
 				<xml-element java-attribute="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -3452,6 +3481,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -3459,7 +3489,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -3482,10 +3512,10 @@
 						<xml-property name="description" value="represents sub zone of the rr plane" />
 					</xml-properties>
 				</xml-element>					
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v8.VfModules" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.LInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
+				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v8.VfModules" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="General purpose VNF" />
@@ -3505,7 +3535,7 @@
 			</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.openecomp.org.v8.VfModule" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v8.VfModule" />
 			</java-attributes>
 		</java-type>
 
@@ -3547,6 +3577,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -3554,6 +3585,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -3561,7 +3593,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -3579,7 +3611,7 @@
 						<xml-property name="description" value="the Contrail unique ID for a service-instance" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="a deployment unit of VNFCs" />
@@ -3596,7 +3628,7 @@
 			</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.openecomp.org.v8.LagLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v8.LagLink" />
 			</java-attributes>
 		</java-type>
 
@@ -3613,7 +3645,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="LAG links can connect lag-interfaces" />
@@ -3629,7 +3661,7 @@
 			</xml-properties>
 			<xml-root-element name="newvces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.openecomp.org.v8.Newvce" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v8.Newvce" />
 			</java-attributes>
 		</java-type>
 
@@ -3664,6 +3696,7 @@
 				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
+						<xml-property name="dbAlias" value="operational-status" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
@@ -3706,8 +3739,8 @@
 						<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.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v8.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v8.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." />
@@ -3726,7 +3759,7 @@
 			</xml-properties>
 			<xml-root-element name="pnfs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v8.Pnf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v8.Pnf" />
 			</java-attributes>
 		</java-type>
 
@@ -3770,7 +3803,7 @@
 				</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 company or customer" />
+						<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">
@@ -3804,12 +3837,12 @@
 						<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.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v8.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v8.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v8.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
+				<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" />
 				<xml-property name="uniqueProps" value="pnf-name" />
 				<xml-property name="container" value="pnfs" />
@@ -3823,7 +3856,7 @@
 			</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.openecomp.org.v8.PhysicalLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v8.PhysicalLink" />
 			</java-attributes>
 		</java-type>
 
@@ -3870,7 +3903,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
@@ -3884,7 +3917,7 @@
 		<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.openecomp.org.v8.VigServer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v8.VigServer" />
 			</java-attributes>
 		</java-type>
 
@@ -3911,7 +3944,7 @@
 						<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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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" />
@@ -3924,7 +3957,7 @@
 		<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.openecomp.org.v8.IpsecConfiguration" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v8.IpsecConfiguration" />
 			</java-attributes>
 		</java-type>
 
@@ -3948,7 +3981,7 @@
 				</xml-element>
 				<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer" />
+						<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">
@@ -3973,7 +4006,7 @@
 				</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-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">
@@ -4003,7 +4036,7 @@
 				</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-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">
@@ -4018,7 +4051,7 @@
 				</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, ,nmteHostName" />
+						<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">
@@ -4041,8 +4074,8 @@
 						<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.openecomp.org.v8.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v8.VigServers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
+				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v8.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" />
@@ -4058,7 +4091,7 @@
 			<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.openecomp.org.v8.NotificationEventHeader" />
+				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v8.NotificationEventHeader" />
 				<xml-any-element java-attribute="entity" />
 			</java-attributes>
 		</java-type>
@@ -4083,8 +4116,8 @@
 		<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.openecomp.org.v8.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v8.EdgePropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v8.ReservedPropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v8.EdgePropNames" />
 			</java-attributes>
 		</java-type>
 		<java-type name="ReservedPropNames">
@@ -4114,11 +4147,10 @@
 				<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="isParent" name="isParent" type="java.lang.Boolean" />
-				<xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-				<xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-				<xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" 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" />
 			</java-attributes>
 		</java-type>
 
@@ -4128,7 +4160,7 @@
 			</xml-properties>
 			<xml-root-element name="models" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v8.Model" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v8.Model" />
 			</java-attributes>
 		</java-type>
 
@@ -4179,16 +4211,16 @@
 						<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.openecomp.org.v8.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v8.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v8.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.ModelElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v8.ModelElement" />
 			</java-attributes>
 		</java-type>
 
@@ -4225,24 +4257,24 @@
 						<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.openecomp.org.v8.ModelElements">
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.ModelConstraints">
+				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.ModelConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v8.ModelConstraint" />
 			</java-attributes>
 		</java-type>
 
@@ -4263,14 +4295,14 @@
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v8.ConstrainedElementSets" />
+				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v8.ConstrainedElementSets" />
 			</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.openecomp.org.v8.ConstrainedElementSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v8.ConstrainedElementSet" />
 			</java-attributes>
 		</java-type>
 
@@ -4293,15 +4325,15 @@
 				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
 				<xml-element java-attribute="checkType" name="check-type" required="true" 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.openecomp.org.v8.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v8.ElementChoiceSets" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.ElementChoiceSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v8.ElementChoiceSet" />
 			</java-attributes>
 		</java-type>
 
@@ -4324,15 +4356,15 @@
 				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" 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.openecomp.org.v8.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v8.ModelElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.NamedQuery" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v8.NamedQuery" />
 			</java-attributes>
 		</java-type>
 
@@ -4355,15 +4387,15 @@
 				</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.openecomp.org.v8.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v8.NamedQueryElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.NamedQueryElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v8.NamedQueryElement" />
 			</java-attributes>
 		</java-type>
 
@@ -4387,17 +4419,17 @@
 				<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.openecomp.org.v8.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v8.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v8.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v8.NamedQueryElements" />
+				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v8.RelatedLookups" />
+				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v8.PropertyConstraints" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.RelatedLookup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v8.RelatedLookup" />
 			</java-attributes>
 		</java-type>
 
@@ -4423,14 +4455,14 @@
 				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" 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.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.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.openecomp.org.v8.PropertyConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v8.PropertyConstraint" />
 			</java-attributes>
 		</java-type>
 
@@ -4463,8 +4495,8 @@
 			</xml-properties>
 			<xml-root-element name="model-and-named-query-search" />
 			<java-attributes>
-				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v8.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v8.InstanceFilters" />
+				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v8.QueryParameters" />
+				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v8.InstanceFilters" />
 				<xml-element java-attribute="topNodeType"     name="top-node-type"    type="java.lang.String" />
 			</java-attributes>
 		</java-type>
@@ -4475,8 +4507,8 @@
 			</xml-properties>
 			<xml-root-element name="query-parameters" />
 			<java-attributes>
-				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v8.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v8.Model" />
+				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v8.NamedQuery" />
+				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v8.Model" />
 			</java-attributes>
 		</java-type>
 
@@ -4486,7 +4518,7 @@
 			</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.openecomp.org.v8.InstanceFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v8.InstanceFilter" />
 			</java-attributes>
 		</java-type>
 
@@ -4518,7 +4550,7 @@
 			</xml-properties>
 			<xml-root-element name="response-list" />
 			<java-attributes>
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v8.InventoryResponseItems" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v8.InventoryResponseItems" />
 			</java-attributes>
 		</java-type>
 
@@ -4529,7 +4561,7 @@
 			</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.openecomp.org.v8.InventoryResponseItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v8.InventoryResponseItem" />
 			</java-attributes>
 		</java-type>
 
@@ -4542,8 +4574,8 @@
 			<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.openecomp.org.v8.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v8.InventoryResponseItems" />
+				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v8.ExtraProperties" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v8.InventoryResponseItems" />
 			</java-attributes>
 		</java-type>
 
@@ -4553,7 +4585,7 @@
 			</xml-properties>
 			<xml-root-element name="extra-properties" />
 			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v8.ExtraProperty" />
+				<xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v8.ExtraProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -4571,7 +4603,7 @@
 			</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.openecomp.org.v8.RouteTableReference" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v8.RouteTableReference" />
 			</java-attributes>
 		</java-type>
 		
@@ -4593,7 +4625,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			
 			<xml-properties>
@@ -4612,7 +4644,7 @@
 			</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.openecomp.org.v8.SegmentationAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v8.SegmentationAssignment" />
 			</java-attributes>
 		</java-type>
 				
@@ -4629,7 +4661,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack segmentation assignment." />
diff --git a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml
index 7c4d401..3c02b8a 100644
--- a/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml
@@ -19,7 +19,7 @@
   ============LICENSE_END=========================================================
   -->
 
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.openecomp.org.v9" xml-mapping-metadata-complete="true">
+<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v9" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
 		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9" />
 	</xml-schema>
@@ -27,14 +27,15 @@
 		<java-type name="Inventory">
 			<xml-root-element name="inventory" />
 			<java-attributes>
-				<xml-element java-attribute="search" name="search" type="inventory.aai.openecomp.org.v9.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v9.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v9.CloudInfrastructure" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v9.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v9.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v9.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v9.AaiInternal" />
-				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v9.Nodes"/>
+				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v9.Search" />
+				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v9.Actions" />
+				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v9.CloudInfrastructure" />
+				<xml-element java-attribute="licenseManagement" name="license-management" type="inventory.aai.onap.org.v9.LicenseManagement" />
+				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v9.Business" />
+				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v9.ServiceDesignAndCreation" />
+				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v9.Network" />
+				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v9.AaiInternal" />
+				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v9.Nodes"/>
 			</java-attributes>
 		</java-type>
 
@@ -44,24 +45,24 @@
 		<java-type name="Search">
 			<xml-root-element name="search" />
 			<java-attributes>
-				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.openecomp.org.v9.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v9.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v9.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v9.SdnZoneResponse" />
+				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v9.EdgeTagQueryResult" />
+				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v9.EdgeTagQueryRequest" />
+				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v9.SearchResults" />
+				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.InventoryItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v9.InventoryItem" />
 			</java-attributes>
 		</java-type>
 
@@ -70,8 +71,8 @@
 			<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.openecomp.org.v9.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v9.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v9.InventoryItemData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v9.TaggedInventoryItemList" />
 			</java-attributes>
 		</java-type>
 
@@ -89,9 +90,9 @@
 				<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.openecomp.org.v9.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v9.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v9.SecondaryFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v9.StartNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v9.IncludeNodeFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v9.SecondaryFilter" />
 			</java-attributes>
 		</java-type>
 
@@ -122,7 +123,7 @@
 		<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.openecomp.org.v9.ResultData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v9.ResultData" />
 			</java-attributes>
 		</java-type>
 
@@ -145,16 +146,16 @@
 		<java-type name="SdnZoneResponse">
 			<xml-root-element name="sdn-zone-response" />
 			<java-attributes>
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v9.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v9.AzAndDvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v9.AvailabilityZone" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches" />
+				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone" />
 			</java-attributes>
 		</java-type>
 
@@ -164,8 +165,8 @@
 			</xml-properties>
 			<xml-root-element name="actions" />
 			<java-attributes>
-				<xml-element java-attribute="update" name="update" type="inventory.aai.openecomp.org.v9.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v9.Notify" />
+				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v9.Update" />
+				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v9.Notify" />
 			</java-attributes>
 		</java-type>
 
@@ -176,9 +177,9 @@
 			<xml-root-element name="update" />
 			<java-attributes>
 				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v9.UpdateNodeKey" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.Action" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v9.Action" />
 			</java-attributes>
 		</java-type>
 
@@ -186,7 +187,7 @@
 			<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.openecomp.org.v9.ActionData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v9.ActionData" />
 			</java-attributes>
 		</java-type>
 
@@ -212,7 +213,7 @@
 				<xml-element java-attribute="eventId" name="event-id" required="true" 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.openecomp.org.v9.KeyData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v9.KeyData" />
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
 			</java-attributes>
 		</java-type>
@@ -231,18 +232,18 @@
 			</xml-properties>
 			<xml-root-element name="cloud-infrastructure" />
 			<java-attributes>
-				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.openecomp.org.v9.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v9.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v9.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v9.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v9.VirtualDataCenters" />
+				<xml-element java-attribute="complexes" name="complexes" type="inventory.aai.onap.org.v9.Complexes" />
+				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v9.CloudRegions" />
+				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v9.NetworkProfiles" />
+				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v9.Pservers" />
+				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v9.VirtualDataCenters" />
 			</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.openecomp.org.v9.CloudRegion" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="cloudRegion" name="cloud-region" type="inventory.aai.onap.org.v9.CloudRegion" />
 			</java-attributes>
             <xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -254,7 +255,7 @@
 			<java-attributes>
 				<xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" 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-property name="description" value="Identifies the vendor and cloud name, e.g., att-aic. First part of composite key should be formatted as vendor-cloudname" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cloudRegionId" name="cloud-region-id" required="true" type="java.lang.String" xml-key="true">
@@ -297,19 +298,19 @@
 						<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.openecomp.org.v9.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v9.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v9.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v9.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v9.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v9.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v9.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v9.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v9.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="volumeGroups" name="volume-groups" type="inventory.aai.onap.org.v9.VolumeGroups" />
+				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v9.Tenants" />
+				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v9.Flavors" />
+				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v9.GroupAssignments" />
+				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v9.Snapshots" />
+				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v9.Images" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v9.DvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v9.OamNetworks" />
+				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v9.AvailabilityZones" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</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="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. In AT&amp;Ts AIC cloud, this could be an LCP or DCP. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname and we will use att-aic for AT&amp;T's AIC." />
 				<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" />
@@ -322,7 +323,7 @@
 			</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.openecomp.org.v9.VolumeGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="volumeGroup" name="volume-group" type="inventory.aai.onap.org.v9.VolumeGroup" />
 			</java-attributes>
 		</java-type>
 
@@ -371,7 +372,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Persistent block-level storage." />
@@ -385,7 +386,7 @@
 		<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.openecomp.org.v9.Relationship" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v9.Relationship" />
 			</java-attributes>
 		</java-type>
 
@@ -402,8 +403,8 @@
 						<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.openecomp.org.v9.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v9.RelatedToProperty" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v9.RelationshipData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v9.RelatedToProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -445,7 +446,7 @@
 			</xml-properties>
 			<xml-root-element name="complexes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.openecomp.org.v9.Complex" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="complex" name="complex" type="inventory.aai.onap.org.v9.Complex" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -496,8 +497,8 @@
 				<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.openecomp.org.v9.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="ctagPools" name="ctag-pools" type="inventory.aai.onap.org.v9.CtagPools" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of physical locations that can house cloud-regions." />
@@ -512,7 +513,7 @@
 		<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.openecomp.org.v9.CtagPool" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagPool" name="ctag-pool" type="inventory.aai.onap.org.v9.CtagPool" />
 			</java-attributes>
 		</java-type>
 
@@ -544,7 +545,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="A collection of C tags (vlan tags) grouped for a specific purpose." />
@@ -560,7 +561,7 @@
 			</xml-properties>
 			<xml-root-element name="tenants" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.openecomp.org.v9.Tenant" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="tenant" name="tenant" type="inventory.aai.onap.org.v9.Tenant" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -585,8 +586,8 @@
 						<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.openecomp.org.v9.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="vservers" name="vservers" type="inventory.aai.onap.org.v9.Vservers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack tenant" />
@@ -604,7 +605,7 @@
 			</xml-properties>
 			<xml-root-element name="vservers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.openecomp.org.v9.Vserver" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vserver" name="vserver" type="inventory.aai.onap.org.v9.Vserver" />
 			</java-attributes>
 		</java-type>
 
@@ -653,9 +654,9 @@
 						<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.openecomp.org.v9.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+				<xml-element java-attribute="volumes" name="volumes" type="inventory.aai.onap.org.v9.Volumes" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual Servers, aka virtual machine or VM." />
@@ -673,7 +674,7 @@
 			</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.openecomp.org.v9.LInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lInterface" name="l-interface" type="inventory.aai.onap.org.v9.LInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -730,11 +731,11 @@
 						<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="vlans" name="vlans" type="inventory.aai.openecomp.org.v9.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v9.SriovVfs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv6AddressList" />
+				<xml-element java-attribute="vlans" name="vlans" type="inventory.aai.onap.org.v9.Vlans" />
+				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v9.SriovVfs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Logical interfaces, e.g., a vnic." />
@@ -750,7 +751,7 @@
 			</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.openecomp.org.v9.SriovVf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sriovVf" name="sriov-vf" type="inventory.aai.onap.org.v9.SriovVf" />
 			</java-attributes>
 		</java-type>
 		<java-type name="SriovVf">
@@ -826,7 +827,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="SR-IOV Virtual Function (not to be confused with virtual network function)" />
@@ -879,7 +880,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPv4 Address Range" />
@@ -891,7 +892,7 @@
 		<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.openecomp.org.v9.Vlan" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vlan" name="vlan" type="inventory.aai.onap.org.v9.Vlan" />
 			</java-attributes>
 		</java-type>
 
@@ -938,7 +939,7 @@
 						<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="vpnId" name="vpn-id" type="java.lang.String">
+				<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>
@@ -948,14 +949,13 @@
 						<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 java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv6AddressList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv4AddressList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v9.L3InterfaceIpv6AddressList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-				<xml-property name="uniqueProps" value="vpn-id" />
+				<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>
@@ -1004,7 +1004,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="IPv6 Address Range" />
@@ -1019,7 +1019,7 @@
 			</xml-properties>
 			<xml-root-element name="volumes" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.openecomp.org.v9.Volume" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="volume" name="volume" type="inventory.aai.onap.org.v9.Volume" />
 			</java-attributes>
 		</java-type>
 
@@ -1041,7 +1041,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Ephemeral Block storage volume." />
@@ -1057,7 +1057,7 @@
 			</xml-properties>
 			<xml-root-element name="flavors" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.openecomp.org.v9.Flavor" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="flavor" name="flavor" type="inventory.aai.onap.org.v9.Flavor" />
 			</java-attributes>
 		</java-type>
 
@@ -1119,7 +1119,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack flavor." />
@@ -1136,7 +1136,7 @@
 			</xml-properties>
 			<xml-root-element name="snapshots" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.openecomp.org.v9.Snapshot" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="snapshot" name="snapshot" type="inventory.aai.onap.org.v9.Snapshot" />
 			</java-attributes>		
 		</java-type>
 		
@@ -1198,7 +1198,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />				
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack snapshot" />
@@ -1216,7 +1216,7 @@
 			</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.openecomp.org.v9.GroupAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.onap.org.v9.GroupAssignment" />
 			</java-attributes>
 		</java-type>
 		
@@ -1248,7 +1248,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack group-assignment used to store exclusivity groups (EG)." />
@@ -1265,7 +1265,7 @@
 			</xml-properties>
 			<xml-root-element name="images" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.openecomp.org.v9.Image" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="image" name="image" type="inventory.aai.onap.org.v9.Image" />
 			</java-attributes>
 		</java-type>
 
@@ -1322,8 +1322,8 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack image." />
@@ -1340,7 +1340,7 @@
 			</xml-properties>
 			<xml-root-element name="metadata" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.openecomp.org.v9.Metadatum" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="metadatum" name="metadatum" type="inventory.aai.onap.org.v9.Metadatum" />
 			</java-attributes>
 		</java-type>
 
@@ -1369,7 +1369,7 @@
 			</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.openecomp.org.v9.DvsSwitch" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="dvsSwitch" name="dvs-switch" type="inventory.aai.onap.org.v9.DvsSwitch" />
 			</java-attributes>
 		</java-type>
 
@@ -1391,7 +1391,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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. " />
@@ -1407,7 +1407,7 @@
 			</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.openecomp.org.v9.NetworkProfile" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkProfile" name="network-profile" type="inventory.aai.onap.org.v9.NetworkProfile" />
 			</java-attributes>
 		</java-type>
 
@@ -1429,7 +1429,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Network profile populated by SDN-GP for SNMP" />
@@ -1445,7 +1445,7 @@
 			</xml-properties>
 			<xml-root-element name="pservers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.openecomp.org.v9.Pserver" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pserver" name="pserver" type="inventory.aai.onap.org.v9.Pserver" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -1581,9 +1581,9 @@
 						<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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.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." />
@@ -1601,7 +1601,7 @@
 			</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.openecomp.org.v9.PInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pInterface" name="p-interface" type="inventory.aai.onap.org.v9.PInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -1653,8 +1653,8 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Physical interface (e.g., nic)" />
@@ -1671,7 +1671,7 @@
 			</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.openecomp.org.v9.LagInterface" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagInterface" name="lag-interface" type="inventory.aai.onap.org.v9.LagInterface" />
 			</java-attributes>
 		</java-type>
 
@@ -1718,8 +1718,8 @@
 						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Link aggregate interface" />
@@ -1735,7 +1735,7 @@
 			</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.openecomp.org.v9.OamNetwork" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="oamNetwork" name="oam-network" type="inventory.aai.onap.org.v9.OamNetwork" />
 			</java-attributes>
 		</java-type>
 
@@ -1772,7 +1772,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="OAM network, to be deprecated shortly.  Do not use for new purposes. " />
@@ -1789,7 +1789,7 @@
 			</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.openecomp.org.v9.AvailabilityZone" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v9.AvailabilityZone" />
 			</java-attributes>
 		</java-type>
 
@@ -1809,6 +1809,7 @@
 				<xml-element java-attribute="operationalState" name="operational-state" 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-property name="dbAlias" value="operational-status" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -1816,7 +1817,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Availability zone, a collection of compute hosts/pservers" />
@@ -1832,7 +1833,7 @@
 			</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.openecomp.org.v9.VirtualDataCenter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="virtualDataCenter" name="virtual-data-center" type="inventory.aai.onap.org.v9.VirtualDataCenter" />
 			</java-attributes>
 		</java-type>
 
@@ -1854,7 +1855,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual organization of cloud infrastructure elements in a data center context" />
@@ -1865,8 +1866,50 @@
 			</xml-properties>
 		</java-type>
 
+		<java-type name="LicenseManagement">
+			<xml-root-element name="license-management" />
+			<java-attributes>
+				<xml-element java-attribute="licenseKeyResources" name="license-key-resources" type="inventory.aai.onap.org.v9.LicenseKeyResources" />
+			</java-attributes>
+		</java-type>
 
+		<java-type name="LicenseKeyResources">
+			<xml-root-element name="license-key-resources" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="licenseKeyResource" name="license-key-resource" type="inventory.aai.onap.org.v9.LicenseKeyResource" />
+			</java-attributes>
+		</java-type>
 
+		<java-type name="LicenseKeyResource">
+			<xml-root-element name="license-key-resource" />
+			<java-attributes>
+				<xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true" />
+				<xml-element java-attribute="assignmentType" name="assignment-type" type="java.lang.String" />
+				<xml-element java-attribute="assignmentStatus" name="assignment-status" type="java.lang.String" />
+				<xml-element java-attribute="assignmentGroupUuid" name="assignment-group-uuid" required="true" type="java.lang.String" />
+				<xml-element java-attribute="assignmentDate" name="assignment-date" type="java.lang.String" />
+				<xml-element java-attribute="name" name="name" type="java.lang.String" />
+				<xml-element java-attribute="modelUuid" name="model-uuid" type="java.lang.String" />
+				<xml-element java-attribute="modelVersion" name="model-version" type="java.lang.String" />
+				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String" />
+				<xml-element java-attribute="licenseKeyFileUrl" name="license-key-file-url" type="java.lang.String" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="supplierReleaseList" name="supplier-release-list" 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>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="OBSOLETE OBJECT:  do not use" />
+				<xml-property name="nameProps" value="name" />
+				<xml-property name="indexedProps" value="assignment-group-uuid,att-uuid,name" />
+				<xml-property name="uniqueProps" value="att-uuid" />
+				<xml-property name="container" value="license-key-resources" />
+				<xml-property name="namespace" value="license-management" />
+			</xml-properties>
+		</java-type>
 
 		<java-type name="Business">
 			<xml-properties>
@@ -1874,8 +1917,8 @@
 			</xml-properties>
 			<xml-root-element name="business" />
 			<java-attributes>
-				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.openecomp.org.v9.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v9.Customers" />
+				<xml-element java-attribute="connectors" name="connectors" type="inventory.aai.onap.org.v9.Connectors" />
+				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v9.Customers" />
 			</java-attributes>
 		</java-type>
 
@@ -1885,7 +1928,7 @@
 			</xml-properties>
 			<xml-root-element name="connectors" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.openecomp.org.v9.Connector" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="connector" name="connector" type="inventory.aai.onap.org.v9.Connector" />
 			</java-attributes>
 		</java-type>
 
@@ -1906,6 +1949,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -1913,6 +1957,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -1920,7 +1965,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -1933,8 +1978,8 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of resource instances used to connect a variety of disparate inventory widgets" />
@@ -1950,7 +1995,7 @@
 			</xml-properties>
 			<xml-root-element name="customers" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.openecomp.org.v9.Customer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="customer" name="customer" type="inventory.aai.onap.org.v9.Customer" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -1981,8 +2026,8 @@
 						<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.openecomp.org.v9.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="serviceSubscriptions" name="service-subscriptions" type="inventory.aai.onap.org.v9.ServiceSubscriptions" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="customer identifiers to provide linkage back to BSS information." />
@@ -2001,7 +2046,7 @@
 			</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.openecomp.org.v9.ServiceSubscription" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceSubscription" name="service-subscription" type="inventory.aai.onap.org.v9.ServiceSubscription" />
 			</java-attributes>
 		</java-type>
 
@@ -2023,9 +2068,9 @@
 						<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.openecomp.org.v9.ServiceInstances">
+				<xml-element java-attribute="serviceInstances" name="service-instances" type="inventory.aai.onap.org.v9.ServiceInstances">
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Object that group service instances." />
@@ -2042,7 +2087,7 @@
 			</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.openecomp.org.v9.ServiceInstance" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceInstance" name="service-instance" type="inventory.aai.onap.org.v9.ServiceInstance" />
 			</java-attributes>
 		</java-type>
 
@@ -2063,6 +2108,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -2070,6 +2116,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -2077,7 +2124,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -2120,11 +2167,6 @@
 						<xml-property name="description" value="URL customers will use to access the vHN Portal." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational status of the service-instance." />
-					</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." />
@@ -2145,9 +2187,9 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v9.AllottedResources" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
+				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v9.AllottedResources" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Instance of a service" />
@@ -2166,11 +2208,11 @@
 			</xml-properties>
 			<xml-root-element name="service-design-and-creation" />
 			<java-attributes>
-				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.openecomp.org.v9.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v9.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v9.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v9.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v9.NamedQueries" />
+				<xml-element java-attribute="vnfImages" name="vnf-images" type="inventory.aai.onap.org.v9.VnfImages" />
+				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v9.Services" />
+				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v9.ServiceCapabilities" />
+				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v9.Models" />
+				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v9.NamedQueries" />
 			</java-attributes>
 		</java-type>
 
@@ -2180,16 +2222,17 @@
 			</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.openecomp.org.v9.VnfImage" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfImage" name="vnf-image" type="inventory.aai.onap.org.v9.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" required="true" type="java.lang.String" xml-key="true">
+				<xml-element java-attribute="attUuid" name="att-uuid" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
 						<xml-property name="description" value="Unique ID of this asset" />
+						<xml-property name="dbAlias" value="vnf-image-uuid" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="application" name="application" required="true" type="java.lang.String">
@@ -2217,12 +2260,12 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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="indexedProps" value="application,att-uuid,application-vendor,application-version" />
+				<xml-property name="uniqueProps" value="att-uuid" />
 				<xml-property name="container" value="vnf-images" />
 				<xml-property name="namespace" value="service-design-and-creation" />
 			</xml-properties>
@@ -2234,7 +2277,7 @@
 			</xml-properties>
 			<xml-root-element name="services" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.openecomp.org.v9.Service" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="service" name="service" type="inventory.aai.onap.org.v9.Service" />
 			</java-attributes>
 		</java-type>
 
@@ -2266,7 +2309,7 @@
 						<xml-property name="description" value="service version" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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." />
@@ -2282,7 +2325,7 @@
 			</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.openecomp.org.v9.ServiceCapability" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="serviceCapability" name="service-capability" type="inventory.aai.onap.org.v9.ServiceCapability" />
 			</java-attributes>
 		</java-type>
 
@@ -2304,7 +2347,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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." />
@@ -2320,24 +2363,24 @@
 			</xml-properties>
 			<xml-root-element name="network" />
 			<java-attributes>
-				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.openecomp.org.v9.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v9.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v9.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v9.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v9.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v9.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v9.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v9.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v9.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v9.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v9.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v9.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v9.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v9.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v9.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v9.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v9.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v9.Zones" />
+				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v9.LogicalLinks" />
+				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v9.SitePairSets" />
+				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v9.VpnBindings" />
+				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v9.VplsPes" />
+				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v9.MulticastConfigurations" />
+				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v9.Vces" />
+				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v9.Vnfcs" />
+				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v9.L3Networks" />
+				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v9.NetworkPolicies" />
+				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v9.GenericVnfs" />
+				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v9.LagLinks" />
+				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v9.Newvces" />
+				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v9.Pnfs" />
+				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v9.PhysicalLinks" />
+				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v9.IpsecConfigurations" />
+				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v9.RouteTableReferences" />
+				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v9.InstanceGroups" />
+				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v9.Zones" />
 			</java-attributes>
 		</java-type>
 
@@ -2347,7 +2390,7 @@
 			</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.openecomp.org.v9.LogicalLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="logicalLink" name="logical-link" type="inventory.aai.onap.org.v9.LogicalLink" />
 			</java-attributes>
 		</java-type>
 
@@ -2376,7 +2419,7 @@
 				</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-property name="description" value="v4, v6, or ds for dual stack (should be att-ip-version)" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
@@ -2393,6 +2436,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -2400,6 +2444,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -2407,7 +2452,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
@@ -2455,7 +2500,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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" />
@@ -2473,7 +2518,7 @@
 			</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.openecomp.org.v9.SitePairSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePairSet" name="site-pair-set" type="inventory.aai.onap.org.v9.SitePairSet" />
 			</java-attributes>
 		</java-type>
 
@@ -2490,8 +2535,8 @@
 						<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.openecomp.org.v9.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="routingInstances" name="routing-instances" type="inventory.aai.onap.org.v9.RoutingInstances" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Set of instances for probes used to measure service level agreements" />
@@ -2508,7 +2553,7 @@
 			</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.openecomp.org.v9.RoutingInstance" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="routingInstance" name="routing-instance" type="inventory.aai.onap.org.v9.RoutingInstance" />
 			</java-attributes>
 		</java-type>
 
@@ -2530,8 +2575,8 @@
 						<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.openecomp.org.v9.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="sitePairs" name="site-pairs" type="inventory.aai.onap.org.v9.SitePairs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="routing-instance-id" />
@@ -2547,7 +2592,7 @@
 			</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.openecomp.org.v9.SitePair" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sitePair" name="site-pair" type="inventory.aai.onap.org.v9.SitePair" />
 			</java-attributes>
 		</java-type>
 
@@ -2581,7 +2626,7 @@
 				</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, etc." />
+						<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">
@@ -2589,8 +2634,8 @@
 						<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.openecomp.org.v9.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="classesOfService" name="classes-of-service" type="inventory.aai.onap.org.v9.ClassesOfService" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="site-pair-id" />
@@ -2606,7 +2651,7 @@
 			</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.openecomp.org.v9.ClassOfService" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="classOfService" name="class-of-service" type="inventory.aai.onap.org.v9.ClassOfService" />
 			</java-attributes>
 		</java-type>
 
@@ -2633,7 +2678,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="cos" />
@@ -2645,7 +2690,7 @@
 		<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.openecomp.org.v9.VpnBinding" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vpnBinding" name="vpn-binding" type="inventory.aai.onap.org.v9.VpnBinding" />
 			</java-attributes>
 		</java-type>
 
@@ -2665,6 +2710,7 @@
 				<xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
+						<xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vpnPlatform" name="vpn-platform" type="java.lang.String">
@@ -2682,9 +2728,11 @@
 						<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="routeTargetRole" name="route-target-role" type="java.lang.String">
+				<xml-element java-attribute="routeTargetRole" name="route-target-role" required="true" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Role assigned to this route target" />
+						<xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}" />
+						<xml-property name="defaultValue" value="BOTH" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -2692,7 +2740,7 @@
 						<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.openecomp.org.v9.RelationshipList">
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList">
 					<xml-properties>
 						<xml-property name="description" value="l3-networks relate to vpn-bindings" />
 					</xml-properties>
@@ -2715,7 +2763,7 @@
 			</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.openecomp.org.v9.VplsPe" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vplsPe" name="vpls-pe" type="inventory.aai.onap.org.v9.VplsPe" />
 			</java-attributes>
 		</java-type>
 
@@ -2748,9 +2796,9 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="VPLS Provider Edge routers." />
@@ -2766,7 +2814,7 @@
 			</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.openecomp.org.v9.MulticastConfiguration" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="multicastConfiguration" name="multicast-configuration" type="inventory.aai.onap.org.v9.MulticastConfiguration" />
 			</java-attributes>
 		</java-type>
 
@@ -2793,7 +2841,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="multicast-configuration-id" />
@@ -2809,7 +2857,7 @@
 			</xml-properties>
 			<xml-root-element name="vces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.openecomp.org.v9.Vce" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vce" name="vce" type="inventory.aai.onap.org.v9.Vce" />
 			</java-attributes>
 		</java-type>
 
@@ -2854,6 +2902,7 @@
 				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
+						<xml-property name="dbAlias" value="operational-status" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
@@ -2911,10 +2960,10 @@
 						<xml-property name="description" value="OBSOLETE -  see child relationships" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.openecomp.org.v9.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.onap.org.v9.PortGroups" />
+				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses" />
+				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated." />
@@ -2931,7 +2980,7 @@
 		<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.openecomp.org.v9.PortGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="portGroup" name="port-group" type="inventory.aai.onap.org.v9.PortGroup" />
 			</java-attributes>
 		</java-type>
 
@@ -2993,8 +3042,8 @@
 						<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.openecomp.org.v9.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="cvlanTags" name="cvlan-tags" type="inventory.aai.onap.org.v9.CvlanTags" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Used to capture the network interfaces of this VCE" />
@@ -3008,7 +3057,7 @@
 		<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.openecomp.org.v9.CvlanTagEntry" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="cvlanTagEntry" name="cvlan-tag-entry" type="inventory.aai.onap.org.v9.CvlanTagEntry" />
 			</java-attributes>
 		</java-type>
 
@@ -3025,7 +3074,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="dependentOn" value="port-group" />
@@ -3042,7 +3091,7 @@
 			</xml-properties>
 			<xml-root-element name="vnfcs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.openecomp.org.v9.Vnfc" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vnfc" name="vnfc" type="inventory.aai.onap.org.v9.Vnfc" />
 			</java-attributes>
 		</java-type>
 
@@ -3057,11 +3106,13 @@
 				<xml-element java-attribute="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="function code" />
+						<xml-property name="dbAlias" value="nfc-naming-code" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="type" />
+						<xml-property name="dbAlias" value="nfc-function" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
@@ -3101,7 +3152,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
@@ -3114,7 +3165,7 @@
 		<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.openecomp.org.v9.L3Network" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="l3Network" name="l3-network" type="inventory.aai.onap.org.v9.L3Network" />
 			</java-attributes>
 		</java-type>
 
@@ -3196,6 +3247,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -3203,6 +3255,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -3210,7 +3263,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
@@ -3257,10 +3310,10 @@
 						<xml-property name="description" value="Path to the controller object." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.openecomp.org.v9.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v9.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v9.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" >
+				<xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v9.Subnets" />
+				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v9.CtagAssignments" />
+				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v9.SegmentationAssignments" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" >
 					<xml-properties>
 						<xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding" />
 					</xml-properties>
@@ -3279,7 +3332,7 @@
 		<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.openecomp.org.v9.NetworkPolicy" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkPolicy" name="network-policy" type="inventory.aai.onap.org.v9.NetworkPolicy" />
 			</java-attributes>
 		</java-type>
 		<java-type name="NetworkPolicy">
@@ -3305,7 +3358,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="nameProps" value="network-policy-fqdn" />
@@ -3319,7 +3372,7 @@
 		<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.openecomp.org.v9.CtagAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ctagAssignment" name="ctag-assignment" type="inventory.aai.onap.org.v9.CtagAssignment" />
 			</java-attributes>
 		</java-type>
 
@@ -3336,7 +3389,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="vlan-id-inner" />
@@ -3348,7 +3401,7 @@
 		<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.openecomp.org.v9.Subnet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="subnet" name="subnet" type="inventory.aai.onap.org.v9.Subnet" />
 			</java-attributes>
 		</java-type>
 
@@ -3416,7 +3469,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="indexedProps" value="subnet-id,subnet-name" />
@@ -3433,7 +3486,7 @@
 			</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.openecomp.org.v9.GenericVnf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="genericVnf" name="generic-vnf" type="inventory.aai.onap.org.v9.GenericVnf" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -3481,6 +3534,7 @@
 				<xml-element java-attribute="operationalState" name="operational-state" 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-property name="dbAlias" value="operational-status" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
@@ -3510,7 +3564,7 @@
 				</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 company or customer" />
+						<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">
@@ -3535,32 +3589,32 @@
 				</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 in some usecases" />
+						<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 in some usecases" />
+						<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 in some usecases" />
+						<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 in some usecases" />
+						<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 in some usecases" />
+						<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 in some usecases" />
+						<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 default-value="false" required="true" java-attribute="inMaint" name="in-maint" type="java.lang.Boolean">
@@ -3590,30 +3644,11 @@
 						<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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -3621,6 +3656,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -3628,7 +3664,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
@@ -3662,12 +3698,12 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v9.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.LInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
+				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v9.VfModules" />
+				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v9.Licenses" />
+				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v9.Entitlements" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="General purpose VNF" />
@@ -3687,7 +3723,7 @@
 			</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.openecomp.org.v9.VfModule" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.onap.org.v9.VfModule" />
 			</java-attributes>
 		</java-type>
 
@@ -3729,6 +3765,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -3736,6 +3773,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -3743,7 +3781,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
@@ -3777,7 +3815,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="a deployment unit of VNFCs" />
@@ -3795,7 +3833,7 @@
 			</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.openecomp.org.v9.LagLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lagLink" name="lag-link" type="inventory.aai.onap.org.v9.LagLink" />
 			</java-attributes>
 		</java-type>
 
@@ -3812,7 +3850,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="LAG links can connect lag-interfaces" />
@@ -3828,7 +3866,7 @@
 			</xml-properties>
 			<xml-root-element name="newvces" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.openecomp.org.v9.Newvce" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="newvce" name="newvce" type="inventory.aai.onap.org.v9.Newvce" />
 			</java-attributes>
 		</java-type>
 
@@ -3863,6 +3901,7 @@
 				<xml-element java-attribute="operationalState" name="operational-state" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
+						<xml-property name="dbAlias" value="operational-status" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
@@ -3905,8 +3944,8 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v9.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." />
@@ -3925,7 +3964,7 @@
 			</xml-properties>
 			<xml-root-element name="pnfs" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.openecomp.org.v9.Pnf" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="pnf" name="pnf" type="inventory.aai.onap.org.v9.Pnf" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -3972,7 +4011,7 @@
 				</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 company or customer" />
+						<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">
@@ -4046,12 +4085,12 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v9.PInterfaces" />
+				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v9.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
+				<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" />
@@ -4066,7 +4105,7 @@
 			</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.openecomp.org.v9.PhysicalLink" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="physicalLink" name="physical-link" type="inventory.aai.onap.org.v9.PhysicalLink" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="maximumDepth" value="0" />
@@ -4116,7 +4155,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Collection of physical connections, typically between p-interfaces" />
@@ -4131,7 +4170,7 @@
 		<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.openecomp.org.v9.VigServer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="vigServer" name="vig-server" type="inventory.aai.onap.org.v9.VigServer" />
 			</java-attributes>
 		</java-type>
 
@@ -4158,7 +4197,7 @@
 						<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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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" />
@@ -4171,7 +4210,7 @@
 		<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.openecomp.org.v9.IpsecConfiguration" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="ipsecConfiguration" name="ipsec-configuration" type="inventory.aai.onap.org.v9.IpsecConfiguration" />
 			</java-attributes>
 		</java-type>
 
@@ -4195,7 +4234,7 @@
 				</xml-element>
 				<xml-element java-attribute="requestedDmzType" name="requested-dmz-type" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="can offer a shared DMZ or a DMZ specific to a customer" />
+						<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">
@@ -4220,7 +4259,7 @@
 				</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-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">
@@ -4250,7 +4289,7 @@
 				</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-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">
@@ -4265,7 +4304,7 @@
 				</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, ,nmteHostName" />
+						<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">
@@ -4288,8 +4327,8 @@
 						<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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v9.VigServers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
+				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v9.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" />
@@ -4305,7 +4344,7 @@
 			<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.openecomp.org.v9.NotificationEventHeader" />
+				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v9.NotificationEventHeader" />
 				<xml-any-element java-attribute="entity" />
 			</java-attributes>
 		</java-type>
@@ -4330,8 +4369,8 @@
 		<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.openecomp.org.v9.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v9.EdgePropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v9.ReservedPropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v9.EdgePropNames" />
 			</java-attributes>
 		</java-type>
 		<java-type name="ReservedPropNames">
@@ -4362,11 +4401,10 @@
 				<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="isParent" name="isParent" type="java.lang.Boolean" />
-				<xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-				<xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-				<xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" 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" />
 			</java-attributes>
 		</java-type>
 
@@ -4376,7 +4414,7 @@
 			</xml-properties>
 			<xml-root-element name="models" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.openecomp.org.v9.Model" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="model" name="model" type="inventory.aai.onap.org.v9.Model" />
 			</java-attributes>
 		</java-type>
 
@@ -4406,8 +4444,8 @@
 						<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.openecomp.org.v9.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
@@ -4415,7 +4453,7 @@
 		<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.openecomp.org.v9.ModelVer" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelVer" name="model-ver" type="inventory.aai.onap.org.v9.ModelVer" />
 			</java-attributes>
 		</java-type>
 		
@@ -4454,16 +4492,16 @@
 						<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.openecomp.org.v9.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v9.Metadata" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.ModelElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelElement" name="model-element" type="inventory.aai.onap.org.v9.ModelElement" />
 			</java-attributes>
 		</java-type>
 
@@ -4500,24 +4538,24 @@
 						<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.openecomp.org.v9.ModelElements">
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.ModelConstraints">
+				<xml-element java-attribute="modelConstraints" name="model-constraints" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.ModelConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="modelConstraint" name="model-constraint" type="inventory.aai.onap.org.v9.ModelConstraint" />
 			</java-attributes>
 		</java-type>
 
@@ -4538,7 +4576,7 @@
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="constrainedElementSetUuidToReplace" name="constrained-element-set-uuid-to-replace" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v9.ConstrainedElementSets" />
+				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v9.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." />
@@ -4550,7 +4588,7 @@
 		<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.openecomp.org.v9.ConstrainedElementSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="constrainedElementSet" name="constrained-element-set" type="inventory.aai.onap.org.v9.ConstrainedElementSet" />
 			</java-attributes>
 		</java-type>
 
@@ -4573,15 +4611,15 @@
 				<xml-element java-attribute="constraintType" name="constraint-type" required="true" type="java.lang.String" />
 				<xml-element java-attribute="checkType" name="check-type" required="true" 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.openecomp.org.v9.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="elementChoiceSets" name="element-choice-sets" type="inventory.aai.onap.org.v9.ElementChoiceSets" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.ElementChoiceSet" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="elementChoiceSet" name="element-choice-set" type="inventory.aai.onap.org.v9.ElementChoiceSet" />
 			</java-attributes>
 		</java-type>
 
@@ -4604,15 +4642,15 @@
 				<xml-element java-attribute="elementChoiceSetName" name="element-choice-set-name" required="true" 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.openecomp.org.v9.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v9.ModelElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.NamedQuery" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v9.NamedQuery" />
 			</java-attributes>
 		</java-type>
 
@@ -4635,15 +4673,15 @@
 				</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.openecomp.org.v9.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v9.NamedQueryElements" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.NamedQueryElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v9.NamedQueryElement" />
 			</java-attributes>
 		</java-type>
 
@@ -4667,17 +4705,17 @@
 				<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.openecomp.org.v9.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v9.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v9.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v9.NamedQueryElements" />
+				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v9.RelatedLookups" />
+				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v9.PropertyConstraints" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.RelatedLookup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v9.RelatedLookup" />
 			</java-attributes>
 		</java-type>
 
@@ -4703,14 +4741,14 @@
 				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" 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.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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.openecomp.org.v9.PropertyConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v9.PropertyConstraint" />
 			</java-attributes>
 		</java-type>
 
@@ -4743,9 +4781,9 @@
 			</xml-properties>
 			<xml-root-element name="model-and-named-query-search" />
 			<java-attributes>
-				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.openecomp.org.v9.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v9.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v9.SecondaryFilts" />
+				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v9.QueryParameters" />
+				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v9.InstanceFilters" />
+				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v9.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>
@@ -4757,8 +4795,8 @@
 			</xml-properties>
 			<xml-root-element name="query-parameters" />
 			<java-attributes>
-				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.openecomp.org.v9.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v9.OverloadedModel" />
+				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v9.NamedQuery" />
+				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v9.OverloadedModel" />
 			</java-attributes>
 		</java-type>
 
@@ -4808,8 +4846,8 @@
 						<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.openecomp.org.v9.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="modelVers" name="model-vers" type="inventory.aai.onap.org.v9.ModelVers" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 		</java-type>
 
@@ -4819,7 +4857,7 @@
 			</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.openecomp.org.v9.InstanceFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v9.InstanceFilter" />
 			</java-attributes>
 		</java-type>
 
@@ -4840,7 +4878,7 @@
 			</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.openecomp.org.v9.SecondaryFilt" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v9.SecondaryFilt" />
 			</java-attributes>
 		</java-type>
 		
@@ -4871,7 +4909,7 @@
 			</xml-properties>
 			<xml-root-element name="response-list" />
 			<java-attributes>
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v9.InventoryResponseItems" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.InventoryResponseItems" />
 			</java-attributes>
 		</java-type>
 
@@ -4882,7 +4920,7 @@
 			</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.openecomp.org.v9.InventoryResponseItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v9.InventoryResponseItem" />
 			</java-attributes>
 		</java-type>
 
@@ -4895,8 +4933,8 @@
 			<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.openecomp.org.v9.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v9.InventoryResponseItems" />
+				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v9.ExtraProperties" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v9.InventoryResponseItems" />
 			</java-attributes>
 		</java-type>
 
@@ -4906,7 +4944,7 @@
 			</xml-properties>
 			<xml-root-element name="extra-properties" />
 			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v9.ExtraProperty" />
+				<xml-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v9.ExtraProperty" />
 			</java-attributes>
 		</java-type>
 
@@ -4924,7 +4962,7 @@
 			</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.openecomp.org.v9.RouteTableReference" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.onap.org.v9.RouteTableReference" />
 			</java-attributes>
 		</java-type>
 		
@@ -4946,7 +4984,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			
 			<xml-properties>
@@ -4965,7 +5003,7 @@
 			</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.openecomp.org.v9.InstanceGroup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceGroup" name="instance-group" type="inventory.aai.onap.org.v9.InstanceGroup" />
 			</java-attributes>
 		</java-type>
 		
@@ -4997,7 +5035,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			
 			<xml-properties>
@@ -5017,7 +5055,7 @@
 			</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.openecomp.org.v9.SegmentationAssignment" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="segmentationAssignment" name="segmentation-assignment" type="inventory.aai.onap.org.v9.SegmentationAssignment" />
 			</java-attributes>
 		</java-type>
 				
@@ -5034,7 +5072,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack segmentation assignment." />
@@ -5050,7 +5088,7 @@
 			</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.openecomp.org.v9.AllottedResource" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="allottedResource" name="allotted-resource" type="inventory.aai.onap.org.v9.AllottedResource" />
 			</java-attributes>
 		</java-type>
 		
@@ -5076,6 +5114,7 @@
 					<xml-properties>
 						<xml-property name="description" value="the ASDC model id for this resource or service model." />
 						<xml-property name="dbAlias" value="model-invariant-id-local" />
+						<xml-property name="requires" value="persona-model-version" />
 						<xml-property name="visibility" value="deployment" />
 					</xml-properties>
 				</xml-element>
@@ -5083,6 +5122,7 @@
 					<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="persona-model-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
@@ -5090,7 +5130,7 @@
 						<xml-property name="description" value="the ASDC model version for this resource or service model." />
 						<xml-property name="visibility" value="internal" />
 						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataLocation" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
+						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
@@ -5104,8 +5144,8 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.openecomp.org.v9.TunnelXconnects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v9.TunnelXconnects" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			
 			<xml-properties>
@@ -5125,7 +5165,7 @@
 			</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.openecomp.org.v9.TunnelXconnect" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="tunnelXconnect" name="tunnel-xconnect" type="inventory.aai.onap.org.v9.TunnelXconnect" />
 			</java-attributes>
 		</java-type>
 		
@@ -5162,7 +5202,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			
 			<xml-properties>
@@ -5181,7 +5221,7 @@
 			</xml-properties>
 			<xml-root-element name="entitlements" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.openecomp.org.v9.Entitlement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="entitlement" name="entitlement" type="inventory.aai.onap.org.v9.Entitlement" />
 			</java-attributes>
 		</java-type>
 				
@@ -5203,7 +5243,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Metadata for entitlement group." />
@@ -5220,7 +5260,7 @@
 			</xml-properties>
 			<xml-root-element name="licenses" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.openecomp.org.v9.License" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="license" name="license" type="inventory.aai.onap.org.v9.License" />
 			</java-attributes>
 		</java-type>
 				
@@ -5242,7 +5282,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Metadata for license group." />
@@ -5276,7 +5316,7 @@
 			</xml-properties>
 			<xml-root-element name="zones" />
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.openecomp.org.v9.Zone" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="zone" name="zone" type="inventory.aai.onap.org.v9.Zone" />
 			</java-attributes>
 		</java-type>
 
@@ -5295,7 +5335,7 @@
 				</xml-element>
 				<xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Design of zone [Medium/Large?]" />
+						<xml-property name="description" value="Design of zone [Medium/Large…]" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">
@@ -5313,7 +5353,7 @@
 						<xml-property name="description" value="Concurrency value" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v9.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" />
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/resource.graphson b/aai-resources/src/test/resources/bundleconfig-local/etc/queryformats/graphson/resource.graphson
index 257916a..257916a 100644
--- a/aai-resources/src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/resource.graphson
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/queryformats/graphson/resource.graphson
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/serialization/queryformats/resource-format.json b/aai-resources/src/test/resources/bundleconfig-local/etc/queryformats/resource-format.json
index c7e4255..c7e4255 100644
--- a/aai-resources/src/test/resources/org/openecomp/aai/serialization/queryformats/resource-format.json
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/queryformats/resource-format.json
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json b/aai-resources/src/test/resources/bundleconfig-local/etc/queryformats/resource_and_url-format.json
index 80d6560..80d6560 100644
--- a/aai-resources/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/queryformats/resource_and_url-format.json
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/serialization/queryformats/simple-format.json b/aai-resources/src/test/resources/bundleconfig-local/etc/queryformats/simple-format.json
index dd34261..dd34261 100644
--- a/aai-resources/src/test/resources/org/openecomp/aai/serialization/queryformats/simple-format.json
+++ b/aai-resources/src/test/resources/bundleconfig-local/etc/queryformats/simple-format.json
diff --git a/aai-resources/src/test/resources/log4j.properties b/aai-resources/src/test/resources/log4j.properties
deleted file mode 100644
index 2e68f61..0000000
--- a/aai-resources/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-log4j.logger.org.apache.zookeeper=WARN
-log4j.logger.org.apache.hadoop.hbase.zookeeper=WARN
-log4j.logger.org.apache.hadoop.hbase.client=WARN
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
deleted file mode 100644
index 176a02c..0000000
--- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
+++ /dev/null
@@ -1,5794 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-  ============LICENSE_START=======================================================
-  org.openecomp.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.openecomp.org.v10" xml-mapping-metadata-complete="true">
-	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v10" />
-	</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.openecomp.org.v10.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v10.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v10.CloudInfrastructure" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v10.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v10.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v10.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v10.AaiInternal" />
-				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v10.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v10.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v10.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v10.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" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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="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.openecomp.org.v10.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v10.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v10.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v10.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v10.VirtualDataCenters" />
-			</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.openecomp.org.v10.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" required="true" 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" required="true" 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 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.openecomp.org.v10.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v10.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v10.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v10.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v10.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v10.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v10.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v10.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v10.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-			</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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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="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.openecomp.org.v10.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-				<xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-				<xml-element java-attribute="state" name="state" type="java.lang.String" />
-				<xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-				<xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-				<xml-element java-attribute="region" name="region" required="true" 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.openecomp.org.v10.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Readable name of tenant" />
-					</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.openecomp.org.v10.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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" />
-				<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.openecomp.org.v10.Vserver" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vserver">
-			<xml-root-element name="vserver" />
-			<java-attributes>
-				<xml-element java-attribute="vserverId" name="vserver-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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="vlans" name="vlans" type="inventory.aai.openecomp.org.v10.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v10.SriovVfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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" />
-			</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.openecomp.org.v10.Vlan" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vlan">
-			<xml-root-element name="vlan" />
-			<java-attributes>
-				<xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" 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="vpnId" name="vpn-id" 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" required="true" 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.openecomp.org.v10.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v10.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-				<xml-property name="uniqueProps" value="vpn-id" />
-				<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" required="true" 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.openecomp.org.v10.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" />
-			</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.openecomp.org.v10.Volume" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Volume">
-			<xml-root-element name="volume" />
-			<java-attributes>
-				<xml-element java-attribute="volumeId" name="volume-id" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.Flavor" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Flavor">
-			<xml-root-element name="flavor" />
-			<java-attributes>
-				<xml-element java-attribute="flavorId" name="flavor-id" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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" required="true" 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="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.openecomp.org.v10.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.openecomp.org.v10.Snapshot" />
-			</java-attributes>		
-		</java-type>
-		
-		<java-type name="Snapshot">
-			<xml-root-element name="snapshot" />
-			<java-attributes>
-				<xml-element java-attribute="snapshotId" name="snapshot-id" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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="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.openecomp.org.v10.Image" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Image">
-			<xml-root-element name="image" />
-			<java-attributes>
-				<xml-element java-attribute="imageId" name="image-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.Metadatum" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Metadatum">
-			<xml-root-element name="metadatum" />
-			<java-attributes>
-				<xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="metaval" name="metaval" required="true" 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.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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-key="true">
-					<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-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">
-					<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" required="true" 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 container-type="java.util.ArrayList" java-attribute="testList" name="test-list" type="java.lang.String" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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="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="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" required="true" 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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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="operationalState" name="operational-state" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v10.Customers" />
-			</java-attributes>
-		</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.openecomp.org.v10.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" required="true" 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="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="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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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="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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.ServiceInstances">
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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="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="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="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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational status of the service-instance." />
-					</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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v10.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" />
-				<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.openecomp.org.v10.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v10.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v10.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v10.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.Service" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Service">
-			<xml-root-element name="service" />
-			<java-attributes>
-				<xml-element java-attribute="serviceId" name="service-id" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v10.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v10.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v10.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v10.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v10.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v10.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v10.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v10.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v10.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v10.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v10.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v10.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v10.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v10.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v10.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v10.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v10.Zones" />
-				<xml-element java-attribute="testObjects" name="test-objects"
-					type="inventory.aai.openecomp.org.v10.TestObjects" />
-			</java-attributes>
-		</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.openecomp.org.v10.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" required="true" 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 java-attribute="linkType" name="link-type" required="true" 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="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="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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="routing-instance-id" />
-				<xml-property name="uniqueProps" 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.openecomp.org.v10.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" required="true" 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, 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.openecomp.org.v10.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="VPN Name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
-					</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="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="routeTargetRole" name="route-target-role" 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="routeTargets" name="route-targets" type="inventory.aai.openecomp.org.v10.RouteTargets" />
-				
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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,global-route-target,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="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.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Route target information" />
-				<xml-property name="container" value="route-targets" />
-				<xml-property name="canBeLinked" value="true" />
-			</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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.Vce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vce">
-			<xml-root-element name="vce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" 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" required="true" 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" required="true" 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="operationalState" name="operational-state" 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.openecomp.org.v10.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.Vnfc" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vnfc">
-			<xml-root-element name="vnfc" />
-			<java-attributes>
-				<xml-element java-attribute="vnfcName" name="vnfc-name" required="true" 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="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="function code" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="type" />
-					</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" required="true" 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" required="true" 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="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.openecomp.org.v10.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
-				<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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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="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="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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v10.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v10.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.Subnet" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Subnet">
-			<xml-root-element name="subnet" />
-			<java-attributes>
-				<xml-element java-attribute="subnetId" name="subnet-id" required="true" 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" required="true" 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="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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state" 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-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 company 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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" 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" required="true" 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="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="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-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-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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v10.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v10.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v10.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-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.openecomp.org.v10.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" required="true" 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" required="true" 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="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="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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.Newvce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Newvce">
-			<xml-root-element name="newvce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId2" name="vnf-id2" required="true" 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" required="true" 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" required="true" 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="operationalState" name="operational-state" 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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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="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 company 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" required="true" 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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v10.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v10.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
-				<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.openecomp.org.v10.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" required="true" 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="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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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="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, ,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.openecomp.org.v10.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v10.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="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-			</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="isParent" name="isParent" type="java.lang.Boolean" />
-				<xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-				<xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-				<xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" 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.openecomp.org.v10.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="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" required="true" 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" required="true" 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.openecomp.org.v10.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" />
-				<xml-property name="uniqueProps" value="model-version-id" />
-				<xml-property name="container" value="model-vers" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="true" 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" required="true" 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" required="true" 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="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v10.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v10.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="checkType" name="check-type" required="true" 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.openecomp.org.v10.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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="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" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" 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.openecomp.org.v10.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v10.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v10.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" required="true" 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.openecomp.org.v10.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v10.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v10.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" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.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.openecomp.org.v10.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v10.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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v10.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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
-			</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.openecomp.org.v10.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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.InstanceGroup" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="InstanceGroup">
-			<xml-root-element name="instance-group" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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="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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.AllottedResource" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="AllottedResource">
-			<xml-root-element name="allotted-resource" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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="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="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.openecomp.org.v10.TunnelXconnects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.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.openecomp.org.v10.TunnelXconnect" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="TunnelXconnect">
-			<xml-root-element name="tunnel-xconnect" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.Entitlement" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="Entitlement">
-			<xml-root-element name="entitlement" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" 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" required="true" 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.openecomp.org.v10.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.openecomp.org.v10.License" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="License">
-			<xml-root-element name="license" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" 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" required="true" 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.openecomp.org.v10.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" required="true" 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.openecomp.org.v10.Zone" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Zone">
-			<xml-root-element name="zone" />
-			<java-attributes>
-				<xml-element java-attribute="zoneId" name="zone-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v10.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="TestObjects">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VNFs" />
-			</xml-properties>
-			<xml-root-element name="test-objects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList"
-					java-attribute="testObject" name="test-object"
-					type="inventory.aai.openecomp.org.v10.TestObject" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-		<java-type name="TestObject">
-			<xml-root-element name="test-object" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id"
-					required="true" 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"
-					required="true" 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"
-					required="true" 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-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state"
-					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-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 company 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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true"
-					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" required="true"
-					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="dbAlias" value="model-invariant-id-local" />
-						<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="dbAlias" value="model-version-id-local" />
-						<xml-property name="requires" value="model-invariant-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="personaModelVer" name="persona-model-ver"
-					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="notVisibleTestElement"
-					name="not-visible-test-element" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="visibility" value="internal" />
-					</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-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-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="testObjects" name="test-objects" type="inventory.aai.openecomp.org.v10.TestObjects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v10.RelationshipList" />
-				
-			</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,persona-model-id,persona-model-version,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="test-objects" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</xml-properties>
-		</java-type>
-	</java-types>
-</xml-bindings>
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml
deleted file mode 100644
index e59df6c..0000000
--- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml
+++ /dev/null
@@ -1,5793 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-  ============LICENSE_START=======================================================
-  org.openecomp.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.v11" xml-mapping-metadata-complete="true">
-	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v11" />
-	</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.v11.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v11.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v11.CloudInfrastructure" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v11.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v11.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v11.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v11.AaiInternal" />
-				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v11.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.v11.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v11.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v11.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v11.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.v11.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.v11.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.v11.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v11.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.v11.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v11.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v11.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.v11.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.v11.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v11.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.v11.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v11.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.v11.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v11.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" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v11.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.v11.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.v11.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" required="true" 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.v11.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="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.v11.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.onap.org.v11.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.onap.org.v11.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.onap.org.v11.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.onap.org.v11.VirtualDataCenters" />
-			</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.v11.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" required="true" 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" required="true" 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 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.v11.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.onap.org.v11.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.onap.org.v11.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.onap.org.v11.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.onap.org.v11.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.onap.org.v11.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v11.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v11.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.onap.org.v11.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.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.v11.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="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.v11.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v11.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" required="true" 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" required="true" 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.v11.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" required="true" 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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-				<xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-				<xml-element java-attribute="state" name="state" type="java.lang.String" />
-				<xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-				<xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-				<xml-element java-attribute="region" name="region" required="true" 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.v11.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.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.v11.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" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Readable name of tenant" />
-					</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.v11.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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" />
-				<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.v11.Vserver" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vserver">
-			<xml-root-element name="vserver" />
-			<java-attributes>
-				<xml-element java-attribute="vserverId" name="vserver-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.v11.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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="vlans" name="vlans" type="inventory.aai.onap.org.v11.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.onap.org.v11.SriovVfs" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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.v11.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" required="true" 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.v11.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" />
-			</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.v11.Vlan" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vlan">
-			<xml-root-element name="vlan" />
-			<java-attributes>
-				<xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" 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="vpnId" name="vpn-id" 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" required="true" 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.v11.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v11.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-				<xml-property name="uniqueProps" value="vpn-id" />
-				<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" required="true" 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.v11.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" />
-			</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.v11.Volume" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Volume">
-			<xml-root-element name="volume" />
-			<java-attributes>
-				<xml-element java-attribute="volumeId" name="volume-id" required="true" 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" required="true" 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.v11.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.v11.Flavor" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Flavor">
-			<xml-root-element name="flavor" />
-			<java-attributes>
-				<xml-element java-attribute="flavorId" name="flavor-id" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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" required="true" 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="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.v11.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.v11.Snapshot" />
-			</java-attributes>		
-		</java-type>
-		
-		<java-type name="Snapshot">
-			<xml-root-element name="snapshot" />
-			<java-attributes>
-				<xml-element java-attribute="snapshotId" name="snapshot-id" required="true" 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.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.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="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.v11.Image" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Image">
-			<xml-root-element name="image" />
-			<java-attributes>
-				<xml-element java-attribute="imageId" name="image-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.v11.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.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.v11.Metadatum" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Metadatum">
-			<xml-root-element name="metadatum" />
-			<java-attributes>
-				<xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="metaval" name="metaval" required="true" 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.v11.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" required="true" 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" required="true" 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.v11.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.v11.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" required="true" 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.v11.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.v11.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-key="true">
-					<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-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">
-					<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" required="true" 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 container-type="java.util.ArrayList" java-attribute="testList" name="test-list" type="java.lang.String" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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="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="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" required="true" 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.v11.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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.v11.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.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.v11.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" required="true" 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" required="true" 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="operationalState" name="operational-state" 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.v11.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.v11.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" required="true" 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" required="true" 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.v11.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.v11.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.onap.org.v11.Customers" />
-			</java-attributes>
-		</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.v11.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" required="true" 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="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="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.v11.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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="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.v11.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" required="true" 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.v11.ServiceInstances">
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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="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="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="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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Operational status of the service-instance." />
-					</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.v11.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v11.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" />
-				<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.v11.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.onap.org.v11.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.onap.org.v11.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.onap.org.v11.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.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.v11.Service" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Service">
-			<xml-root-element name="service" />
-			<java-attributes>
-				<xml-element java-attribute="serviceId" name="service-id" required="true" 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" required="true" 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.v11.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.v11.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" required="true" 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" required="true" 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.v11.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.v11.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.onap.org.v11.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.onap.org.v11.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.onap.org.v11.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.onap.org.v11.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.onap.org.v11.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.onap.org.v11.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v11.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v11.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v11.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v11.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v11.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v11.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.onap.org.v11.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.onap.org.v11.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.onap.org.v11.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.onap.org.v11.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.onap.org.v11.Zones" />
-				<xml-element java-attribute="testObjects" name="test-objects"
-					type="inventory.aai.onap.org.v11.TestObjects" />
-			</java-attributes>
-		</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.v11.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" required="true" 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 java-attribute="linkType" name="link-type" required="true" 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="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="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.v11.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.v11.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" required="true" 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.v11.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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.v11.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="routing-instance-id" />
-				<xml-property name="uniqueProps" 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.v11.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" required="true" 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.v11.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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.v11.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.v11.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" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="VPN Name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
-					</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="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="routeTargetRole" name="route-target-role" 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="routeTargets" name="route-targets" type="inventory.aai.onap.org.v11.RouteTargets" />
-				
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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,global-route-target,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="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.v11.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" required="true" 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" required="true" 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.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Route target information" />
-				<xml-property name="container" value="route-targets" />
-				<xml-property name="canBeLinked" value="true" />
-			</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.v11.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" required="true" 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.v11.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.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.v11.Vce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vce">
-			<xml-root-element name="vce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" 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" required="true" 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" required="true" 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="operationalState" name="operational-state" 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.v11.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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.v11.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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.v11.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.v11.Vnfc" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vnfc">
-			<xml-root-element name="vnfc" />
-			<java-attributes>
-				<xml-element java-attribute="vnfcName" name="vnfc-name" required="true" 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="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="function code" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="type" />
-					</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" required="true" 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" required="true" 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="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.v11.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
-				<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.v11.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" required="true" 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" required="true" 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" required="true" 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="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="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" required="true" 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" required="true" 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" required="true" 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.v11.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v11.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v11.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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.v11.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.v11.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" required="true" 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.v11.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.v11.Subnet" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Subnet">
-			<xml-root-element name="subnet" />
-			<java-attributes>
-				<xml-element java-attribute="subnetId" name="subnet-id" required="true" 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" required="true" 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="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.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state" 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-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 default-value="false" required="true" 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" required="true" 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="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="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-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-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="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.onap.org.v11.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.onap.org.v11.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.onap.org.v11.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-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.v11.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" required="true" 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" required="true" 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="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="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.v11.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.v11.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" required="true" 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.v11.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.v11.Newvce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Newvce">
-			<xml-root-element name="newvce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId2" name="vnf-id2" required="true" 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" required="true" 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" required="true" 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="operationalState" name="operational-state" 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.v11.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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="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" required="true" 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.v11.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v11.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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="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.v11.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.v11.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" required="true" 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.v11.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.v11.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" required="true" 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.v11.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.onap.org.v11.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.v11.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.v11.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v11.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="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-			</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="isParent" name="isParent" type="java.lang.Boolean" />
-				<xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-				<xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-				<xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" 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.v11.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="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" required="true" 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" required="true" 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.v11.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" />
-				<xml-property name="uniqueProps" value="model-version-id" />
-				<xml-property name="container" value="model-vers" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="true" 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" required="true" 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" required="true" 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="modelElements" name="model-elements" type="inventory.aai.onap.org.v11.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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" required="true" 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.v11.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.v11.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.v11.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.v11.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="checkType" name="check-type" required="true" 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.v11.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" 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.v11.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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="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" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" 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.v11.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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.v11.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v11.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v11.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" 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.v11.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.v11.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" required="true" 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.v11.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v11.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v11.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.v11.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v11.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" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.v11.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.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.v11.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.v11.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.v11.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.v11.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v11.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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v11.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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
-			</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.v11.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" required="true" 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" required="true" 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.v11.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.v11.InstanceGroup" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="InstanceGroup">
-			<xml-root-element name="instance-group" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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" required="true" 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" required="true" 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.v11.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="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.v11.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" required="true" 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.v11.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.v11.AllottedResource" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="AllottedResource">
-			<xml-root-element name="allotted-resource" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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="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="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.v11.TunnelXconnects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.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.v11.TunnelXconnect" />
-			</java-attributes>
-		</java-type>
-		
-		<java-type name="TunnelXconnect">
-			<xml-root-element name="tunnel-xconnect" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.v11.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.v11.Entitlement" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="Entitlement">
-			<xml-root-element name="entitlement" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" 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" required="true" 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.v11.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.v11.License" />
-			</java-attributes>
-		</java-type>
-				
-		<java-type name="License">
-			<xml-root-element name="license" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" 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" required="true" 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.v11.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" required="true" 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.v11.Zone" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Zone">
-			<xml-root-element name="zone" />
-			<java-attributes>
-				<xml-element java-attribute="zoneId" name="zone-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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.v11.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="TestObjects">
-			<xml-properties>
-				<xml-property name="description" value="Collection of VNFs" />
-			</xml-properties>
-			<xml-root-element name="test-objects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList"
-					java-attribute="testObject" name="test-object"
-					type="inventory.aai.onap.org.v11.TestObject" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-			</xml-properties>
-		</java-type>
-		<java-type name="TestObject">
-			<xml-root-element name="test-object" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id"
-					required="true" 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"
-					required="true" 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"
-					required="true" 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-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state"
-					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-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 default-value="false" required="true"
-					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" required="true"
-					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="dbAlias" value="model-invariant-id-local" />
-						<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="dbAlias" value="model-version-id-local" />
-						<xml-property name="requires" value="model-invariant-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="personaModelVer" name="persona-model-ver"
-					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="notVisibleTestElement"
-					name="not-visible-test-element" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="visibility" value="internal" />
-					</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-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-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="testObjects" name="test-objects" type="inventory.aai.onap.org.v11.TestObjects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
-				
-			</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,persona-model-id,persona-model-version,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="test-objects" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</xml-properties>
-		</java-type>
-	</java-types>
-</xml-bindings>
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v8.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v8.xml
deleted file mode 100644
index 1eb8f9c..0000000
--- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v8.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-  ============LICENSE_START=======================================================
-  org.openecomp.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.openecomp.org.v8" xml-mapping-metadata-complete="true">
-	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v8" />
-	</xml-schema>
-	<java-types>
-
-		<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.openecomp.org.v8.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="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.openecomp.org.v8.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v8.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" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Value of the attribute." />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-		</java-type>
-		</java-types>
-</xml-bindings>
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml b/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml
deleted file mode 100644
index 126f286..0000000
--- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml
+++ /dev/null
@@ -1,5574 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-  ============LICENSE_START=======================================================
-  org.openecomp.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.openecomp.org.v9" xml-mapping-metadata-complete="true">
-	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.openecomp.aai.inventory/v9" />
-	</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.openecomp.org.v9.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.openecomp.org.v9.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.openecomp.org.v9.CloudInfrastructure" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.openecomp.org.v9.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.openecomp.org.v9.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.openecomp.org.v9.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.openecomp.org.v9.AaiInternal" />
-				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.openecomp.org.v9.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.openecomp.org.v9.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.openecomp.org.v9.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.openecomp.org.v9.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" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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="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.openecomp.org.v9.Complexes" />
-				<xml-element java-attribute="cloudRegions" name="cloud-regions" type="inventory.aai.openecomp.org.v9.CloudRegions" />
-				<xml-element java-attribute="networkProfiles" name="network-profiles" type="inventory.aai.openecomp.org.v9.NetworkProfiles" />
-				<xml-element java-attribute="pservers" name="pservers" type="inventory.aai.openecomp.org.v9.Pservers" />
-				<xml-element java-attribute="virtualDataCenters" name="virtual-data-centers" type="inventory.aai.openecomp.org.v9.VirtualDataCenters" />
-			</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.openecomp.org.v9.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" required="true" 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" required="true" 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 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.openecomp.org.v9.VolumeGroups" />
-				<xml-element java-attribute="tenants" name="tenants" type="inventory.aai.openecomp.org.v9.Tenants" />
-				<xml-element java-attribute="flavors" name="flavors" type="inventory.aai.openecomp.org.v9.Flavors" />
-				<xml-element java-attribute="groupAssignments" name="group-assignments" type="inventory.aai.openecomp.org.v9.GroupAssignments" />
-				<xml-element java-attribute="snapshots" name="snapshots" type="inventory.aai.openecomp.org.v9.Snapshots" />
-				<xml-element java-attribute="images" name="images" type="inventory.aai.openecomp.org.v9.Images" />
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.openecomp.org.v9.DvsSwitches" />
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.openecomp.org.v9.OamNetworks" />
-				<xml-element java-attribute="availabilityZones" name="availability-zones" type="inventory.aai.openecomp.org.v9.AvailabilityZones" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-			</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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vfModulePersonaModelCustomizationId" name="vf-module-persona-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-property name="dbAlias" value="vf-module-model-customization-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.openecomp.org.v9.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.openecomp.org.v9.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="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.openecomp.org.v9.RelationshipData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.openecomp.org.v9.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" required="true" 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" required="true" 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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="street2" name="street2" type="java.lang.String" />
-				<xml-element java-attribute="city" name="city" required="true" type="java.lang.String" />
-				<xml-element java-attribute="state" name="state" type="java.lang.String" />
-				<xml-element java-attribute="postalCode" name="postal-code" required="true" type="java.lang.String" />
-				<xml-element java-attribute="country" name="country" required="true" type="java.lang.String" />
-				<xml-element java-attribute="region" name="region" required="true" 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.openecomp.org.v9.CtagPools" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Readable name of tenant" />
-					</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.openecomp.org.v9.Vservers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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" />
-				<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.openecomp.org.v9.Vserver" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vserver">
-			<xml-root-element name="vserver" />
-			<java-attributes>
-				<xml-element java-attribute="vserverId" name="vserver-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.Volumes" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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="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="vlans" name="vlans" type="inventory.aai.openecomp.org.v9.Vlans" />
-				<xml-element java-attribute="sriovVfs" name="sriov-vfs" type="inventory.aai.openecomp.org.v9.SriovVfs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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" />
-			</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.openecomp.org.v9.Vlan" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vlan">
-			<xml-root-element name="vlan" />
-			<java-attributes>
-				<xml-element java-attribute="vlanInterface" name="vlan-interface" required="true" 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="vpnId" name="vpn-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This indicates the customers VPN ID associated with this vlan" />
-						<xml-property name="dbAlias" value="vpn-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="Status of a vnf's vlan interface, on which the customer circuit resides, mastered by SDN-C." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv4AddressList" name="l3-interface-ipv4-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv4AddressList" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.openecomp.org.v9.L3InterfaceIpv6AddressList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Definition of vlan" />
-				<xml-property name="indexedProps" value="vlan-interface,vlan-id-inner,vpn-id" />
-				<xml-property name="uniqueProps" value="vpn-id" />
-				<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" required="true" 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.openecomp.org.v9.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" />
-			</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.openecomp.org.v9.Volume" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Volume">
-			<xml-root-element name="volume" />
-			<java-attributes>
-				<xml-element java-attribute="volumeId" name="volume-id" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.Flavor" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Flavor">
-			<xml-root-element name="flavor" />
-			<java-attributes>
-				<xml-element java-attribute="flavorId" name="flavor-id" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="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" required="true" 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="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.openecomp.org.v9.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.openecomp.org.v9.Snapshot" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Snapshot">
-			<xml-root-element name="snapshot" />
-			<java-attributes>
-				<xml-element java-attribute="snapshotId" name="snapshot-id" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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="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.openecomp.org.v9.Image" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Image">
-			<xml-root-element name="image" />
-			<java-attributes>
-				<xml-element java-attribute="imageId" name="image-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.Metadatum" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Metadatum">
-			<xml-root-element name="metadatum" />
-			<java-attributes>
-				<xml-element java-attribute="metaname" name="metaname" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="metaval" name="metaval" required="true" 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.openecomp.org.v9.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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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-key="true">
-					<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-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">
-					<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" required="true" 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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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="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="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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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 java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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="operationalState" name="operational-state" 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-property name="dbAlias" value="operational-status" />
-					</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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.Connectors" />
-				<xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v9.Customers" />
-			</java-attributes>
-		</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.openecomp.org.v9.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" required="true" 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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
-						<xml-property name="visibility" value="deployment" />
-					</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="deployment" />
-					</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="internal" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
-					</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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.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,persona-model-id,persona-model-version,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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.ServiceSubscriptions" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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="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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.ServiceInstances">
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
-						<xml-property name="visibility" value="deployment" />
-					</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="deployment" />
-					</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="internal" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
-					</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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
-				<xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.openecomp.org.v9.AllottedResources" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Instance of a service" />
-				<xml-property name="indexedProps" value="service-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version,service-instance-name,service-instance-location-id,orchestration-status" />
-				<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.openecomp.org.v9.VnfImages" />
-				<xml-element java-attribute="services" name="services" type="inventory.aai.openecomp.org.v9.Services" />
-				<xml-element java-attribute="serviceCapabilities" name="service-capabilities" type="inventory.aai.openecomp.org.v9.ServiceCapabilities" />
-				<xml-element java-attribute="models" name="models" type="inventory.aai.openecomp.org.v9.Models" />
-				<xml-element java-attribute="namedQueries" name="named-queries" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.Service" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Service">
-			<xml-root-element name="service" />
-			<java-attributes>
-				<xml-element java-attribute="serviceId" name="service-id" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.LogicalLinks" />
-				<xml-element java-attribute="sitePairSets" name="site-pair-sets" type="inventory.aai.openecomp.org.v9.SitePairSets" />
-				<xml-element java-attribute="vpnBindings" name="vpn-bindings" type="inventory.aai.openecomp.org.v9.VpnBindings" />
-				<xml-element java-attribute="vplsPes" name="vpls-pes" type="inventory.aai.openecomp.org.v9.VplsPes" />
-				<xml-element java-attribute="multicastConfigurations" name="multicast-configurations" type="inventory.aai.openecomp.org.v9.MulticastConfigurations" />
-				<xml-element java-attribute="vces" name="vces" type="inventory.aai.openecomp.org.v9.Vces" />
-				<xml-element java-attribute="vnfcs" name="vnfcs" type="inventory.aai.openecomp.org.v9.Vnfcs" />
-				<xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.openecomp.org.v9.L3Networks" />
-				<xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.openecomp.org.v9.NetworkPolicies" />
-				<xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.openecomp.org.v9.GenericVnfs" />
-				<xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.openecomp.org.v9.LagLinks" />
-				<xml-element java-attribute="newvces" name="newvces" type="inventory.aai.openecomp.org.v9.Newvces" />
-				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.openecomp.org.v9.Pnfs" />
-				<xml-element java-attribute="physicalLinks" name="physical-links" type="inventory.aai.openecomp.org.v9.PhysicalLinks" />
-				<xml-element java-attribute="ipsecConfigurations" name="ipsec-configurations" type="inventory.aai.openecomp.org.v9.IpsecConfigurations" />
-				<xml-element java-attribute="routeTableReferences" name="route-table-references" type="inventory.aai.openecomp.org.v9.RouteTableReferences" />
-				<xml-element java-attribute="instanceGroups" name="instance-groups" type="inventory.aai.openecomp.org.v9.InstanceGroups" />
-				<xml-element java-attribute="zones" name="zones" type="inventory.aai.openecomp.org.v9.Zones" />
-				<xml-element java-attribute="testObjects" name="test-objects" type="inventory.aai.openecomp.org.v9.TestObjects" />
-			</java-attributes>
-		</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.openecomp.org.v9.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" required="true" 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 java-attribute="linkType" name="link-type" required="true" 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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
-						<xml-property name="visibility" value="deployment" />
-					</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="deployment" />
-					</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="internal" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
-					</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.openecomp.org.v9.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,persona-model-id,persona-model-version,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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.RoutingInstances" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.SitePairs" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="routing-instance-id" />
-				<xml-property name="uniqueProps" 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.openecomp.org.v9.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" required="true" 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, 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.openecomp.org.v9.ClassesOfService" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="VPN Name" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="globalRouteTarget" name="global-route-target" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Number used to identify a VPN, globally unique in the network" />
-						<xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}" />
-					</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="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="routeTargetRole" name="route-target-role" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Role assigned to this route target" />
-						<xml-property name="dataLink" value="./route-targets/route-target/{global-route-target}/{route-target-role}" />
-						<xml-property name="defaultValue" value="BOTH" />
-					</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.openecomp.org.v9.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,global-route-target,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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.Vce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vce">
-			<xml-root-element name="vce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" 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" required="true" 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" required="true" 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="operationalState" name="operational-state" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-						<xml-property name="dbAlias" value="operational-status" />
-					</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.openecomp.org.v9.PortGroups" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.Entitlements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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.openecomp.org.v9.CvlanTags" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.Vnfc" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vnfc">
-			<xml-root-element name="vnfc" />
-			<java-attributes>
-				<xml-element java-attribute="vnfcName" name="vnfc-name" required="true" 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="vnfcFunctionCode" name="vnfc-function-code" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="function code" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vnfcType" name="vnfc-type" required="true" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="type" />
-					</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" required="true" 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" required="true" 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="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.openecomp.org.v9.RelationshipList" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="indexedProps" value="vnfc-name,prov-status,vnfc-type,vnfc-function-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation" />
-				<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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
-						<xml-property name="visibility" value="deployment" />
-					</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="deployment" />
-					</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="internal" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
-					</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" required="true" 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" required="true" 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" required="true" 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="subnets" name="subnets" type="inventory.aai.openecomp.org.v9.Subnets" />
-				<xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.openecomp.org.v9.CtagAssignments" />
-				<xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.openecomp.org.v9.SegmentationAssignments" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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,persona-model-id,persona-model-version,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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.Subnet" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Subnet">
-			<xml-root-element name="subnet" />
-			<java-attributes>
-				<xml-element java-attribute="subnetId" name="subnet-id" required="true" 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" required="true" 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="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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state" 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-property name="dbAlias" value="operational-status" />
-					</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-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 company 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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" 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" required="true" 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   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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
-						<xml-property name="visibility" value="deployment" />
-					</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="deployment" />
-					</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="internal" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
-					</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="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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.LInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
-				<xml-element java-attribute="vfModules" name="vf-modules" type="inventory.aai.openecomp.org.v9.VfModules" />
-				<xml-element java-attribute="licenses" name="licenses" type="inventory.aai.openecomp.org.v9.Licenses" />
-				<xml-element java-attribute="entitlements" name="entitlements" type="inventory.aai.openecomp.org.v9.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,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
-				<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-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.openecomp.org.v9.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" required="true" 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" required="true" 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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
-						<xml-property name="visibility" value="deployment" />
-					</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="deployment" />
-					</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="internal" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
-					</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.openecomp.org.v9.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,persona-model-id,persona-model-version,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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.Newvce" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Newvce">
-			<xml-root-element name="newvce" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId2" name="vnf-id2" required="true" 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" required="true" 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" required="true" 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="operationalState" name="operational-state" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-						<xml-property name="dbAlias" value="operational-status" />
-					</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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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="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 company 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" required="true" 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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.openecomp.org.v9.PInterfaces" />
-				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v9.LagInterfaces" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function. typically equipment used in the D1 world." />
-				<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.openecomp.org.v9.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" required="true" 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="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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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="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, ,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.openecomp.org.v9.RelationshipList" />
-				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v9.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="edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-			</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="isParent" name="isParent" type="java.lang.Boolean" />
-				<xml-element java-attribute="usesResource" name="usesResource" type="java.lang.Boolean" />
-				<xml-element java-attribute="hasDelTarget" name="hasDelTarget" type="java.lang.Boolean" />
-				<xml-element java-attribute="SVC-INFRA" name="SVC-INFRA" type="java.lang.Boolean" />
-				<xml-element java-attribute="SVC-INFRA-REV" name="SVC-INFRA-REV" type="java.lang.Boolean" />
-			</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.openecomp.org.v9.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="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" required="true" 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" required="true" 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.openecomp.org.v9.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" />
-				<xml-property name="uniqueProps" value="model-version-id" />
-				<xml-property name="container" value="model-vers" />
-			</xml-properties>
-			<java-attributes>
-				<xml-element java-attribute="modelVersionId" name="model-version-id" required="true" 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" required="true" 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" required="true" 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="modelElements" name="model-elements" type="inventory.aai.openecomp.org.v9.ModelElements" />
-				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.org.v9.Metadata" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="constrainedElementSets" name="constrained-element-sets" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="checkType" name="check-type" required="true" 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.openecomp.org.v9.ElementChoiceSets" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" 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.openecomp.org.v9.ModelElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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="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" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" 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.openecomp.org.v9.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.openecomp.org.v9.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.openecomp.org.v9.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.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" required="true" 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" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyName" name="property-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="propertyValue" name="property-value" required="true" 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.openecomp.org.v9.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.openecomp.org.v9.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.openecomp.org.v9.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" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.ModelVers" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.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.openecomp.org.v9.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.openecomp.org.v9.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-any-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.openecomp.org.v9.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-any-element java-attribute="propertyValue" lax="true" name="property-value" />
-			</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.openecomp.org.v9.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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.InstanceGroup" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="InstanceGroup">
-			<xml-root-element name="instance-group" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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="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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.AllottedResource" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="AllottedResource">
-			<xml-root-element name="allotted-resource" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-id-local" />
-						<xml-property name="visibility" value="deployment" />
-					</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="deployment" />
-					</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="internal" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
-					</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="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.openecomp.org.v9.TunnelXconnects" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v9.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,persona-model-id,persona-model-version" />
-				<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.openecomp.org.v9.TunnelXconnect" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="TunnelXconnect">
-			<xml-root-element name="tunnel-xconnect" />
-			<java-attributes>
-				<xml-element java-attribute="id" name="id" required="true" 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" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.Entitlement" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Entitlement">
-			<xml-root-element name="entitlement" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" 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" required="true" 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.openecomp.org.v9.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.openecomp.org.v9.License" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="License">
-			<xml-root-element name="license" />
-			<java-attributes>
-				<xml-element java-attribute="groupUuid" name="group-uuid" required="true" 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" required="true" 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.openecomp.org.v9.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" required="true" 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.openecomp.org.v9.Zone" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Zone">
-			<xml-root-element name="zone" />
-			<java-attributes>
-				<xml-element java-attribute="zoneId" name="zone-id" required="true" 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" required="true" 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" required="true" 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" required="true" 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.openecomp.org.v9.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="TestObjects">
-			<xml-root-element name="test-objects" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="testObject" name="test-object" type="inventory.aai.openecomp.org.v9.TestObject" />
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="maximumDepth" value="0" />
-				<xml-property name="description" value="Collection of VNFs" />
-			</xml-properties>
-		</java-type>
-
-		<java-type name="TestObject">
-			<xml-root-element name="test-object" />
-			<java-attributes>
-				<xml-element java-attribute="vnfId" name="vnf-id" required="true" 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" required="true" 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" required="true" 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-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalState" name="operational-state" 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-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 company 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 test-object, also used for troubleshooting and is IP used for traps generated by test-object." />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</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 in some usecases" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" required="true" 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" required="true" 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 test-object 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   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="personaModelId" name="persona-model-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="dbAlias" value="model-invariant-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-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="internal" />
-						<xml-property name="dbAlias" value="model-version-id-local" />
-						<xml-property name="dataCopy" value="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="personaModelCustomizationId" name="persona-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-property name="dbAlias" value="model-customization-id" />
-					</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="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.openecomp.org.v9.RelationshipList" />
-			</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,persona-model-id,persona-model-version,widget-model-id,widget-model-version" />
-				<xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2" />
-				<xml-property name="uniqueProps" value="vnf-id" />
-				<xml-property name="container" value="test-objects" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</xml-properties>
-		</java-type>
-	</java-types>
-</xml-bindings>
diff --git a/aai-resources/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json b/aai-resources/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json
deleted file mode 100644
index 40a0493..0000000
--- a/aai-resources/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"global-customer-id": "key1",
-	"subscriber-name": "44IPZu0Ri",
-	"subscriber-type": "gIgOtou5Np5u",
-	"service-subscriptions": {
-      "service-subscription" : [ {
-         "service-type" : "key2",
-         "temp-ub-sub-account-id" : "JJYRez",
-         "service-instances" : {
-            "service-instance" : [ {
-               "service-instance-id" : "nested-instance-key",
-               "model-invariant-id" : "key1",
-               "model-version-id" : "key2"
-               }]
-               }
-               }]
-               }
-               }
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid.json b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid.json
new file mode 100644
index 0000000..baf8392
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions-invalid.json
@@ -0,0 +1,44 @@
+{
+  "transactions": [
+    {
+      "put": [
+        {
+          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
+          "body": {
+            "hostname": "pserver-hostname-11",
+            "fqdn": "fake-fqdn-11"
+          }
+        }
+      ]
+    },
+    {
+      "patch": [
+        {
+          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
+          "body": {
+            "fqdn": "fake-fqdn-12"
+          }
+        }
+      ]
+    },
+    {
+      "delete": [
+        {
+          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
+          "body": {
+            "hostname": "pserver-hostname-11"
+          }
+        }
+      ]
+    },
+    {
+      "get": [
+        {
+          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
+          "body": {
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/bulk/pserver-transactions.json b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions.json
new file mode 100644
index 0000000..cf0698c
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/bulk/pserver-transactions.json
@@ -0,0 +1,35 @@
+{
+  "transactions": [
+    {
+      "put": [
+        {
+          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
+          "body": {
+            "hostname": "pserver-hostname-11",
+            "fqdn": "fake-fqdn-11"
+          }
+        }
+      ]
+    },
+    {
+      "patch": [
+        {
+          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
+          "body": {
+            "fqdn": "fake-fqdn-12"
+          }
+        }
+      ]
+    },
+    {
+      "delete": [
+        {
+          "uri": "/cloud-infrastructure/pservers/pserver/pserver-hostname-11",
+          "body": {
+            "hostname": "pserver-hostname-11"
+          }
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/modeltransforms/model.json b/aai-resources/src/test/resources/payloads/modeltransforms/model.json
new file mode 100644
index 0000000..731dd8c
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/modeltransforms/model.json
@@ -0,0 +1,38 @@
+{
+  "model-invariant-id": "fe8aac07-ce6c-4f9f-aa0d-b561c77da9e8-test01",
+  "model-type": "resource",
+  "model-vers": {
+    "model-ver": [
+      {
+        "model-version-id": "0d23052d-8ffe-433e-a25d-da5da027bb7c",
+        "model-name": "vDbe",
+        "model-version": "v1.0",
+        "model-elements": {
+          "model-element": [
+            {
+              "new-data-del-flag": "F",
+              "cardinality": "unbounded",
+              "relationship-list": {
+                "relationship": [
+                  {
+                    "related-to": "model-ver",
+                    "relationship-data": [
+                      {
+                        "relationship-key": "model.model-invariant-id",
+                        "relationship-value": "6dcdbbc8-23b6-42c3-ac9f-2c0a3fe8cfba"
+                      },
+                      {
+                        "relationship-key": "model-ver.model-version-id",
+                        "relationship-value": "22382f81-70cb-470d-8ab2-3e1b9fad10df"
+                      }
+                    ]
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/modeltransforms/model.xml b/aai-resources/src/test/resources/payloads/modeltransforms/model.xml
new file mode 100644
index 0000000..ea16fda
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/modeltransforms/model.xml
@@ -0,0 +1,22 @@
+<model xmlns="http://org.openecomp.aai.inventory/v8">
+<model-id>fe8aac07-ce6c-4f9f-aa0d-b561c77da9e8-test01</model-id>
+<model-type>resource</model-type>
+<model-name>vDbe</model-name>
+<model-version>v1.0</model-version>
+<model-name-version-id>0d23052d-8ffe-433e-a25d-da5da027bb7c</model-name-version-id>
+<model-elements>
+    <model-element>
+        <new-data-del-flag>F</new-data-del-flag>
+        <cardinality>unbounded</cardinality>
+        <relationship-list>
+            <relationship>
+                <related-to>model</related-to>
+                <relationship-data>
+                    <relationship-key>model.model-name-version-id</relationship-key>
+                    <relationship-value>22382f81-70cb-470d-8ab2-3e1b9fad10df</relationship-value>
+                </relationship-data>
+            </relationship>
+        </relationship-list>
+    </model-element>
+</model-elements>
+</model>
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/relationship/complex.json b/aai-resources/src/test/resources/payloads/relationship/complex.json
new file mode 100644
index 0000000..77c3c21
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/relationship/complex.json
@@ -0,0 +1,16 @@
+{
+  "physical-location-id" : "e13d4587-19ad-4bf5-80f5-c021efb5b61c",
+  "physical-location-type" : "uug",
+  "street1" : "kDv5Ge6dr",
+  "city" : "KpEa5IjqY0u82",
+  "postal-code" : "6CRqacfEW2",
+  "country" : "P0ho",
+  "region" : "Sk2QevPYRBjT",
+  "ctag-pools" : {
+    "ctag-pool" : [ {
+      "target-pe" : "5dbe73c6-cedf-4e68-a7c5-699ba6d90e1d",
+      "availability-zone-name" : "819ec2fa-fb9f-49f0-8fd8-5feb941aad1f",
+      "ctag-pool-purpose" : "4TMeWI"
+    } ]
+  }
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/relationship/pserver-complex-relationship.json b/aai-resources/src/test/resources/payloads/relationship/pserver-complex-relationship.json
new file mode 100644
index 0000000..07d1625
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/relationship/pserver-complex-relationship.json
@@ -0,0 +1,8 @@
+{
+  "related-to" : "complex",
+  "related-link" : "/aai/v11/cloud-infrastructure/complexes/complex/e13d4587-19ad-4bf5-80f5-c021efb5b61c",
+  "relationship-data" : [{
+    "relationship-key" : "complex.physical-location-id",
+    "relationship-value" : "e13d4587-19ad-4bf5-80f5-c021efb5b61c"
+  }]
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/relationship/pserver.json b/aai-resources/src/test/resources/payloads/relationship/pserver.json
new file mode 100644
index 0000000..661648a
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/relationship/pserver.json
@@ -0,0 +1,4 @@
+{
+  "hostname" : "590a8943-1200-43b3-825b-75dde6b8f44a",
+  "in-maint" : false
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/resource/pserver-patch-test.json b/aai-resources/src/test/resources/payloads/resource/pserver-patch-test.json
new file mode 100644
index 0000000..8d7aa93
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/resource/pserver-patch-test.json
@@ -0,0 +1,28 @@
+{
+  "hostname": "pserver-patch-test",
+  "ptnii-equip-name": "example-ptnii-equip-name-val-36969",
+  "number-of-cpus": 62220,
+  "disk-in-gigabytes": 872,
+  "ram-in-megabytes": 35331,
+  "equip-type": "example-equip-type-val-22986",
+  "equip-vendor": "example-equip-vendor-val-37452",
+  "equip-model": "example-equip-model-val-14665",
+  "fqdn": "example-fqdn-val-33429",
+  "pserver-selflink": "example-pserver-selflink-val-10125",
+  "ipv4-oam-address": "example-ipv4-oam-address-val-3155",
+  "serial-number": "example-serial-number-val-12010",
+  "ipaddress-v4-loopback-0": "example-ipaddress-v4-loopback0-val-77686",
+  "ipaddress-v6-loopback-0": "example-ipaddress-v6-loopback0-val-17856",
+  "ipaddress-v4-aim": "example-ipaddress-v4-aim-val-33665",
+  "ipaddress-v6-aim": "example-ipaddress-v6-aim-val-6210",
+  "ipaddress-v6-oam": "example-ipaddress-v6-oam-val-40977",
+  "inv-status": "example-inv-status-val-3682",
+  "pserver-id": "example-pserver-id-val-82142",
+  "internet-topology": "example-internet-topology-val-56425",
+  "in-maint": true,
+  "pserver-name2": "example-pserver-name2-val-53802",
+  "purpose": "example-purpose-val-90218",
+  "prov-status": "example-prov-status-val-11642",
+  "management-option": "example-management-option-val-91111",
+  "host-profile": "example-host-profile-val-36247"
+}
\ No newline at end of file
diff --git a/aai-resources/src/test/resources/payloads/resource/pserver.json b/aai-resources/src/test/resources/payloads/resource/pserver.json
new file mode 100644
index 0000000..51c25a8
--- /dev/null
+++ b/aai-resources/src/test/resources/payloads/resource/pserver.json
@@ -0,0 +1,28 @@
+{
+  "hostname": "pserver-hostname-test",
+  "ptnii-equip-name": "example-ptnii-equip-name-val-36969",
+  "number-of-cpus": 62220,
+  "disk-in-gigabytes": 872,
+  "ram-in-megabytes": 35331,
+  "equip-type": "example-equip-type-val-22986",
+  "equip-vendor": "example-equip-vendor-val-37452",
+  "equip-model": "example-equip-model-val-14665",
+  "fqdn": "example-fqdn-val-33429",
+  "pserver-selflink": "example-pserver-selflink-val-10125",
+  "ipv4-oam-address": "example-ipv4-oam-address-val-3155",
+  "serial-number": "example-serial-number-val-12010",
+  "ipaddress-v4-loopback-0": "example-ipaddress-v4-loopback0-val-77686",
+  "ipaddress-v6-loopback-0": "example-ipaddress-v6-loopback0-val-17856",
+  "ipaddress-v4-aim": "example-ipaddress-v4-aim-val-33665",
+  "ipaddress-v6-aim": "example-ipaddress-v6-aim-val-6210",
+  "ipaddress-v6-oam": "example-ipaddress-v6-oam-val-40977",
+  "inv-status": "example-inv-status-val-3682",
+  "pserver-id": "example-pserver-id-val-82142",
+  "internet-topology": "example-internet-topology-val-56425",
+  "in-maint": true,
+  "pserver-name2": "example-pserver-name2-val-53802",
+  "purpose": "example-purpose-val-90218",
+  "prov-status": "example-prov-status-val-11642",
+  "management-option": "example-management-option-val-91111",
+  "host-profile": "example-host-profile-val-36247"
+}
\ No newline at end of file