Update the aai-common with the latest code

Change-Id: Ia4758a3d7e462e5120fa1db7ebe97adaeac3ebc2 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
author: Venkata Harish K Kajur <vk250x@att.com> 2017-05-24 13:46:23 -0400
committer: Venkata Harish K Kajur <vk250x@att.com> 2017-05-24 13:46:59 -0400
commit: a93b19450f6fb966afa1c30a6795e8e670d2aee7 (patch)
tree: a248d180e9d41a177887a02c4b4d82cfb7176871 /aai-schema
parent: c2fddaed33f9f7bbec3feca7bf905f0a1e56b3ed (diff)
8 files changed, 15185 insertions, 11408 deletions
diff --git a/aai-schema/.classpath b/aai-schema/.classpath
index c6b9d3e7..6ff0f58b 100644
--- a/aai-schema/.classpath
+++ b/aai-schema/.classpath
@@ -11,12 +11,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" path="target/generated-sources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
 		<attributes>
diff --git a/aai-schema/src/main/java/org/openecomp/aai/schema/enums/PropertyMetadata.java b/aai-schema/src/main/java/org/openecomp/aai/schema/enums/PropertyMetadata.java
index 59797cfd..4e177b2b 100644
--- a/aai-schema/src/main/java/org/openecomp/aai/schema/enums/PropertyMetadata.java
+++ b/aai-schema/src/main/java/org/openecomp/aai/schema/enums/PropertyMetadata.java
@@ -48,6 +48,10 @@ public enum PropertyMetadata {
 	 */
 	VISIBILITY("visibility"),
 	/**
+	 * specifies a field which must be populated to pass validation
+	 */
+	REQUIRES("requires"),
+	/**
 	 * automatically creates an id for the property if not specified
 	 */
 	AUTO_GENERATE_UUID("autoGenerateUuid"),
diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd
index bf05ced7..690352b3 100644
--- a/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd
+++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v10.xsd
@@ -2288,14 +2288,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",dbAlias="model-version-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2435,14 +2435,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",dbAlias="model-version-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2530,14 +2530,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",dbAlias="model-version-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -3403,14 +3403,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",dbAlias="model-version-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -4883,14 +4883,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",dbAlias="model-version-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5084,14 +5084,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",dbAlias="model-version-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5402,14 +5402,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",dbAlias="model-invariant-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",dbAlias="model-version-id-local")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6046,7 +6046,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6088,7 +6088,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6109,7 +6109,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user,nmteHostName")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user, ,nmteHostName")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6282,7 +6282,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="design-type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large]")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large?]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6583,9 +6583,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="extra-property">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="extra-properties">
     <xs:complexType>
-      <xs:sequence/>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Extra properties for inventory item for response list")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:extra-property" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
     </xs:complexType>
   </xs:element>
   <xs:element name="inventory-response-item">
@@ -6626,13 +6641,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="extra-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
   <xs:element name="vnf">
     <xs:complexType>
       <xs:annotation>
diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd
index ecbbd5b0..27d18ab1 100644
--- a/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd
+++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v8.xsd
@@ -5,13 +5,81 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     xmlns:annox="http://annox.dev.java.net" 
     jaxb:extensionBindingPrefixes="annox">
 
+  <xs:element name="inventory-item-data">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="inventory-item">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tagged-inventory-item-list">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="edge-tag-query-result">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="start-node-filter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="include-node-filter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="secondary-filter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
+        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>
+        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="edge-tag-query-request">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="edge-tag" type="xs:string" minOccurs="0"/>
+        <xs:element name="result-detail" type="xs:string" minOccurs="0"/>
+        <xs:element name="start-node-type" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:start-node-filter" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:include-node-filter" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:secondary-filter" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="result-data">
     <xs:complexType>
       <xs:sequence>
         <xs:element name="resource-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The specific type of node in the AAI graph")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The specific type of node in the A&amp;AI graph")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -32,10 +100,249 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="relationship-data">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="relationship-key" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate an attribute.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="relationship-value" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="related-to-property">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="property-key" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="property-value" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="relationship">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="related-to" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by A&amp;AI to indicate type of node.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="related-link" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to the object in A&amp;AI.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="relationship-list">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="oam-network">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="OAM network, to be deprecated shortly.  Do not use for new purposes. ",nameProps="network-name",indexedProps="cvlan-tag,network-uuid,network-name",dependentOn="cloud-region",container="oam-networks")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="network-uuid" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of the network. Unique across a cloud-region")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="network-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the network.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="cvlan-id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for VNF firewall rule so customer cannot send customer traffic over this oam network")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="oam-networks">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of OAM networks, to be deprecated shortly.  Do not use for new purposes. ")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:oam-network" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="dvs-switch">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="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. ",indexedProps="vcenter-url,switch-name",dependentOn="cloud-region",container="dvs-switches")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="switch-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="DVS switch name")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vcenter-url" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL used to reach the vcenter")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="dvs-switches">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of digital virtual switch metadata used for vmWare VCEs and VPEs.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:dvs-switch" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="availability-zone">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="availability-zone-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="hypervisor-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="operational-state" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values.",dbAlias="operational-status")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="az-and-dvs-switches">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
+        <xs:element ref="tns:availability-zone" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sdn-zone-response">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:oam-networks" minOccurs="0"/>
+        <xs:element ref="tns:az-and-dvs-switches" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="search">
     <xs:complexType>
       <xs:sequence>
+        <xs:element ref="tns:edge-tag-query-result" minOccurs="0"/>
+        <xs:element ref="tns:edge-tag-query-request" minOccurs="0"/>
         <xs:element ref="tns:search-results" minOccurs="0"/>
+        <xs:element ref="tns:sdn-zone-response" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -67,7 +374,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team.")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -110,72 +417,135 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="relationship-data">
+  <xs:element name="ctag-pool">
     <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="A collection of C tags (vlan tags) grouped for a specific purpose.",indexedProps="availability-zone-name",dependentOn="complex",container="ctag-pools")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
       <xs:sequence>
-        <xs:element name="relationship-key" type="xs:string">
+        <xs:element name="target-pe" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by AAI to indicate an attribute.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="The Target provider edge router")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="relationship-value" type="xs:string">
+        <xs:element name="availability-zone-name" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value of the attribute.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="related-to-property">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-key" type="xs:string" minOccurs="0">
+        <xs:element name="ctag-pool-purpose" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Key part of a key/value pair")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Describes what the intended purpose of this pool is.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="property-value" type="xs:string" minOccurs="0">
+        <xs:element name="ctag-values" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Value part of a key/value pair")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Comma separated list of ctags")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="relationship">
+  <xs:element name="ctag-pools">
     <xs:complexType>
       <xs:sequence>
-        <xs:element name="related-to" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:ctag-pool" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="complex">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.",indexedProps="identity-url,data-center-code,complex-name,physical-location-id",searchable="physical-location-id,data-center-code,complex-name,street1,street2,postal-code",uniqueProps="physical-location-id",container="complexes",namespace="cloud-infrastructure")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="physical-location-id" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="A keyword provided by AAI to indicate type of node.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier for physical location, e.g., CLLI")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="related-link" type="xs:string" minOccurs="0">
+        <xs:element name="data-center-code" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to the object in AAI.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Data center code which can be an alternate way to identify a complex")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element ref="tns:relationship-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:related-to-property" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element name="complex-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gamma complex name for LCP instance.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="identity-url" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL of the keystone identity service")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="physical-location-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type, e.g., central office, data center.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="street1" type="xs:string"/>
+        <xs:element name="street2" type="xs:string" minOccurs="0"/>
+        <xs:element name="city" type="xs:string"/>
+        <xs:element name="state" type="xs:string" minOccurs="0"/>
+        <xs:element name="postal-code" type="xs:string"/>
+        <xs:element name="country" type="xs:string"/>
+        <xs:element name="region" type="xs:string"/>
+        <xs:element name="latitude" type="xs:string" minOccurs="0"/>
+        <xs:element name="longitude" type="xs:string" minOccurs="0"/>
+        <xs:element name="elevation" type="xs:string" minOccurs="0"/>
+        <xs:element name="lata" type="xs:string" minOccurs="0"/>
+        <xs:element ref="tns:ctag-pools" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="relationship-list">
+  <xs:element name="complexes">
     <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of physical locations that can house cloud-regions.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
       <xs:sequence>
-        <xs:element ref="tns:relationship" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:complex" minOccurs="0" maxOccurs="unbounded"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -211,7 +581,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="vnf-type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as SDC matures.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -493,7 +863,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="vpn-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This indicates the customers VPN ID associated with this vlan",dbAlias="vpn-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -510,11 +880,133 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="sriov-vf">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="SR-IOV Virtual Function (not to be confused with virtual network function)",indexedProps="pci-id,vf-vlan-filter,vf-mac-filter,vf-vlan-strip,neutron-network-id",dependentOn="l-interface",container="sriov-vfs")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="pci-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="PCI ID used to identify the sriov-vf")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-vlan-filter" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This metadata provides option to specify list of VLAN filters applied on VF to pass the traffic to VM.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-mac-filter" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When MAC filters are specified, VF-agent service configures VFs to do MAC level filtering before the traffic is passed to VM.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-vlan-strip" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="When this field is set to true, VF will configured to strip the outer TAG before the traffic is passed to VM.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-vlan-anti-spoof-check" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-mac-anti-spoof-check" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="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.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-mirrors" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option defines the set of Mirror objects which essentially mirrors the traffic from source to set of collector VNF Ports.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-broadcast-allow" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows all broadcast traffic to reach the VM")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-unknown-multicast-allow" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown multicast traffic to reach the VM")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-unknown-unicast-allow" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, sets the VF in promiscuous mode and allows unknown unicast traffic to reach the VM")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-insert-stag" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option, if set to true, instructs to insert outer tag after traffic comes out of VM.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vf-link-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This option is used to set the link status.  Valid values as of 1607 are on, off, and auto.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of the interface")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sriov-vfs">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of SR-IOV Virtual Functions.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:sriov-vf" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="l-interface">
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Logical interfaces, e.g., a vnic.",indexedProps="macaddr,interface-id,interface-name,network-name",dependentOn="generic-vnf,newvce,vpe,p-interface,vserver,lag-interface",container="l-interfaces")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -570,7 +1062,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="management-option" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether AAI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Whether A&amp;AI should be managing this interface of not. Could have value like CUSTOMER")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -582,6 +1074,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
           </xs:annotation>
         </xs:element>
         <xs:element ref="tns:vlans" minOccurs="0"/>
+        <xs:element ref="tns:sriov-vfs" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
         <xs:element ref="tns:l3-interface-ipv4-address-list" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element ref="tns:l3-interface-ipv6-address-list" minOccurs="0" maxOccurs="unbounded"/>
@@ -993,7 +1486,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,model",container="metadata")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Key/value pairs",indexedProps="metaname",dependentOn="tenant,image,service-instance,connector,model",container="metadata")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1122,46 +1615,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="availability-zone">
-    <xs:complexType>
-      <xs:annotation>
-        <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Availability zone, a collection of compute hosts/pservers",indexedProps="availability-zone-name",dependentOn="cloud-region",container="availability-zones")</annox:annotate>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:sequence>
-        <xs:element name="availability-zone-name" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Name of the availability zone.  Unique across a cloud region")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="hypervisor-type" type="xs:string">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Type of hypervisor.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="operational-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="resource-version" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element ref="tns:relationship-list" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
   <xs:element name="availability-zones">
     <xs:complexType>
       <xs:annotation>
@@ -1178,7 +1631,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="cloud-region designates an installation of a cloud cluster or region or instantiation. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="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.",indexedProps="cloud-owner,cloud-region-id,cloud-type,owner-defined-type",nameProps="owner-defined-type",container="cloud-regions",namespace="cloud-infrastructure")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1206,7 +1659,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="owner-defined-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner defined type indicator")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Cloud-owner defined type indicator (e.g., DCP, LCP)")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -1251,6 +1704,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:group-assignments" minOccurs="0"/>
         <xs:element ref="tns:snapshots" minOccurs="0"/>
         <xs:element ref="tns:images" minOccurs="0"/>
+        <xs:element ref="tns:dvs-switches" minOccurs="0"/>
+        <xs:element ref="tns:oam-networks" minOccurs="0"/>
         <xs:element ref="tns:availability-zones" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>
@@ -1263,11 +1718,56 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="network-profile">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Network profile populated by SDN-GP for SNMP",indexedProps="nm-profile-name",container="network-profiles",namespace="cloud-infrastructure")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="nm-profile-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique name of network profile.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="community-string" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted SNMP community string")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="network-profiles">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of network profiles")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:network-profile" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="p-interface">
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name",dependentOn="pserver,pnf",container="p-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Physical interface (e.g., nic)",indexedProps="interface-name",dependentOn="vpls-pe,pserver,pnf",container="p-interfaces")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1348,7 +1848,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name",dependentOn="generic-vnf,pserver,pnf",container="lag-interfaces")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Link aggregate interface",indexedProps="interface-name",dependentOn="generic-vnf,pserver,vpe,vpls-pe,pnf",container="lag-interfaces")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1549,6 +2049,51 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="virtual-data-center">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context",nameProps="vdc-name",indexedProps="vdc-name,vdc-id",container="virtual-data-centers",namespace="cloud-infrastructure")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vdc-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the vdc")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vdc-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the virtual data center")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="virtual-data-centers">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual organization of cloud infrastructure elements in a data center context")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:virtual-data-center" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="cloud-infrastructure">
     <xs:complexType>
       <xs:annotation>
@@ -1557,8 +2102,85 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
+        <xs:element ref="tns:complexes" minOccurs="0"/>
         <xs:element ref="tns:cloud-regions" minOccurs="0"/>
+        <xs:element ref="tns:network-profiles" minOccurs="0"/>
         <xs:element ref="tns:pservers" minOccurs="0"/>
+        <xs:element ref="tns:virtual-data-centers" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="connector">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets",indexedProps="resource-instance-id,persona-model-id,persona-model-version,widget-model-id,widget-model-version",container="connectors",namespace="business")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="resource-instance-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of resource instance.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:metadata" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="connectors">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:connector" minOccurs="0" maxOccurs="unbounded"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -1587,28 +2209,35 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model id for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model version for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary widget model. This maps directly to the AAI widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -1654,13 +2283,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="operational-status" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Operational status of the service-instance.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="service-instance-location-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -1703,14 +2325,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="service-type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across OpenECOMP.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Value defined by orchestration to identify this service across ECOMP.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="temp-ub-sub-account-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This property will be deleted from AAI in the near future. Only stop gap solution.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="This property will be deleted from A&amp;AI in the near future. Only stop gap solution.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -1742,14 +2364,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="subscriber-name,global-customer-id",uniqueProps="global-customer-id,subscriber-name",alternateKeys1="subscriber-name",container="customers",namespace="business")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="customer identifiers to provide linkage back to BSS information.",nameProps="subscriber-name",indexedProps="subscriber-name,global-customer-id,subscriber-type",searchable="subscriber-name,global-customer-id",uniqueProps="global-customer-id",container="customers",namespace="business")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
         <xs:element name="global-customer-id" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global customer id used across OpenECOMP to uniquely identify customer.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Global customer id used across ECOMP to uniquely identify customer.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -1799,15 +2421,82 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
+        <xs:element ref="tns:connectors" minOccurs="0"/>
         <xs:element ref="tns:customers" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="vnf-image">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Image object that pertain to a VNF that doesn't have associated vservers.  This is a kludge.",indexedProps="application,vnf-image-uuid,application-vendor,application-version",uniqueProps="vnf-image-uuid",container="vnf-images",namespace="service-design-and-creation")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vnf-image-uuid" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of this asset")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="application" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The application that the image instantiates.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="application-vendor" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The vendor of the application.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="application-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The version of the application.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vnf-images">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of image objects that pertain to a VNF that doesn't have associated vservers.  This is a kludge.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:vnf-image" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="service">
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from SDC.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Stand-in for service model definitions.  Likely to be deprecated in favor of models from ASDC.",indexedProps="service-description,service-id",container="services",namespace="service-design-and-creation")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1854,7 +2543,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from SDC.")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service model definitions.  Likely to be deprecated in favor of models from ASDC.")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -1862,6 +2551,51 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="service-capability">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Early definition of server/resource pairings, likely to be replaced by models.  No new use should be made of this.",indexedProps="service-type,vnf-type",container="service-capabilities",namespace="service-design-and-creation")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="service-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="This gets defined by others to provide a unique ID for the service, we accept what is sent.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="service-capabilities">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of service capabilities.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:service-capability" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="element-choice-set">
     <xs:complexType>
       <xs:annotation>
@@ -1978,18 +2712,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="linkage-points" minOccurs="0">
-          <xs:complexType>
-            <xs:annotation>
-              <xs:appinfo>
-                <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",allowDirectWrite="false",container="model-elements")</annox:annotate>
-              </xs:appinfo>
-            </xs:annotation>
-            <xs:sequence>
-              <xs:element name="linkage-point" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
+        <xs:element name="linkage-points" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -2026,14 +2749,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by SDC to describe an inventory asset and its connections related to SDC models",nameProps="model-name,model-type",indexedProps="model-name-version-id,model-type,model-name,model-id,model-version",alternateKeys1="model-id,model-version",uniqueProps="model-name-version-id",container="models",namespace="service-design-and-creation")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models",nameProps="model-name,model-type",indexedProps="model-name-version-id,model-type,model-name,model-id,model-version",alternateKeys1="model-id,model-version",uniqueProps="model-name-version-id",container="models",namespace="service-design-and-creation")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
         <xs:element name="model-name-version-id" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in SDC")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique identifier corresponding to one version of a model in ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2089,7 +2812,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of subgraph definitions provided by SDC to describe the inventory assets and their connections related to SDC models")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of subgraph definitions provided by ASDC to describe the inventory assets and their connections related to ASDC models")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -2238,11 +2961,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for objects managed by SDC")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Namespace for objects managed by ASDC")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
+        <xs:element ref="tns:vnf-images" minOccurs="0"/>
         <xs:element ref="tns:services" minOccurs="0"/>
+        <xs:element ref="tns:service-capabilities" minOccurs="0"/>
         <xs:element ref="tns:models" minOccurs="0"/>
         <xs:element ref="tns:named-queries" minOccurs="0"/>
       </xs:sequence>
@@ -2287,7 +3012,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="ip-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4, v6, or ds for dual stack (should be ip-version)")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4, v6, or ds for dual stack")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2308,28 +3033,35 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model id for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model version for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary widget model. This maps directly to the AAI widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2377,6 +3109,865 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="class-of-service">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="cos",dependentOn="site-pair",container="classes-of-service")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="cos" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="probe-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of probe")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="probe-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="type of probe")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="classes-of-service">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="class-of-service of probe")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:class-of-service" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="site-pair">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="site-pair-id",uniqueProps="site-pair-id",dependentOn="routing-instance",container="site-pairs")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="site-pair-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="unique identifier of probe")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="source-ip" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="destination-ip" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ip-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ip version, v4, v6")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="destination-hostname" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Hostname of the destination equipment to which SLAs are measured against.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="destination-equip-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The type of destinatination equipment. Could be Router, etc.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:classes-of-service" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="site-pairs">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="probe within a set")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:site-pair" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="routing-instance">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="routing-instance-id",uniqueProps="routing-instance-id",dependentOn="site-pair-set",container="routing-instances")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="routing-instance-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of routing instance")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="rpm-owner" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rpm owner")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:site-pairs" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="routing-instances">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="set of probes related to generic-vnf routing instance")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:routing-instance" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="site-pair-set">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Set of instances for probes used to measure service level agreements",indexedProps="site-pair-set-id",uniqueProps="site-pair-set-id",container="site-pair-sets",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="site-pair-set-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of site pair set.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:routing-instances" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="site-pair-sets">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of sets of instances for probes related to generic-vnf")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:site-pair-set" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vpn-binding">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name",indexedProps="vpn-name,vpn-id,global-route-target",uniqueProps="vpn-id",container="vpn-bindings",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vpn-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="VPN ID, globally unique within A&amp;AI")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vpn-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="VPN Name")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="global-route-target" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Number used to identify a VPN, globally unique in the network")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vpn-platform" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the platform associated with the VPN example AVPN, Mobility")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="l3-networks relate to vpn-bindings")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vpn-bindings">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:vpn-binding" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vpls-pe">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="VPLS Provider Edge routers.",indexedProps="prov-status,equipment-name",container="vpls-pes",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="equipment-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true)</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPLS-PE.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:p-interfaces" minOccurs="0"/>
+        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vpls-pes">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VPLS Provider Edge routers")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:vpls-pe" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="multicast-configuration">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(indexedProps="multicast-configuration-id",uniqueProps="multicast-configuration-id",container="multicast-configurations",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="multicast-configuration-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of multicast configuration.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="multicast-protocol" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="protocol of multicast configuration")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="rp-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="rp type of multicast configuration")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="multicast-configurations">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="multicast configuration of generic-vnf ip-address")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:multicast-configuration" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="cvlan-tag-entry">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="cvlan-tag" type="xs:unsignedInt">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="See mis-na-virtualization-platform.yang")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="cvlan-tags">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:cvlan-tag-entry" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="port-group">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Used to capture the network interfaces of this VCE",nameProps="port-group-name",indexedProps="port-group-id,heat-stack-id,interface-id,interface-name,switch-name",dependentOn="vce",container="port-groups")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="interface-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique ID of the interface")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="neutron-network-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network id of this Interface")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="neutron-network-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Neutron network name of this Interface")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="interface-role" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Role assigned to this Interface, should use values as defined in ECOMP Yang models.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="port-group-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID for port group in vmware")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="port-group-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Likely to duplicate value of neutron network name")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="switch-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="DVS or standard switch name (should be non-null for port groups associated with DVS)")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="orchestration-status" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:cvlan-tags" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="port-groups">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:port-group" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vce">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual Customer Edge Router, used specifically for Gamma.  This object is deprecated.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,interface-name,regional-resource-zone,vpe-id,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vces",namespace="network",extendsFrom="vnf")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vnf-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="service-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC.  Expect this to change as ASDC matures.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="operational-state" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="license-key" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network role being played by this VNF")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vpe-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique ID of VPE connected to this VCE.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="v6-vce-wan-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Valid v6 IP address for the WAN Link on this router.  Implied length of /64.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Entitlement resource uuid")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:port-groups" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vces">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of Virtual Customer Edge Routers, used specifically for Gamma.  This object is deprecated.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:vce" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vpe">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Relationship-list must include related to info for complex.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,prov-status,service-id",searchable="vnf-id,vnf-name,vnf-name2",uniqueProps="vnf-id",container="vpes",namespace="network",extendsFrom="vnf")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vnf-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-name" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="service-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="regional-resource-zone" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Regional way of organizing pservers, source of truth should define values")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this resource by Service Assurance systems.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="operational-state" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="license-key" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-oam-gateway-address-prefix-length" type="xs:int" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Prefix length for oam-address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-oam-gateway-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Gateway address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="v4-loopback0-ip-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Loopback0 address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Temporary location for stag to get to VCE")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="as-number" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VPE")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="summary-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="details regarding the vpe operation")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="encrypted-access-flag" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="indicates whether vpe access uses SSH")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
+        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vpes">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:vpe" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="vnfc">
     <xs:complexType>
       <xs:annotation>
@@ -2656,7 +4247,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="network-id" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across AAI.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Network ID, should be uuid. Unique across A&amp;AI.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2705,7 +4296,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from SDC")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2754,28 +4345,35 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model id for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model version for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary widget model. This maps directly to the AAI widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2813,7 +4411,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:relationship-list" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant)")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2827,6 +4425,53 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="network-policy">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="network-policy-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="network-policies">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="vf-module">
     <xs:complexType>
       <xs:annotation>
@@ -2880,28 +4525,35 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model id for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model version for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary widget model. This maps directly to the AAI widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2960,14 +4612,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="vnf-type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the SDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as SDC matures.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="service-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from SDC")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Unique identifier of service from ASDC")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2988,7 +4640,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="operational-state" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -3030,7 +4682,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="management-option" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by customer")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by company or customer")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -3139,99 +4791,232 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="entitlement-assignment-group-uuid" type="xs:string" minOccurs="0">
+        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the Entitlement group used for licensing VNFs")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="entitlement-resource-uuid" type="xs:string" minOccurs="0">
+        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the specific entitlement resource")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="license-assignment-group-uuid" type="xs:string" minOccurs="0">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the license assignment group")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="internal",dbAlias="model-version-id-local",dataCopy="service-design-and-creation/models/model/{persona-model-id}/model-vers?model-version={persona-model-version}#model-version-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="license-key-uuid" type="xs:string" minOccurs="0">
+        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="UUID of the actual license resource")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
+        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model id for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
+        <xs:element name="as-number" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC model version for this resource or service model.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="persona-model-customization-id" type="xs:string" minOccurs="0">
+        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="captures the id of all the configuration used to customize the resource for the service.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="widget-model-id" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:l-interfaces" minOccurs="0"/>
+        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
+        <xs:element ref="tns:vf-modules" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="generic-vnfs">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lag-link">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="LAG links can connect lag-interfaces",indexedProps="link-name",container="lag-links",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="link-name" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary widget model. This maps directly to the AAI widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Alphabetical concatenation of lag-interface names")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="widget-model-version" type="xs:string" minOccurs="0">
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget.")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="as-number" type="xs:string" minOccurs="0">
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lag-links">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of link aggregation connections")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:lag-link" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="newvce">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.",nameProps="vnf-name",indexedProps="vnf-name,vnf-name2,vnf-type,heat-stack-id,prov-status,vnf-id2",searchable="vnf-id2,vnf-name,vnf-name2",uniqueProps="vnf-id2",container="newvces",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vnf-id2" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="as-number of the VNF")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF, can't use same attribute name right now until we promote this new object")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="regional-resource-subzone" type="xs:string" minOccurs="0">
+        <xs:element name="vnf-name" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="represents sub zone of the rr plane")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of VNF.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-name2" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Alternate name of VNF.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vnf-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="prov-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="operational-state" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational",dbAlias="operational-status")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="license-key" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="License key")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-oam-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-address).")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="equipment-role" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Client should send valid enumerated value, e.g., VPE.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-loopback0-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 Loopback0 address")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="orchestration-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of this VNF, mastered by MSO.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="heat-stack-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Heat stack id corresponding to this instance, managed by MSO")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="mso-catalog-key" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Corresponds to the SDN-C catalog id used to configure this VCE")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
         <xs:element ref="tns:l-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
-        <xs:element ref="tns:vf-modules" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="generic-vnfs">
+  <xs:element name="newvces">
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of VNFs")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="This object fills in the gaps from vce that were incorporated into generic-vnf.  This object will be retired with vce.")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element ref="tns:generic-vnf" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="tns:newvce" minOccurs="0" maxOccurs="unbounded"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -3239,7 +5024,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
-          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF represents a physical network function.",indexedProps="pnf-name,orchestration-status",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world.",indexedProps="pnf-name,orchestration-status",uniqueProps="pnf-name",container="pnfs",namespace="network")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -3295,7 +5080,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="management-option" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by customer")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="identifier of managed by company or customer")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -3405,7 +5190,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="management-option" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To provide information on who manages this circuit. AAI or 3rd party transport provider")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="To provide information on who manages this circuit. A&amp;AI or 3rd party transport provider")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -3439,6 +5224,272 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="vig-server">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="vig-server contains information about a vig server used for IPSec-configuration. Populated by SDN-C from 1607",indexedProps="vig-address-type",dependentOn="ipsec-configuration",container="vig-servers")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vig-address-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="indicates whether the VIG is for AVPN or INTERNET")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipaddress-v4-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v4 IP of the vig server")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipaddress-v6-vig" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="v6 IP of the vig server")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="vig-servers">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:vig-server" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ipsec-configuration">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="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",indexedProps="ipsec-configuration-id",uniqueProps="ipsec-configuration-id",container="ipsec-configurations",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="ipsec-configuration-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID of this configuration")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="requested-vig-address-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicate the type of VIG server like AVPN, INTERNET, BOTH")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="requested-encryption-strength" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encryption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="requested-dmz-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can offer a shared DMZ or a DMZ specific to a customer")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="shared-dmz-network-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Network address of shared DMZ")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="requested-customer-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="If the DMZ is a custom DMZ, this field will indicate the customer information")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ike-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="can be 1 or 2")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ikev1-authentication" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Contains values like md5, sha1, sha256, sha384")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ikev1-dh-group" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Diffie-Hellman group like DH-GROUP2, DH-GROUP5, DH-GROUP14")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ikev1-am-group-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Group name defined in VIG for clients using aggressive mode")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ikev1-am-password" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="pre-shared key for the above group name ")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ikev1-sa-lifetime" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Lifetime for IKEv1 SA")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipsec-authentication" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="md5, sha1, sha256, sha384")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipsec-sa-lifetime" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Life time for IPSec SA")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipsec-pfs" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="enable PFS or not")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user, ,nmteHostName")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="xauth-user-password" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encrypted using the Juniper $9$ algorithm")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="dpd-interval" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="The time between DPD probe")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="dpd-frequency" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Maximum number of DPD before claiming the tunnel is down")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:vig-servers" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ipsec-configurations">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:ipsec-configuration" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="route-table-reference">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Openstack route table reference.",nameProps="route-table-reference-fqdn",uniqueProps="route-table-reference-id",indexedProps="route-table-reference-id,route-table-reference-fqdn",container="route-table-references",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="route-table-reference-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Route Table Reference id, UUID assigned to this instance.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="route-table-reference-fqdn" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="FQDN entry in the route table.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Concurrency value")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="route-table-references">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of openstack route table references")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:route-table-reference" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="network">
     <xs:complexType>
       <xs:annotation>
@@ -3448,11 +5499,22 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:annotation>
       <xs:sequence>
         <xs:element ref="tns:logical-links" minOccurs="0"/>
+        <xs:element ref="tns:site-pair-sets" minOccurs="0"/>
+        <xs:element ref="tns:vpn-bindings" minOccurs="0"/>
+        <xs:element ref="tns:vpls-pes" minOccurs="0"/>
+        <xs:element ref="tns:multicast-configurations" minOccurs="0"/>
+        <xs:element ref="tns:vces" minOccurs="0"/>
+        <xs:element ref="tns:vpes" minOccurs="0"/>
         <xs:element ref="tns:vnfcs" minOccurs="0"/>
         <xs:element ref="tns:l3-networks" minOccurs="0"/>
+        <xs:element ref="tns:network-policies" minOccurs="0"/>
         <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
+        <xs:element ref="tns:lag-links" minOccurs="0"/>
+        <xs:element ref="tns:newvces" minOccurs="0"/>
         <xs:element ref="tns:pnfs" minOccurs="0"/>
         <xs:element ref="tns:physical-links" minOccurs="0"/>
+        <xs:element ref="tns:ipsec-configurations" minOccurs="0"/>
+        <xs:element ref="tns:route-table-references" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -3487,8 +5549,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="isParent" type="xs:boolean" minOccurs="0"/>
         <xs:element name="usesResource" type="xs:boolean" minOccurs="0"/>
         <xs:element name="hasDelTarget" type="xs:boolean" minOccurs="0"/>
-        <xs:element name="SVC-INFRA" type="xs:string" minOccurs="0"/>
-        <xs:element name="SVC-INFRA-REV" type="xs:string" minOccurs="0"/>
+        <xs:element name="SVC-INFRA" type="xs:boolean" minOccurs="0"/>
+        <xs:element name="SVC-INFRA-REV" type="xs:boolean" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -3513,55 +5575,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="inventory-item-data">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="inventory-item">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="inventory-item-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="inventory-item-link" type="xs:string" minOccurs="0"/>
-        <xs:element ref="tns:inventory-item-data" minOccurs="0" maxOccurs="unbounded"/>
-        <xs:element ref="tns:tagged-inventory-item-list" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="tagged-inventory-item-list">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:inventory-item" minOccurs="0" maxOccurs="unbounded"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="start-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="include-node-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="include-node-type" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="secondary-filter">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="property-name" type="xs:string" minOccurs="0"/>
-        <xs:element name="filter-type" type="xs:string" minOccurs="0"/>
-        <xs:element name="property-value" type="xs:string" minOccurs="0"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
   <xs:element name="notification-event-header">
     <xs:complexType>
       <xs:sequence>
@@ -3696,4 +5709,22 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="vnf">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Abstract vnf class",indexedProps="vnf-id",uniqueProps="vnf-id",inheritors="vce,vpe,generic-vnf",isAbstract="true")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="vnf-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="Unique id of VNF.  This is unique across the graph.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
 </xs:schema>
diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd
index 59be4f89..0b879d15 100644
--- a/aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd
+++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v9.xsd
@@ -2252,14 +2252,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2399,14 +2399,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -2473,14 +2473,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -3346,14 +3346,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -4794,14 +4794,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -4988,14 +4988,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5278,14 +5278,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="persona-model-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",dbAlias="model-invariant-id-local",requires="persona-model-version",visibility="deployment")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
         <xs:element name="persona-model-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="persona-model-id")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5894,7 +5894,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="ikev1-encryption" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5936,7 +5936,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="ipsec-encryption" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -5957,7 +5957,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="xauth-userid" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user, nmteHostName")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="user ID for xAuth, sm-user, ,nmteHostName")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6130,7 +6130,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element name="design-type" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large]")</annox:annotate>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Design of zone [Medium/Large?]")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml
index 7eddd101..0f724cf3 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v10.xml
@@ -18,5541 +18,5555 @@
   -->
 
 <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. 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" />
-				<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,vpe,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-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 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 VPEs." />
-			</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 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,vpe,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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.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-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. 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" />
+                <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,vpe,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-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 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 VPEs." />
+            </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 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,vpe,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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="State that indicates whether the availability zone should be used, etc.  Source of truth should define valid values." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.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="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.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="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="vpes" name="vpes" type="inventory.aai.openecomp.org.v10.Vpes" />
-				<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" />
-			</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="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="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="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,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.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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  do not use" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Network role being played by this VNF" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Unique ID of VPE connected to this VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Loopback0 address" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  see child relationships" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.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="Vpes">
-			<xml-properties>
-				<xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
-			</xml-properties>
-			<xml-root-element name="vpes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.openecomp.org.v10.Vpe" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vpe">
-			<xml-root-element name="vpe" />
-			<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 map strictly to ASDC services.  SOON TO BE DEPRECATED" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  do not use.  See child relationships." />
-					</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, 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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-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="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="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Loopback0 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 stag to get to VCE" />
-					</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 VPE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="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 vpe 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 vpe access uses SSH" />
-					</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="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="Relationship-list must include related to info for complex." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,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="vpes" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</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-property name="suggestibleOnSearch" value="true"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  do not use" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Client should send valid enumerated value" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
-						<xml-property name="suggestibleOnSearch" value="true"/>
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="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-property name="containsSuggestibleProps" value="true"/>
-				<xml-property name="suggestionAliases" value="VNFs"/>
-			</xml-properties>
-		</java-type>
-
-		<java-type name="VfModules">
-			<xml-properties>
-				<xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
-			</xml-properties>
-			<xml-root-element name="vf-modules" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.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="operationalStatus" name="operational-status" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Indicator for whether the resource is considered operational" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="OBSOLETE -  do not use" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (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., VPE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="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.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.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,vpe" />
-				<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,vpe" />
-				<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,vpe,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="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="dependentOn" value="vpn-binding" />
-				<xml-property name="canBeLinked" value="true" />
-			</xml-properties>
-		</java-type>
-	</java-types>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="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="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthTotal" name="bandwidth-total" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicates the total bandwidth to be used for this service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan1" name="bandwidth-up-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN1 port of the physical device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan1" name="bandwidth-down-wan1" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN1 port of the physical device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthUpWan2" name="bandwidth-up-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the upstream bandwidth this service will use on the WAN2 port of the physical device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="bandwidthDownWan2" name="bandwidth-down-wan2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="indicates the downstream bandwidth this service will use on the WAN2 port of the physical device." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vhnPortalUrl" name="vhn-portal-url" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="URL customers will use to access the vHN Portal." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="serviceInstanceLocationId" name="service-instance-location-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="An identifier that customers assign to the location where this service is being used." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.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="vpes" name="vpes" type="inventory.aai.openecomp.org.v10.Vpes" />
+                <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" />
+            </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="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of operational status of the logical link." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this VNF by BAU Service Assurance systems." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkRole" name="link-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indication of the network use of the logical link." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkName2" name="link-name2" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Alias or alternate name (CLCI or D1 name)." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="linkId" name="link-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="UUID of the logical-link, SDNC generates this." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="circuitId" name="circuit-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Circuit id" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="purpose" name="purpose" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Reason for this entity, role it is playing" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.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="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="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="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,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.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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Network role being played by this VNF" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, mastered by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="heatStackId" name="heat-stack-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Heat stack id corresponding to this instance, managed by MSO" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="msoCatalogKey" name="mso-catalog-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Corresponds to the SDN-C catalog id used to configure this VCE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="vpeId" name="vpe-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique ID of VPE connected to this VCE." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="v6VceWanAddress" name="v6-vce-wan-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Valid v6 IP address for the WAN Link on this router.  Implied length of /64." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vce, also used for troubleshooting and is IP used for traps generated by VCE." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4Loopback0Address" name="ipv4-loopback0-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 address" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="entitlementResourceUuid" name="entitlement-resource-uuid" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  see child relationships" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="portGroups" name="port-groups" type="inventory.aai.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="Vpes">
+            <xml-properties>
+                <xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
+            </xml-properties>
+            <xml-root-element name="vpes" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.openecomp.org.v10.Vpe" />
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vpe">
+            <xml-root-element name="vpe" />
+            <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 map strictly to ASDC services.  SOON TO BE DEPRECATED" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Regional way of organizing pservers, source of truth should define values" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="provStatus" name="prov-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Trigger for operational monitoring of this resource by Service Assurance systems." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use.  See child relationships." />
+                    </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, 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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-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="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="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 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 stag to get to VCE" />
+                    </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 VPE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="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 vpe 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 vpe access uses SSH" />
+                    </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="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="Relationship-list must include related to info for complex." />
+                <xml-property name="nameProps" value="vnf-name" />
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,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="vpes" />
+                <xml-property name="namespace" value="network" />
+                <xml-property name="extends" value="vnf" />
+            </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="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="physicalNetworkName" name="physical-network-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name associated with the physical network." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="isProviderNetwork" name="is-provider-network" 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-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational.  Valid values are in-service-path and out-of-service-path." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="equipmentRole" name="equipment-role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Client should send valid enumerated value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status of this VNF, used by MSO." />
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="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="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="asNumber" name="as-number" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="as-number of the VNF" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="regionalResourceSubzone" name="regional-resource-subzone" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="represents sub zone of the rr plane" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nfType" name="nf-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of NF" />
+                    </xml-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-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="suggestionAliases" value="VNFs"/>
+            </xml-properties>
+        </java-type>
+
+        <java-type name="VfModules">
+            <xml-properties>
+                <xml-property name="description" value="Collection of vf-modules, a deployment unit of VNFCs" />
+            </xml-properties>
+            <xml-root-element name="vf-modules" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vfModule" name="vf-module" type="inventory.aai.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="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="captures the id of all the configuration used to customize the resource for the service." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelId" name="widget-model-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary widget model. This maps directly to the A&amp;AI widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="widgetModelVersion" name="widget-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC data dictionary version of the widget model.This maps directly to the A&amp;AI version of the widget." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="contrailServiceInstanceFqdn" name="contrail-service-instance-fqdn" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the Contrail unique ID for a service-instance" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="moduleIndex" name="module-index" type="java.lang.Integer">
+                    <xml-properties>
+                        <xml-property name="description" value="the index will track the number of modules of a given type that have been deployed in a VNF, starting with 0, and always choosing the lowest available digit" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the controller object." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.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="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="licenseKey" name="license-key" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="OBSOLETE -  do not use" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (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., VPE." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="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.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.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-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-element java-attribute="propertyValue" name="property-value" type="java.lang.String" />
+            </java-attributes>
+        </java-type>
+
+        <java-type name="RouteTableReferences">
+            <xml-properties>
+                <xml-property name="description" value="Collection of openstack route table references" />
+            </xml-properties>
+            <xml-root-element name="route-table-references" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="routeTableReference" name="route-table-reference" type="inventory.aai.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="requires" value="model-version-id" />
+                        <xml-property name="dbAlias" value="model-invariant-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="deployment" />
+                        <xml-property name="requires" value="model-invariant-id" />
+                        <xml-property name="dbAlias" value="model-version-id-local" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="the ASDC model version for this resource or service model." />
+                        <xml-property name="visibility" value="internal" />
+                        <xml-property name="dataCopy" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}#model-version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Concurrency value" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration status" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Indicator for whether the resource is considered operational" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="type" name="type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Generic description of the type of allotted resource." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="role" name="role" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="role in the network that this resource will be providing." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.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,vpe" />
+                <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,vpe" />
+                <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,vpe,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="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="dependentOn" value="vpn-binding" />
+                <xml-property name="canBeLinked" value="true" />
+            </xml-properties>
+        </java-type>
+    </java-types>
 </xml-bindings>
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml
index 3ed2ea53..3bfe59dc 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v8.xml
@@ -8,9 +8,7 @@
   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
-  
+     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.
@@ -40,10 +38,19 @@
 		<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" />
 			</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" />
+			</java-attributes>
+		</java-type>
 
 		<java-type name="TaggedInventoryItemList">
 			<xml-root-element name="tagged-inventory-item-list" />
@@ -70,6 +77,17 @@
 			</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.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" />
+			</java-attributes>
+		</java-type>
 
 		<java-type name="StartNodeFilter">
 			<xml-root-element name="start-node-filter" />
@@ -107,7 +125,7 @@
 			<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 AAI graph" />
+						<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">
@@ -118,6 +136,22 @@
 			</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.v8.OamNetworks" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.openecomp.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" />
+			</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)." />
@@ -131,7 +165,7 @@
 
 		<java-type name="Update">
 			<xml-properties>
-				<xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control." />
+				<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>
@@ -191,8 +225,11 @@
 			</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" />
 			</java-attributes>
 		</java-type>
 
@@ -223,7 +260,7 @@
 				</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" />
+						<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">
@@ -257,11 +294,13 @@
 				<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" />
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="cloud-region designates an installation of a cloud cluster or region or instantiation. Cloud regions are uniquely identified by a composite key, cloud-owner + cloud-region-id. The format of the cloud-owner is vendor-cloudname." />
+				<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" />
@@ -298,7 +337,7 @@
 				</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 SDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as SDC matures." />
+						<xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC matures." />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" type="java.lang.String">
@@ -333,12 +372,12 @@
 			<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 AAI to indicate type of node." />
+						<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 AAI." />
+						<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" />
@@ -367,7 +406,7 @@
 			<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 AAI to indicate an attribute." />
+						<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">
@@ -378,6 +417,118 @@
 			</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.v8.Complex" />
+			</java-attributes>
+		</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.v8.CtagPools" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.v8.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.v8.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." />
@@ -537,15 +688,16 @@
 				</xml-element>
 				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Whether AAI should be managing this interface of not. Could have value like CUSTOMER" />
+						<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>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="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" />
@@ -553,11 +705,103 @@
 			<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,p-interface,vserver,lag-interface" />
+				<xml-property name="dependentOn" value="generic-vnf,newvce,vpe,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.v8.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.v8.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>
@@ -659,10 +903,11 @@
 					<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>
 				<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="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
@@ -846,7 +1091,7 @@
 				<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" />
@@ -854,9 +1099,9 @@
 			<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" />
-			</java-attributes>		
+			</java-attributes>
 		</java-type>
-		
+
 		<java-type name="Snapshot">
 			<xml-root-element name="snapshot" />
 			<java-attributes>
@@ -915,7 +1160,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.openecomp.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
 				<xml-property name="description" value="Openstack snapshot" />
@@ -924,9 +1169,9 @@
 				<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>	
+			</xml-properties>
 		</java-type>
-		
+
 		<java-type name="GroupAssignments">
 			<xml-properties>
 				<xml-property name="description" value="Collection of openstack group assignments" />
@@ -936,7 +1181,7 @@
 				<xml-element container-type="java.util.ArrayList" java-attribute="groupAssignment" name="group-assignment" type="inventory.aai.openecomp.org.v8.GroupAssignment" />
 			</java-attributes>
 		</java-type>
-		
+
 		<java-type name="GroupAssignment">
 			<xml-root-element name="group-assignment" />
 			<java-attributes>
@@ -949,7 +1194,7 @@
 					<xml-properties>
 						<xml-property name="description" value="Group type - the type of group this instance refers to" />
 					</xml-properties>
-				</xml-element>				
+				</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" />
@@ -959,12 +1204,12 @@
 					<xml-properties>
 						<xml-property name="description" value="Group description - description of the group" />
 					</xml-properties>
-				</xml-element>	
+				</xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
 					</xml-properties>
-				</xml-element>		
+				</xml-element>
 				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.RelationshipList" />
 			</java-attributes>
 			<xml-properties>
@@ -974,7 +1219,7 @@
 				<xml-property name="dependentOn" value="cloud-region" />
 				<xml-property name="container" value="group-assignments" />
 			</xml-properties>
-		</java-type>			
+		</java-type>
 
 		<java-type name="Images">
 			<xml-properties>
@@ -1075,11 +1320,87 @@
 			<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,model" />
+				<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 VPEs." />
+			</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" />
+			</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.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. " />
+				<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.v8.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.v8.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." />
@@ -1257,7 +1578,7 @@
 			<xml-properties>
 				<xml-property name="description" value="Physical interface (e.g., nic)" />
 				<xml-property name="indexedProps" value="interface-name" />
-				<xml-property name="dependentOn" value="pserver,pnf" />
+				<xml-property name="dependentOn" value="vpls-pe,pserver,pnf" />
 				<xml-property name="container" value="p-interfaces" />
 			</xml-properties>
 		</java-type>
@@ -1301,11 +1622,65 @@
 			<xml-properties>
 				<xml-property name="description" value="Link aggregate interface" />
 				<xml-property name="indexedProps" value="interface-name" />
-				<xml-property name="dependentOn" value="generic-vnf,pserver,pnf" />
+				<xml-property name="dependentOn" value="generic-vnf,pserver,vpe,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.v8.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.v8.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" />
@@ -1332,6 +1707,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">
@@ -1349,16 +1725,126 @@
 			</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.v8.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.v8.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.v8.Connectors" />
 				<xml-element java-attribute="customers" name="customers" type="inventory.aai.openecomp.org.v8.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.v8.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="requires" value="persona-model-version" />
+						<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-property name="requires" value="persona-model-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="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.v8.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.openecomp.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" />
+				<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." />
@@ -1374,7 +1860,7 @@
 			<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 OpenECOMP to uniquely identify customer." />
+						<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">
@@ -1401,8 +1887,7 @@
 				<xml-property name="nameProps" value="subscriber-name" />
 				<xml-property name="indexedProps" value="subscriber-name,global-customer-id,subscriber-type" />
 				<xml-property name="searchable" value="subscriber-name,global-customer-id" />
-				<xml-property name="uniqueProps" value="global-customer-id,subscriber-name" />
-				<xml-property name="alternateKeys1" value="subscriber-name" />
+				<xml-property name="uniqueProps" value="global-customer-id" />
 				<xml-property name="container" value="customers" />
 				<xml-property name="namespace" value="business" />
 			</xml-properties>
@@ -1423,14 +1908,14 @@
 			<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 OpenECOMP." />
+						<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 AAI in the near future. Only stop gap solution." />
-                    </xml-properties>
-                </xml-element>
+					<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." />
@@ -1473,22 +1958,35 @@
 				</xml-element>
 				<xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model id for this resource or service model." />
+						<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>
 				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model version for this resource or service model." />
+						<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">
+					<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 SDC data dictionary widget model. This maps directly to the AAI widget." />
+						<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 SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." />
+						<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">
@@ -1521,11 +2019,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." />
@@ -1552,16 +2045,158 @@
 
 		<java-type name="ServiceDesignAndCreation">
 			<xml-properties>
-				<xml-property name="description" value="Namespace for objects managed by SDC" />
+				<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.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" />
 			</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.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-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.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="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.v8.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.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." />
+				<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.v8.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 and clients should expect changes                  to occur in the future to this field as ASDC 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.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." />
+				<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." />
@@ -1569,11 +2204,22 @@
 			<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="vpes" name="vpes" type="inventory.aai.openecomp.org.v8.Vpes" />
 				<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" />
 			</java-attributes>
 		</java-type>
 
@@ -1612,7 +2258,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 (should be ip-version)" />
+						<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">
@@ -1627,22 +2273,35 @@
 				</xml-element>
 				<xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model id for this resource or service model." />
+						<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>
 				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model version for this resource or service model." />
+						<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">
+					<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 SDC data dictionary widget model. This maps directly to the AAI widget." />
+						<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 SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." />
+						<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">
@@ -1676,6 +2335,696 @@
 			</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.v8.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.v8.RoutingInstances" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.v8.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.v8.SitePairs" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.v8.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.v8.ClassesOfService" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.v8.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.v8.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.v8.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="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="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-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" />
+				<xml-property name="indexedProps" value="vpn-name,vpn-id,global-route-target" />
+				<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.v8.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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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.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" />
+			</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.v8.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.v8.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.v8.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 and clients should expect changes                  to occur in the future to this field as ASDC 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 from ASDC.  Expect this to change as ASDC matures." />
+					</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="License key" />
+					</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="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" />
+			</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.v8.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.v8.CvlanTags" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.openecomp.org.v8.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.v8.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.v8.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="Vpes">
+			<xml-properties>
+				<xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
+			</xml-properties>
+			<xml-root-element name="vpes" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.openecomp.org.v8.Vpe" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Vpe">
+			<xml-root-element name="vpe" />
+			<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 and clients should expect changes                  to occur in the future to this field as ASDC 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 from ASDC" />
+					</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="License key" />
+					</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, 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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-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="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="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Loopback0 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 stag to get to VCE" />
+					</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 VPE" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="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 vpe operation" />
+					</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 vpe access uses SSH" />
+					</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" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Relationship-list must include related to info for complex." />
+				<xml-property name="nameProps" value="vnf-name" />
+				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,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="vpes" />
+				<xml-property name="namespace" value="network" />
+				<xml-property name="extends" value="vnf" />
+			</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." />
@@ -1762,7 +3111,7 @@
 			<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 AAI." />
+						<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">
@@ -1798,7 +3147,7 @@
 				</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 SDC" />
+						<xml-property name="description" value="Unique identifier of service from ASDC" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="networkRoleInstance" name="network-role-instance" type="java.lang.Long">
@@ -1833,22 +3182,35 @@
 				</xml-element>
 				<xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model id for this resource or service model." />
+						<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>
 				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model version for this resource or service model." />
+						<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">
+					<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 SDC data dictionary widget model. This maps directly to the AAI widget." />
+						<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 SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." />
+						<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">
@@ -1879,7 +3241,7 @@
 				<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-properties>
-						<xml-property name="description" value="Relates to tenant (or is it a child of tenant)" />
+						<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>
@@ -1892,7 +3254,45 @@
 				<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.v8.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.v8.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="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>
@@ -2034,12 +3434,12 @@
 				</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 SDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as SDC matures." />
+						<xml-property name="description" value="String capturing type of vnf, that was intended to identify the ASDC resource.  This field has been overloaded and clients should expect changes                  to occur in the future to this field as ASDC 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 from SDC" />
+						<xml-property name="description" value="Unique identifier of service from ASDC" />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="regionalResourceZone" name="regional-resource-zone" type="java.lang.String">
@@ -2055,6 +3455,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">
@@ -2084,7 +3485,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 customer" />
+						<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">
@@ -2164,49 +3565,37 @@
 						<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 SDC model id for this resource or service model." />
+						<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>
 				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model version for this resource or service model." />
+						<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="personaModelCustomizationId" name="persona-model-customization-id" type="java.lang.String">
+				<xml-element java-attribute="modelVersionId" name="model-version-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="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 SDC data dictionary widget model. This maps directly to the AAI widget." />
+						<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 SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." />
+						<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">
@@ -2218,7 +3607,7 @@
 					<xml-properties>
 						<xml-property name="description" value="represents sub zone of the rr plane" />
 					</xml-properties>
-				</xml-element>					
+				</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" />
@@ -2282,22 +3671,35 @@
 				</xml-element>
 				<xml-element java-attribute="personaModelId" name="persona-model-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model id for this resource or service model." />
+						<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>
 				<xml-element java-attribute="personaModelVersion" name="persona-model-version" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="the SDC model version for this resource or service model." />
+						<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">
+					<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 SDC data dictionary widget model. This maps directly to the AAI widget." />
+						<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 SDC data dictionary version of the widget model.This maps directly to the AAI version of the widget." />
+						<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">
@@ -2315,6 +3717,138 @@
 			</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.v8.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.v8.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.v8.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 and clients should expect changes                  to occur in the future to this field as ASDC 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="License key" />
+					</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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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., VPE." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="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.v8.RelationshipList" />
+				<xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.openecomp.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." />
+				<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." />
@@ -2365,7 +3899,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 customer" />
+						<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">
@@ -2404,7 +3938,7 @@
 				<xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.openecomp.org.v8.LagInterfaces" />
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="PNF represents a physical network function." />
+				<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" />
 				<xml-property name="uniqueProps" value="pnf-name" />
 				<xml-property name="container" value="pnfs" />
@@ -2452,14 +3986,14 @@
 				</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. AAI or 3rd party transport provider" />
+						<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>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
@@ -2476,6 +4010,179 @@
 			</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.v8.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.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" />
+				<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.v8.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.v8.RelationshipList" />
+				<xml-element java-attribute="vigServers" name="vig-servers" type="inventory.aai.openecomp.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" />
+				<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>
@@ -2502,7 +4209,6 @@
 				<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>
@@ -2510,7 +4216,6 @@
 				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.openecomp.org.v8.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" />
@@ -2527,7 +4232,6 @@
 				<xml-element java-attribute="sourceOfTruth" name="source-of-truth" 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>
@@ -2542,62 +4246,14 @@
 				<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="Services">
-	   		<xml-properties>
-	               <xml-property name="description" value="Collection of service model definitions.  Likely to be deprecated in favor of models from SDC."/>
-	        </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" />
-	        </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.v8.RelationshipList" />
+				<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>
-			<xml-properties>
-				<xml-property name="description" value="Stand-in for service model definitions.  Likely to be deprecated in favor of models from SDC." />
-				<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="Models">
 			<xml-properties>
-				<xml-property name="description" value="Collection of subgraph definitions provided by SDC to describe the inventory assets and their connections related to SDC models" />
+				<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>
@@ -2607,7 +4263,7 @@
 
 		<java-type name="Model">
 			<xml-properties>
-				<xml-property name="description" value="Subgraph definition provided by SDC to describe an inventory asset and its connections related to SDC models" />
+				<xml-property name="description" value="Subgraph definition provided by ASDC to describe an inventory asset and its connections related to ASDC models" />
 				<xml-property name="nameProps" value="model-name,model-type" />
 				<xml-property name="indexedProps" value="model-name-version-id,model-type,model-name,model-id,model-version" />
 				<xml-property name="alternateKeys1" value="model-id,model-version" />
@@ -2619,7 +4275,7 @@
 			<java-attributes>
 				<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 SDC" />
+						<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">
@@ -2691,8 +4347,7 @@
 						<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-point" type="java.lang.String">
-					<xml-element-wrapper name="linkage-points" />
+				<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>
@@ -3038,39 +4693,96 @@
 				<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.v8.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.v8.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="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.v8.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.v8.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>
-		
+			<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.v8.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.v8.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="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,vpe,generic-vnf" />
+				<xml-property name="abstract" value="true" />
+			</xml-properties>
+		</java-type>
 	</java-types>
 </xml-bindings>
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
index 87a3d656..2bf5a9c6 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v9.xml
@@ -18,5434 +18,5448 @@
   -->
 
 <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. 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" />
-				<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,vpe,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 VPEs." />
-			</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,vpe,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-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. 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" />
+                <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,vpe,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 VPEs." />
+            </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,vpe,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="requires" value="persona-model-version" />
+                        <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-property name="requires" value="persona-model-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="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="vpes" name="vpes" type="inventory.aai.openecomp.org.v9.Vpes" />
-				<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" />
-			</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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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="Vpes">
-			<xml-properties>
-				<xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
-			</xml-properties>
-			<xml-root-element name="vpes" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.openecomp.org.v9.Vpe" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="Vpe">
-			<xml-root-element name="vpe" />
-			<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 map strictly 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.  See child relationships." />
-					</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, 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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-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="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="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="Loopback0 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 stag to get to VCE" />
-					</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 VPE" />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="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 vpe 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 vpe access uses SSH" />
-					</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="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="Relationship-list must include related to info for complex." />
-				<xml-property name="nameProps" value="vnf-name" />
-				<xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,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="vpes" />
-				<xml-property name="namespace" value="network" />
-				<xml-property name="extends" value="vnf" />
-			</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 generic-vnf access uses SSH" />
-					</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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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., VPE." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="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,vpe" />
-				<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,vpe" />
-				<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,vpe,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-types>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="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="requires" value="persona-model-version" />
+                        <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-property name="requires" value="persona-model-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="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="vpes" name="vpes" type="inventory.aai.openecomp.org.v9.Vpes" />
+                <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" />
+            </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="requires" value="persona-model-version" />
+                        <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-property name="requires" value="persona-model-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="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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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="Vpes">
+            <xml-properties>
+                <xml-property name="description" value="Virtual provider edge router. In 1504, A&amp;AI will populate this object through an M&amp;P and tool provided to operations." />
+            </xml-properties>
+            <xml-root-element name="vpes" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="vpe" name="vpe" type="inventory.aai.openecomp.org.v9.Vpe" />
+            </java-attributes>
+        </java-type>
+
+        <java-type name="Vpe">
+            <xml-root-element name="vpe" />
+            <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 map strictly 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.  See child relationships." />
+                    </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, 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="ipv4OamAddress" name="ipv4-oam-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Address tail-f uses to configure vpe, also used for troubleshooting and is IP used for traps generated by VPE (v4-loopback0-ip-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="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="v4Loopback0IpAddress" name="v4-loopback0-ip-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Loopback0 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 stag to get to VCE" />
+                    </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 VPE" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="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 vpe 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 vpe access uses SSH" />
+                    </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="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="Relationship-list must include related to info for complex." />
+                <xml-property name="nameProps" value="vnf-name" />
+                <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,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="vpes" />
+                <xml-property name="namespace" value="network" />
+                <xml-property name="extends" value="vnf" />
+            </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="requires" value="persona-model-version" />
+                        <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-property name="requires" value="persona-model-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="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 generic-vnf access uses SSH" />
+                    </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>
+                <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-property name="requires" value="persona-model-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="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="requires" value="persona-model-version" />
+                        <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-property name="requires" value="persona-model-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="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 vpe, also used for troubleshooting and is IP used for traps generated by VPE (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., VPE." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="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="requires" value="persona-model-version" />
+                        <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-property name="requires" value="persona-model-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="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,vpe" />
+                <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,vpe" />
+                <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,vpe,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-types>
 </xml-bindings>
author	Venkata Harish K Kajur <vk250x@att.com>	2017-05-24 13:46:23 -0400
committer	Venkata Harish K Kajur <vk250x@att.com>	2017-05-24 13:46:59 -0400
commit	a93b19450f6fb966afa1c30a6795e8e670d2aee7 (patch)
tree	a248d180e9d41a177887a02c4b4d82cfb7176871 /aai-schema
parent	c2fddaed33f9f7bbec3feca7bf905f0a1e56b3ed (diff)