X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-schema%2Fsrc%2Fmain%2Fresources%2Fonap%2Foxm%2Fv15%2Faai_oxm_v15.xml;h=a0e5f5ea04fb75e77a209a1ce33bcbd2de12314e;hb=f220ba5f41b10728da4b36379189f1278a5420c4;hp=c9e3f1e21e06ba26f076d97ff252b7d8a92c98dd;hpb=d82a30bd3cb3c0d7fd7c1696abbb4e142631c595;p=aai%2Faai-common.git

diff --git a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
index c9e3f1e2..a0e5f5ea 100644
--- a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
   ============LICENSE_START=======================================================
   org.onap.aai
@@ -18,483 +17,486 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   ============LICENSE_END=========================================================
-  -->
-
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v15" xml-mapping-metadata-complete="true">
+  --><xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v15" xml-mapping-metadata-complete="true">
 	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.onap.aai.inventory/v15" />
+		<xml-ns namespace-uri="http://org.onap.aai.inventory/v15"/>
 	</xml-schema>
 	<java-types>
 		<java-type name="Inventory">
-			<xml-root-element name="inventory" />
+			<xml-root-element name="inventory"/>
 			<java-attributes>
-				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v15.Search" />
-				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v15.Actions" />
-				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v15.CloudInfrastructure" />
-				<xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v15.ExternalSystem" />
-				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v15.Business" />
-				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v15.ServiceDesignAndCreation" />
-				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v15.Network" />
-				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v15.AaiInternal" />
+				<xml-element java-attribute="search" name="search" type="inventory.aai.onap.org.v15.Search"/>
+				<xml-element java-attribute="actions" name="actions" type="inventory.aai.onap.org.v15.Actions"/>
+				<xml-element java-attribute="cloudInfrastructure" name="cloud-infrastructure" type="inventory.aai.onap.org.v15.CloudInfrastructure"/>
+				<xml-element java-attribute="externalSystem" name="external-system" type="inventory.aai.onap.org.v15.ExternalSystem"/>
+				<xml-element java-attribute="business" name="business" type="inventory.aai.onap.org.v15.Business"/>
+				<xml-element java-attribute="serviceDesignAndCreation" name="service-design-and-creation" type="inventory.aai.onap.org.v15.ServiceDesignAndCreation"/>
+				<xml-element java-attribute="network" name="network" type="inventory.aai.onap.org.v15.Network"/>
+				<xml-element java-attribute="aaiInternal" name="aai-internal" type="inventory.aai.onap.org.v15.AaiInternal"/>
 				<xml-element java-attribute="nodes" name="nodes" type="inventory.aai.onap.org.v15.Nodes"/>
 				<xml-element java-attribute="common" name="common" type="inventory.aai.onap.org.v15.Common"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="Nodes">
-			<xml-root-element name="nodes" />
+			<xml-root-element name="nodes"/>
 		</java-type>
 		<java-type name="Search">
-			<xml-root-element name="search" />
+			<xml-root-element name="search"/>
 			<java-attributes>
-				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v15.EdgeTagQueryResult" />
-				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v15.EdgeTagQueryRequest" />
-				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v15.SearchResults" />
-				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v15.SdnZoneResponse" />
+				<xml-element java-attribute="edgeTagQueryResult" name="edge-tag-query-result" type="inventory.aai.onap.org.v15.EdgeTagQueryResult"/>
+				<xml-element java-attribute="edgeTagQueryRequest" name="edge-tag-query-request" type="inventory.aai.onap.org.v15.EdgeTagQueryRequest"/>
+				<xml-element java-attribute="searchResults" name="search-results" type="inventory.aai.onap.org.v15.SearchResults"/>
+				<xml-element java-attribute="sdnZoneResponse" name="sdn-zone-response" type="inventory.aai.onap.org.v15.SdnZoneResponse"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="EdgeTagQueryResult">
-			<xml-root-element name="edge-tag-query-result" />
+			<xml-root-element name="edge-tag-query-result"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v15.TaggedInventoryItemList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v15.TaggedInventoryItemList"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="TaggedInventoryItemList">
-			<xml-root-element name="tagged-inventory-item-list" />
+			<xml-root-element name="tagged-inventory-item-list"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v15.InventoryItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItem" name="inventory-item" type="inventory.aai.onap.org.v15.InventoryItem"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="InventoryItem">
-			<xml-root-element name="inventory-item" />
+			<xml-root-element name="inventory-item"/>
 			<java-attributes>
-				<xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String" />
-				<xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v15.InventoryItemData" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v15.TaggedInventoryItemList" />
+				<xml-element java-attribute="inventoryItemType" name="inventory-item-type" type="java.lang.String"/>
+				<xml-element java-attribute="inventoryItemLink" name="inventory-item-link" type="java.lang.String"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryItemData" name="inventory-item-data" type="inventory.aai.onap.org.v15.InventoryItemData"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="taggedInventoryItemList" name="tagged-inventory-item-list" type="inventory.aai.onap.org.v15.TaggedInventoryItemList"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="InventoryItemData">
-			<xml-root-element name="inventory-item-data" />
+			<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" />
+				<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" />
+			<xml-root-element name="edge-tag-query-request"/>
 			<java-attributes>
-				<xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String" />
-				<xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String" />
-				<xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v15.StartNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v15.IncludeNodeFilter" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v15.SecondaryFilter" />
+				<xml-element java-attribute="edgeTag" name="edge-tag" type="java.lang.String"/>
+				<xml-element java-attribute="resultDetail" name="result-detail" type="java.lang.String"/>
+				<xml-element java-attribute="startNodeType" name="start-node-type" type="java.lang.String"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="startNodeFilter" name="start-node-filter" type="inventory.aai.onap.org.v15.StartNodeFilter"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="includeNodeFilter" name="include-node-filter" type="inventory.aai.onap.org.v15.IncludeNodeFilter"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilter" name="secondary-filter" type="inventory.aai.onap.org.v15.SecondaryFilter"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="StartNodeFilter">
-			<xml-root-element name="start-node-filter" />
+			<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" />
+				<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" />
+			<xml-root-element name="include-node-filter"/>
 			<java-attributes>
-				<xml-element java-attribute="includeNodeType" name="include-node-type" type="java.lang.String" />
+				<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" />
+			<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" />
+				<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" />
+			<xml-root-element name="search-results"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v15.ResultData" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="resultData" name="result-data" type="inventory.aai.onap.org.v15.ResultData"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="ResultData">
-			<xml-root-element name="result-data" />
+			<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-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-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" />
+			<xml-root-element name="sdn-zone-response"/>
 			<java-attributes>
-				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v15.OamNetworks" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v15.AzAndDvsSwitches" />
+				<xml-element java-attribute="oamNetworks" name="oam-networks" type="inventory.aai.onap.org.v15.OamNetworks"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="azAndDvsSwitches" name="az-and-dvs-switches" type="inventory.aai.onap.org.v15.AzAndDvsSwitches"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="AzAndDvsSwitches">
-			<xml-root-element name="az-and-dvs-switches" />
+			<xml-root-element name="az-and-dvs-switches"/>
 			<java-attributes>
-				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v15.DvsSwitches" />
-				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v15.AvailabilityZone" />
+				<xml-element java-attribute="dvsSwitches" name="dvs-switches" type="inventory.aai.onap.org.v15.DvsSwitches"/>
+				<xml-element java-attribute="availabilityZone" name="availability-zone" type="inventory.aai.onap.org.v15.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-property name="description" value="APIs that are more action related than REST (e.g., notify, update)."/>
 			</xml-properties>
-			<xml-root-element name="actions" />
+			<xml-root-element name="actions"/>
 			<java-attributes>
-				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v15.Update" />
-				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v15.Notify" />
+				<xml-element java-attribute="update" name="update" type="inventory.aai.onap.org.v15.Update"/>
+				<xml-element java-attribute="notify" name="notify" type="inventory.aai.onap.org.v15.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" />
+				<xml-property name="description" value="Serves a PATCH like function.  Does not enforce concurrency control.  Clear each usage with AAI team."/>
+			<xml-property name="requiredProps" value="update-node-type"/>
+            </xml-properties>
+			<xml-root-element name="update"/>
 			<java-attributes>
-				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v15.UpdateNodeKey" />
-				<xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v15.Action" />
+				<xml-element java-attribute="updateNodeType" name="update-node-type" required="true" type="java.lang.String"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="updateNodeKey" name="update-node-key" type="inventory.aai.onap.org.v15.UpdateNodeKey"/>
+				<xml-element java-attribute="updateNodeUri" name="update-node-uri" type="java.lang.String"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="action" name="action" type="inventory.aai.onap.org.v15.Action"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="Action">
-			<xml-root-element name="action" />
+			<xml-root-element name="action"/>
 			<java-attributes>
-				<xml-element java-attribute="actionType" name="action-type" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v15.ActionData" />
+				<xml-element java-attribute="actionType" name="action-type" type="java.lang.String"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="actionData" name="action-data" type="inventory.aai.onap.org.v15.ActionData"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="ActionData">
-			<xml-root-element name="action-data" />
+			<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" />
+				<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" />
+			<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" />
+				<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" />
+			<xml-root-element name="notify"/>
 			<java-attributes>
-				<xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String" />
-				<xml-element java-attribute="nodeType" name="node-type" type="java.lang.String" />
-				<xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v15.KeyData" />
-				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String" />
+				<xml-element java-attribute="eventId" name="event-id" required="true" type="java.lang.String"/>
+				<xml-element java-attribute="nodeType" name="node-type" type="java.lang.String"/>
+				<xml-element java-attribute="eventTrigger" name="event-trigger" type="java.lang.String"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="keyData" name="key-data" type="inventory.aai.onap.org.v15.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" />
+			<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" />
+				<xml-element java-attribute="keyName" name="key-name" type="java.lang.String"/>
+				<xml-element java-attribute="keyValue" name="key-value" type="java.lang.String"/>
 			</java-attributes>
 		</java-type>
 
                <java-type name="ExternalSystem">
                        <xml-properties>
-                               <xml-property name="description" value="Namespace for external system." />
+                               <xml-property name="description" value="Namespace for external system."/>
                        </xml-properties>
-                       <xml-root-element name="external-system" />
+                       <xml-root-element name="external-system"/>
                        <java-attributes>
-                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v15.EsrEmsList" />
-                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v15.EsrVnfmList" />
-                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v15.EsrThirdpartySdncList" />
+                               <xml-element java-attribute="esrEmsList" name="esr-ems-list" type="inventory.aai.onap.org.v15.EsrEmsList"/>
+                               <xml-element java-attribute="esrVnfmList" name="esr-vnfm-list" type="inventory.aai.onap.org.v15.EsrVnfmList"/>
+                               <xml-element java-attribute="esrThirdpartySdncList" name="esr-thirdparty-sdnc-list" type="inventory.aai.onap.org.v15.EsrThirdpartySdncList"/>
                        </java-attributes>
                </java-type>
 
                <java-type name="EsrEmsList">
-                       <xml-root-element name="esr-ems-list" />
+                       <xml-root-element name="esr-ems-list"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v15.EsrEms" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrEms" name="esr-ems" type="inventory.aai.onap.org.v15.EsrEms"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="maximumDepth" value="0" />
+                               <xml-property name="maximumDepth" value="0"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="EsrEms">
-                       <xml-root-element name="esr-ems" />
+                       <xml-root-element name="esr-ems"/>
                        <java-attributes>
                                <xml-element java-attribute="emsId" name="ems-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of EMS." />
+                                               <xml-property name="description" value="Unique ID of EMS."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v15.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v15.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist EMS address information used by EMS driver." />
-                               <xml-property name="indexedProps" value="ems-id" />
-                               <xml-property name="searchable" value="ems-id" />
-                               <xml-property name="container" value="esr-ems-list" />
-                               <xml-property name="namespace" value="external-system" />
-                       </xml-properties>
+                               <xml-property name="description" value="Persist EMS address information used by EMS driver."/>
+                               <xml-property name="indexedProps" value="ems-id"/>
+                               <xml-property name="searchable" value="ems-id"/>
+                               <xml-property name="container" value="esr-ems-list"/>
+                               <xml-property name="namespace" value="external-system"/>
+                       <xml-property name="requiredProps" value="ems-id"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="EsrVnfmList">
-                       <xml-root-element name="esr-vnfm-list" />
+                       <xml-root-element name="esr-vnfm-list"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v15.EsrVnfm" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrVnfm" name="esr-vnfm" type="inventory.aai.onap.org.v15.EsrVnfm"/>
                        </java-attributes>
             <xml-properties>
-                               <xml-property name="maximumDepth" value="0" />
+                               <xml-property name="maximumDepth" value="0"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="EsrVnfm">
-                       <xml-root-element name="esr-vnfm" />
+                       <xml-root-element name="esr-vnfm"/>
                        <java-attributes>
                                <xml-element java-attribute="vnfmId" name="vnfm-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of VNFM." />
+                                               <xml-property name="description" value="Unique ID of VNFM."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vimId" name="vim-id" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="indecate the VIM to deploy VNF." />
+                                               <xml-property name="description" value="indecate the VIM to deploy VNF."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="certificateUrl" name="certificate-url" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="certificate url of VNFM." />
+                                               <xml-property name="description" value="certificate url of VNFM."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v15.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v15.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist VNFM address information used by VF-C." />
-                               <xml-property name="indexedProps" value="vnfm-id" />
-                               <xml-property name="searchable" value="vnfm-id" />
-                               <xml-property name="container" value="esr-vnfm-list" />
-                               <xml-property name="namespace" value="external-system" />
-                       </xml-properties>
+                               <xml-property name="description" value="Persist VNFM address information used by VF-C."/>
+                               <xml-property name="indexedProps" value="vnfm-id"/>
+                               <xml-property name="searchable" value="vnfm-id"/>
+                               <xml-property name="container" value="esr-vnfm-list"/>
+                               <xml-property name="namespace" value="external-system"/>
+                       <xml-property name="requiredProps" value="vnfm-id"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="EsrThirdpartySdncList">
-                       <xml-root-element name="esr-thirdparty-sdnc-list" />
+                       <xml-root-element name="esr-thirdparty-sdnc-list"/>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v15.EsrThirdpartySdnc" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrThirdpartySdnc" name="esr-thirdparty-sdnc" type="inventory.aai.onap.org.v15.EsrThirdpartySdnc"/>
                        </java-attributes>
             <xml-properties>
-                               <xml-property name="maximumDepth" value="0" />
+                               <xml-property name="maximumDepth" value="0"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="EsrThirdpartySdnc">
-                       <xml-root-element name="esr-thirdparty-sdnc" />
+                       <xml-root-element name="esr-thirdparty-sdnc"/>
                        <java-attributes>
                                <xml-element java-attribute="thirdpartySdncId" name="thirdparty-sdnc-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of SDNC." />
+                                               <xml-property name="description" value="Unique ID of SDNC."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="location" name="location" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="used for DC type to indicate the location of SDNC, such as Core or Edge." />
+                                               <xml-property name="description" value="used for DC type to indicate the location of SDNC, such as Core or Edge."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="productName" name="product-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="password used to access SDNC server." />
+                                               <xml-property name="description" value="password used to access SDNC server."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+                                               <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v15.EsrSystemInfoList" />
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+                               <xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v15.EsrSystemInfoList"/>
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC." />
-                               <xml-property name="indexedProps" value="sdnc-id" />
-                               <xml-property name="searchable" value="sdnc-id" />
-                               <xml-property name="container" value="esr-thirdparty-sdnc-list" />
-                               <xml-property name="namespace" value="external-system" />
-                       </xml-properties>
+                               <xml-property name="description" value="Persist SDNC address information used by ONAP SDNC."/>
+                               <xml-property name="indexedProps" value="sdnc-id"/>
+                               <xml-property name="searchable" value="sdnc-id"/>
+                               <xml-property name="container" value="esr-thirdparty-sdnc-list"/>
+                               <xml-property name="namespace" value="external-system"/>
+                       <xml-property name="requiredProps" value="thirdparty-sdnc-id"/>
+            </xml-properties>
                </java-type>
 
                <java-type name="EsrSystemInfoList">
-                       <xml-root-element name="esr-system-info-list" />
+                       <xml-root-element name="esr-system-info-list"/>
                        <xml-properties>
-                               <xml-property name="description" value="Collection of persistent block-level external system auth info." />
+                               <xml-property name="description" value="Collection of persistent block-level external system auth info."/>
                        </xml-properties>
                        <java-attributes>
-                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v15.EsrSystemInfo" />
+                               <xml-element container-type="java.util.ArrayList" java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v15.EsrSystemInfo"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="maximumDepth" value="0" />
+                               <xml-property name="maximumDepth" value="0"/>
                        </xml-properties>
                </java-type>
 
                <java-type name="EsrSystemInfo">
-                       <xml-root-element name="esr-system-info" />
+                       <xml-root-element name="esr-system-info"/>
                        <java-attributes>
                                <xml-element java-attribute="esrSystemInfoId" name="esr-system-info-id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
-                                               <xml-property name="description" value="Unique ID of esr system info." />
+                                               <xml-property name="description" value="Unique ID of esr system info."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="systemName" name="system-name" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="name of external system." />
+                                               <xml-property name="description" value="name of external system."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="type" name="type" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="type of external systems." />
+                                               <xml-property name="description" value="type of external systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="vendor of external systems." />
+                                               <xml-property name="description" value="vendor of external systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="version" name="version" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="version of external systems." />
+                                               <xml-property name="description" value="version of external systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="serviceUrl" name="service-url" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="url used to access external systems." />
+                                               <xml-property name="description" value="url used to access external systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="userName" name="user-name" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="username used to access external systems." />
+                                               <xml-property name="description" value="username used to access external systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="password" name="password" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="password used to access external systems." />
+                                               <xml-property name="description" value="password used to access external systems."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="systemType" name="system-type" required="true" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm." />
+                                               <xml-property name="description" value="it could be vim/vnfm/thirdparty-sdnc/ems-resource/ems-performance/ems-alarm."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="protocol" name="protocol" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp." />
+                                               <xml-property name="description" value="protocol of third party SDNC, for example netconf/snmp."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="sslCacert" name="ssl-cacert" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="ca file content if enabled ssl on auth-url." />
+                                               <xml-property name="description" value="ca file content if enabled ssl on auth-url."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element default-value="false" java-attribute="sslInsecure" name="ssl-insecure" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="Whether to verify VIM's certificate." />
+                                               <xml-property name="description" value="Whether to verify VIM's certificate."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="service IP of ftp server." />
+                                               <xml-property name="description" value="service IP of ftp server."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="port" name="port" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="service port of ftp server." />
+                                               <xml-property name="description" value="service port of ftp server."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="cloudDomain" name="cloud-domain" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="domain info for authentication." />
+                                               <xml-property name="description" value="domain info for authentication."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="defaultTenant" name="default-tenant" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="default tenant of VIM." />
+                                               <xml-property name="description" value="default tenant of VIM."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="passive" name="passive" type="java.lang.Boolean">
                                        <xml-properties>
-                                               <xml-property name="description" value="ftp passive mode or not." />
+                                               <xml-property name="description" value="ftp passive mode or not."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="remotePath" name="remote-path" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="resource or performance data file path." />
+                                               <xml-property name="description" value="resource or performance data file path."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="systemStatus" name="system-status" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="the status of external system." />
+                                               <xml-property name="description" value="the status of external system."/>
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="openstackRegionId" name="openstack-region-id" type="java.lang.String">
                                        <xml-properties>
-	                                           <xml-property name="description" value="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack instance." />
+	                                           <xml-property name="description" value="OpenStack region ID used by MultiCloud plugin to interact with an OpenStack 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-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+                               <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
                        </java-attributes>
                        <xml-properties>
-                               <xml-property name="description" value="Persist common address information of external systems." />
-                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type" />
-                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type" />
-                               <xml-property name="container" value="esr-system-info-list" />
-                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network" />
-                       </xml-properties>
+                               <xml-property name="description" value="Persist common address information of external systems."/>
+                               <xml-property name="indexedProps" value="esr-system-info-id,system-name,system-type"/>
+                               <xml-property name="searchable" value="esr-system-info-id,system-name,system-type"/>
+                               <xml-property name="container" value="esr-system-info-list"/>
+                               <xml-property name="dependentOn" value="cloud-region,esr-ems,esr-vnfm,esr-thirdparty-sdnc,ext-aai-network"/>
+                       <xml-property name="requiredProps" value="esr-system-info-id,user-name,password,system-type"/>
+            </xml-properties>
                </java-type>
 
 		<java-type name="HpaCapabilities">
@@ -543,7 +545,8 @@
 				<xml-property name="indexedProps" value="hpa-feature,architecture,hpa-capability-id"/>
 				<xml-property name="dependentOn" value="flavor,cloud-region"/>
 				<xml-property name="container" value="hpa-capabilities"/>
-			</xml-properties>
+			<xml-property name="requiredProps" value="hpa-capability-id,hpa-feature"/>
+            </xml-properties>
 		</java-type>
 
 		<java-type name="HpaFeatureAttributes">
@@ -570,7 +573,8 @@
 				<xml-property name="description" value="HPA Capability Feature attributes"/>
 				<xml-property name="indexedProps" value="hpa-attribute-key"/>
 				<xml-property name="dependentOn" value="hpa-capability"/>
-			</xml-properties>
+			<xml-property name="requiredProps" value="hpa-attribute-key"/>
+            </xml-properties>
 		</java-type>
 
         <java-type name="CloudInfrastructure">
@@ -604,7 +608,7 @@
             <java-attributes>
                 <xml-element java-attribute="cloudOwner" name="cloud-owner" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-						<xml-property name="description" value="Identifies the vendor and cloud name. First part of composite key should be formatted as vendor-cloudname" />
+						<xml-property name="description" value="Identifies the vendor and cloud name. 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">
@@ -649,7 +653,12 @@
 				</xml-element>
 				<xml-element java-attribute="cloudExtraInfo" name="cloud-extra-info" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM." />
+						<xml-property name="description" value="ESR inputs extra information about the VIM or Cloud which will be decoded by MultiVIM."/>
+                    </xml-properties>
+                </xml-element>
+				<xml-element java-attribute="upgradeCycle" name="upgrade-cycle" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Upgrade cycle for the cloud region. For AIC regions upgrade cycle is designated by A,B,C etc."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -674,7 +683,7 @@
 						<xml-property name="description" value="List of cloud-region specific HPA Capabilities"/>
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v15.EsrSystemInfoList" />
+				<xml-element java-attribute="esrSystemInfoList" name="esr-system-info-list" type="inventory.aai.onap.org.v15.EsrSystemInfoList"/>
             </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."/>
@@ -683,6 +692,7 @@
                 <xml-property name="container" value="cloud-regions"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}"/>
+            <xml-property name="requiredProps" value="cloud-owner,cloud-region-id"/>
             </xml-properties>
         </java-type>
         <java-type name="VolumeGroups">
@@ -747,66 +757,67 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="volume-groups"/>
                 <xml-property name="uriTemplate" value="/volume-groups/volume-group/{volume-group-id}"/>
+            <xml-property name="requiredProps" value="volume-group-id,vnf-type"/>
             </xml-properties>
         </java-type>
 
         <java-type name="RelationshipList">
-            <xml-root-element name="relationship-list" />
+            <xml-root-element name="relationship-list"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v15.Relationship" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationship" name="relationship" type="inventory.aai.onap.org.v15.Relationship"/>
             </java-attributes>
         </java-type>
 
         <java-type name="Relationship">
-            <xml-root-element 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-property name="description" value="A keyword provided by A&amp;AI to indicate type of node."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relationshipLabel" name="relationship-label" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="The edge label for this relationship." />
+                        <xml-property name="description" value="The edge label for this relationship."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="relatedLink" name="related-link" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="URL to the object in A&amp;AI." />
+                        <xml-property name="description" value="URL to the object in A&amp;AI."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v15.RelationshipData" />
-                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v15.RelatedToProperty" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="relationshipData" name="relationship-data" type="inventory.aai.onap.org.v15.RelationshipData"/>
+                <xml-element container-type="java.util.ArrayList" java-attribute="relatedToProperty" name="related-to-property" type="inventory.aai.onap.org.v15.RelatedToProperty"/>
             </java-attributes>
         </java-type>
 
         <java-type name="RelatedToProperty">
-            <xml-root-element name="related-to-property" />
+            <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-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-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" />
+            <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-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-property name="description" value="Value of the attribute."/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
@@ -879,6 +890,7 @@
                 <xml-property name="container" value="complexes"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/complexes/complex/{physical-location-id}"/>
+            <xml-property name="requiredProps" value="physical-location-id,physical-location-type,street1,city,postal-code,country,region"/>
             </xml-properties>
         </java-type>
 
@@ -925,6 +937,7 @@
                 <xml-property name="dependentOn" value="complex"/>
                 <xml-property name="container" value="ctag-pools"/>
                 <xml-property name="uriTemplate" value="/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}"/>
+            <xml-property name="requiredProps" value="target-pe,availability-zone-name,ctag-pool-purpose"/>
             </xml-properties>
         </java-type>
 
@@ -976,6 +989,7 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="tenants"/>
                 <xml-property name="uriTemplate" value="/tenants/tenant/{tenant-id}"/>
+            <xml-property name="requiredProps" value="tenant-id,tenant-name"/>
             </xml-properties>
         </java-type>
 
@@ -1037,6 +1051,7 @@
                 <xml-property name="nameProps" value="nos-server-name"/>
                 <xml-property name="container" value="nos-servers"/>
                 <xml-property name="uriTemplate" value="/nos-servers/nos-server/{nos-server-id}"/>
+            <xml-property name="requiredProps" value="nos-server-id,nos-server-name,vendor,nos-server-selflink,in-maint"/>
             </xml-properties>
         </java-type>
 
@@ -1107,6 +1122,7 @@
                 <xml-property name="dependentOn" value="tenant"/>
                 <xml-property name="container" value="vservers"/>
                 <xml-property name="uriTemplate" value="/vservers/vserver/{vserver-id}"/>
+            <xml-property name="requiredProps" value="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled"/>
             </xml-properties>
         </java-type>
 
@@ -1224,6 +1240,7 @@
                 <xml-property name="dependentOn" value="generic-vnf,newvce,p-interface,vserver,lag-interface,l-interface"/>
                 <xml-property name="container" value="l-interfaces"/>
                 <xml-property name="uriTemplate" value="/l-interfaces/l-interface/{interface-name}"/>
+            <xml-property name="requiredProps" value="interface-name,is-port-mirrored,in-maint,is-ip-unnumbered"/>
             </xml-properties>
         </java-type>
 
@@ -1317,6 +1334,7 @@
                 <xml-property name="dependentOn" value="l-interface"/>
                 <xml-property name="container" value="sriov-vfs"/>
                 <xml-property name="uriTemplate" value="/sriov-vfs/sriov-vf/{pci-id}"/>
+            <xml-property name="requiredProps" value="pci-id"/>
             </xml-properties>
         </java-type>
 
@@ -1370,6 +1388,7 @@
                 <xml-property name="indexedProps" value="l3-interface-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
                 <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp"/>
             <xml-property name="uriTemplate" value="/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}"/>
+            <xml-property name="requiredProps" value="l3-interface-ipv4-address"/>
             </xml-properties>
         </java-type>
 
@@ -1466,6 +1485,7 @@
                 <xml-property name="dependentOn" value="l-interface"/>
                 <xml-property name="container" value="vlans"/>
                 <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/>
+            <xml-property name="requiredProps" value="vlan-interface,in-maint,is-ip-unnumbered"/>
             </xml-properties>
         </java-type>
 
@@ -1519,6 +1539,7 @@
                 <xml-property name="indexedProps" value="l3-interface-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
                 <xml-property name="dependentOn" value="vlan,l-interface,vnfc,cp"/>
             <xml-property name="uriTemplate" value="/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}"/>
+            <xml-property name="requiredProps" value="l3-interface-ipv6-address"/>
             </xml-properties>
         </java-type>
 
@@ -1558,6 +1579,7 @@
                 <xml-property name="dependentOn" value="vserver"/>
                 <xml-property name="container" value="volumes"/>
                 <xml-property name="uriTemplate" value="/volumes/volume/{volume-id}"/>
+            <xml-property name="requiredProps" value="volume-id,volume-selflink"/>
             </xml-properties>
         </java-type>
 
@@ -1581,7 +1603,7 @@
                 </xml-element>
                 <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String">
                     <xml-properties>
-						<xml-property name="description" value="Cloud Region Flavor name" />
+						<xml-property name="description" value="Cloud Region Flavor name"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer">
@@ -1643,6 +1665,7 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="flavors"/>
                 <xml-property name="uriTemplate" value="/flavors/flavor/{flavor-id}"/>
+            <xml-property name="requiredProps" value="flavor-id,flavor-name,flavor-selflink"/>
             </xml-properties>
         </java-type>
 
@@ -1724,6 +1747,7 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="snapshots"/>
                 <xml-property name="uriTemplate" value="/snapshots/snapshot/{snapshot-id}"/>
+            <xml-property name="requiredProps" value="snapshot-id"/>
             </xml-properties>
         </java-type>
 
@@ -1775,6 +1799,7 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="group-assignments"/>
                 <xml-property name="uriTemplate" value="/group-assignments/group-assignment/{group-id}"/>
+            <xml-property name="requiredProps" value="group-id,group-type,group-name"/>
             </xml-properties>
         </java-type>
 
@@ -1851,6 +1876,7 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="images"/>
                 <xml-property name="uriTemplate" value="/images/image/{image-id}"/>
+            <xml-property name="requiredProps" value="image-id,image-name,image-os-distro,image-os-version,image-selflink"/>
             </xml-properties>
         </java-type>
 
@@ -1881,6 +1907,7 @@
                 <xml-property name="dependentOn" value="tenant,image,service-instance,connector,model"/>
                 <xml-property name="container" value="metadata"/>
                 <xml-property name="uriTemplate" value="/metadata/metadatum/{metaname}"/>
+            <xml-property name="requiredProps" value="metaname,metaval"/>
             </xml-properties>
         </java-type>
 
@@ -1920,6 +1947,7 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="dvs-switches"/>
                 <xml-property name="uriTemplate" value="/dvs-switches/dvs-switch/{switch-name}"/>
+            <xml-property name="requiredProps" value="switch-name,vcenter-url"/>
             </xml-properties>
         </java-type>
 
@@ -1959,6 +1987,7 @@
                 <xml-property name="container" value="network-profiles"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/network-profiles/network-profile/{nm-profile-name}"/>
+            <xml-property name="requiredProps" value="nm-profile-name"/>
             </xml-properties>
         </java-type>
 
@@ -2128,6 +2157,7 @@
                 <xml-property name="container" value="pservers"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/pservers/pserver/{hostname}"/>
+            <xml-property name="requiredProps" value="hostname,in-maint"/>
             </xml-properties>
         </java-type>
 
@@ -2155,6 +2185,7 @@
                 <xml-property name="description" value="HPA Capacity information for compute node"/>
                 <xml-property name="indexedProps" value="hpa-capacity-key"/>
                 <xml-property name="dependentOn" value="hpa-capacity"/>
+            <xml-property name="requiredProps" value="hpa-capacity-key"/>
             </xml-properties>
         </java-type>
 
@@ -2218,7 +2249,7 @@
                 </xml-element>
 				<xml-element java-attribute="macAddress" name="mac-addresss" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="MAC Address of the p-interface." />
+						<xml-property name="description" value="MAC Address of the p-interface."/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -2239,17 +2270,17 @@
                 </xml-element>
 				<xml-element java-attribute="networkRef" name="network-ref" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point." />
+						<xml-property name="description" value="Store the network-ref of this p-interface. Derived from ietf-restconf-notification that identifies a termination-point."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="transparent" name="transparent" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the transparent value of this p-interface." />
+						<xml-property name="description" value="Store the transparent value of this p-interface."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="oper Status of this p-interface." />
+						<xml-property name="description" value="oper Status of this p-interface."/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
@@ -2258,11 +2289,12 @@
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Physical interface (e.g., nic)"/>
-				<xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-status" />
+				<xml-property name="indexedProps" value="interface-name,prov-status,networkRef,operational-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-property name="uriTemplate" value="/p-interfaces/p-interface/{interface-name}"/>
+            <xml-property name="requiredProps" value="interface-name,in-maint"/>
             </xml-properties>
         </java-type>
 
@@ -2334,6 +2366,7 @@
                 <xml-property name="dependentOn" value="generic-vnf,pserver,vpls-pe,pnf"/>
                 <xml-property name="container" value="lag-interfaces"/>
                 <xml-property name="uriTemplate" value="/lag-interfaces/lag-interface/{interface-name}"/>
+            <xml-property name="requiredProps" value="interface-name,in-maint"/>
             </xml-properties>
         </java-type>
         
@@ -2394,6 +2427,7 @@
                 <xml-property name="dependentOn" value="pnf"/>
                 <xml-property name="container" value="vrfs"/>
                 <xml-property name="uriTemplate" value="/vrfs/vrf/{vrf-id}"/>
+            <xml-property name="requiredProps" value="vrf-id,vrf-name"/>
             </xml-properties>
         </java-type>
         
@@ -2449,6 +2483,7 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="oam-networks"/>
                 <xml-property name="uriTemplate" value="/oam-networks/oam-network/{network-uuid}"/>
+            <xml-property name="requiredProps" value="network-uuid,network-name,cvlan-tag"/>
             </xml-properties>
         </java-type>
 
@@ -2493,6 +2528,7 @@
                 <xml-property name="dependentOn" value="cloud-region"/>
                 <xml-property name="container" value="availability-zones"/>
                 <xml-property name="uriTemplate" value="/availability-zones/availability-zone/{availability-zone-name}"/>
+            <xml-property name="requiredProps" value="availability-zone-name,hypervisor-type"/>
             </xml-properties>
         </java-type>
 
@@ -2533,6 +2569,7 @@
                 <xml-property name="container" value="virtual-data-centers"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}"/>
+            <xml-property name="requiredProps" value="vdc-id,vdc-name"/>
             </xml-properties>
         </java-type>
 
@@ -2549,7 +2586,7 @@
                 <xml-element java-attribute="platforms" name="platforms" type="inventory.aai.onap.org.v15.Platforms"/>
                 <xml-element java-attribute="projects" name="projects" type="inventory.aai.onap.org.v15.Projects"/>
 
-				<xml-element java-attribute="spPartners" name="sp-partners" type="inventory.aai.onap.org.v15.SpPartners" />
+				<xml-element java-attribute="spPartners" name="sp-partners" type="inventory.aai.onap.org.v15.SpPartners"/>
             </java-attributes>
         </java-type>
 
@@ -2585,6 +2622,7 @@
                 <xml-property name="container" value="projects"/>
                 <xml-property name="namespace" value="business"/>
                 <xml-property name="uriTemplate" value="/business/projects/project/{project-name}"/>
+            <xml-property name="requiredProps" value="project-name"/>
             </xml-properties>
         </java-type>
 
@@ -2647,6 +2685,7 @@
                 <xml-property name="container" value="connectors"/>
                 <xml-property name="namespace" value="business"/>
                 <xml-property name="uriTemplate" value="/business/connectors/connector/{resource-instance-id}"/>
+            <xml-property name="requiredProps" value="resource-instance-id"/>
             </xml-properties>
         </java-type>
 
@@ -2699,6 +2738,7 @@
                 <xml-property name="container" value="customers"/>
                 <xml-property name="namespace" value="business"/>
                 <xml-property name="uriTemplate" value="/business/customers/customer/{global-customer-id}"/>
+            <xml-property name="requiredProps" value="global-customer-id,subscriber-name,subscriber-type"/>
             </xml-properties>
         </java-type>
 
@@ -2734,6 +2774,7 @@
                 <xml-property name="container" value="lines-of-business"/>
                 <xml-property name="namespace" value="business"/>
                 <xml-property name="uriTemplate" value="/business/lines-of-business/line-of-business/{line-of-business-name}"/>
+            <xml-property name="requiredProps" value="line-of-business-name"/>
             </xml-properties>
         </java-type>
 
@@ -2775,6 +2816,7 @@
                 <xml-property name="container" value="owning-entities"/>
                 <xml-property name="namespace" value="business"/>
                 <xml-property name="uriTemplate" value="/business/owning-entities/owning-entity/{owning-entity-id}"/>
+            <xml-property name="requiredProps" value="owning-entity-id,owning-entity-name"/>
             </xml-properties>
         </java-type>
 
@@ -2810,6 +2852,7 @@
                 <xml-property name="container" value="platforms"/>
                 <xml-property name="namespace" value="business"/>
                 <xml-property name="uriTemplate" value="/business/platforms/platform/{platform-name}"/>
+            <xml-property name="requiredProps" value="platform-name"/>
             </xml-properties>
         </java-type>
 
@@ -2852,6 +2895,7 @@
                 <xml-property name="container" value="service-subscriptions"/>
                 <xml-property name="crossEntityReference" value="service-instance,service-type"/>
                 <xml-property name="uriTemplate" value="/service-subscriptions/service-subscription/{service-type}"/>
+            <xml-property name="requiredProps" value="service-type"/>
             </xml-properties>
         </java-type>
 
@@ -2900,17 +2944,17 @@
                 </xml-element>
                 <xml-element java-attribute="createdAt" name="created-at" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="create time of Network Service." />
+                        <xml-property name="description" value="create time of Network Service."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="updatedAt" name="updated-at" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="last update of Network Service." />
+                        <xml-property name="description" value="last update of Network Service."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="short description for service-instance." />
+                        <xml-property name="description" value="short description for service-instance."/>
                     </xml-properties>
                 </xml-element>
                 <!-- for storing the nsd_id create edge between services -->
@@ -2980,7 +3024,7 @@
                 </xml-element>
 				<xml-element java-attribute="inputParameters" name="input-parameters" required="false" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop." />
+						<xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop."/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
@@ -2996,6 +3040,7 @@
                 <xml-property name="dependentOn" value="service-subscription"/>
                 <xml-property name="container" value="service-instances"/>
                 <xml-property name="uriTemplate" value="/service-instances/service-instance/{service-instance-id}"/>
+            <xml-property name="requiredProps" value="service-instance-id"/>
             </xml-properties>
         </java-type>
 
@@ -3065,6 +3110,7 @@
                 <xml-property name="container" value="vnf-images"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/vnf-images/vnf-image/{vnf-image-uuid}"/>
+            <xml-property name="requiredProps" value="vnf-image-uuid,application,application-vendor"/>
             </xml-properties>
         </java-type>
 
@@ -3114,6 +3160,7 @@
                 <xml-property name="container" value="services"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/services/service/{service-id}"/>
+            <xml-property name="requiredProps" value="service-id,service-description"/>
             </xml-properties>
         </java-type>
 
@@ -3153,6 +3200,7 @@
                 <xml-property name="container" value="service-capabilities"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/service-capabilities/service-capability/{service-type}/{vnf-type}"/>
+            <xml-property name="requiredProps" value="service-type,vnf-type"/>
             </xml-properties>
         </java-type>
 
@@ -3184,14 +3232,14 @@
                 <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v15.ForwardingPaths"/>
                 <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v15.Collections"/>
                 <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v15.VlanTags"/>
-				<xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v15.Connectivities" />
-				<xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v15.LanPortConfigs" />
-				<xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v15.NetworkResources" />
-				<xml-element java-attribute="siteResources" name="site-resources" type="inventory.aai.onap.org.v15.SiteResources" />
-				<xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v15.SdwanVpns" />
-				<xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v15.Devices" />
-				<xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v15.WanPortConfigs" />
-				<xml-element java-attribute="extAaiNetworks" name="ext-aai-networks" type="inventory.aai.onap.org.v15.ExtAaiNetworks" />
+				<xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v15.Connectivities"/>
+				<xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v15.LanPortConfigs"/>
+				<xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v15.NetworkResources"/>
+				<xml-element java-attribute="siteResources" name="site-resources" type="inventory.aai.onap.org.v15.SiteResources"/>
+				<xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v15.SdwanVpns"/>
+				<xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v15.Devices"/>
+				<xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v15.WanPortConfigs"/>
+				<xml-element java-attribute="extAaiNetworks" name="ext-aai-networks" type="inventory.aai.onap.org.v15.ExtAaiNetworks"/>
             </java-attributes>
         </java-type>
         <java-type name="Configurations">
@@ -3301,6 +3349,7 @@
                 <xml-property name="container" value="configurations"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/configurations/configuration/{configuration-id}"/>
+            <xml-property name="requiredProps" value="configuration-id,configuration-type"/>
             </xml-properties>
         </java-type>
 
@@ -3345,7 +3394,7 @@
                 </xml-element>
                 <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String">
                     <xml-properties>
-						<xml-property name="description" value="v4, v6, or ds for dual stack" />
+						<xml-property name="description" value="v4, v6, or ds for dual stack"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="routingProtocol" name="routing-protocol" type="java.lang.String">
@@ -3424,12 +3473,13 @@
             </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,operational-status" />
+				<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,operational-status"/>
                 <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-property name="uriTemplate" value="/network/logical-links/logical-link/{link-name}"/>
+            <xml-property name="requiredProps" value="link-name,in-maint,link-type"/>
             </xml-properties>
         </java-type>
 
@@ -3466,6 +3516,7 @@
                 <xml-property name="container" value="site-pair-sets"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/site-pair-sets/site-pair-set/{site-pair-set-id}"/>
+            <xml-property name="requiredProps" value="site-pair-set-id"/>
             </xml-properties>
         </java-type>
 
@@ -3658,63 +3709,63 @@
                 </xml-element>
 				<xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access provider of this vpn." />
+						<xml-property name="description" value="Store the id of the access provider of this vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access client of this vpn." />
+						<xml-property name="description" value="Store the id of the access client of this vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access topology of this vpn." />
+						<xml-property name="description" value="Store the id of the access topology of this vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="srcAccessNodeId" name="src-access-node-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the src-access-node of this vpn." />
+						<xml-property name="description" value="Store the id of the src-access-node of this vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="srcAccessLtpId" name="src-access-ltp-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the src-access-ltp of this vpn." />
+						<xml-property name="description" value="Store the id of the src-access-ltp of this vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="dstAccessNodeId" name="dst-access-node-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the dst-access-node of this vpn." />
+						<xml-property name="description" value="Store the id of the dst-access-node of this vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="dstAccessLtpId" name="dst-access-ltp-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the dst-access-ltp of this vpn." />
+						<xml-property name="description" value="Store the id of the dst-access-ltp of this vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the operational-status for this object." />
+						<xml-property name="description" value="Store the operational-status for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-customization-id for this object." />
+						<xml-property name="description" value="Store the model-customization-id for this object."/>
 					</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-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-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-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
 					</xml-properties>
 				</xml-element>
@@ -3733,12 +3784,13 @@
             <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,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status" />
+				<xml-property name="indexedProps" value="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status"/>
                 <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-property name="uriTemplate" value="/network/vpn-bindings/vpn-binding/{vpn-id}"/>
+            <xml-property name="requiredProps" value="vpn-id,vpn-name"/>
             </xml-properties>
         </java-type>
 
@@ -3791,6 +3843,7 @@
                 <xml-property name="container" value="vpls-pes"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/vpls-pes/vpls-pe/{equipment-name}"/>
+            <xml-property name="requiredProps" value="equipment-name"/>
             </xml-properties>
         </java-type>
 
@@ -3961,6 +4014,7 @@
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="extends" value="vnf"/>
                 <xml-property name="uriTemplate" value="/network/vces/vce/{vnf-id}"/>
+            <xml-property name="requiredProps" value="vnf-id,vnf-name,vnf-type"/>
             </xml-properties>
         </java-type>
 
@@ -4039,6 +4093,7 @@
                 <xml-property name="dependentOn" value="vce"/>
                 <xml-property name="container" value="port-groups"/>
                 <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/>
+            <xml-property name="requiredProps" value="interface-id,orchestration-status"/>
             </xml-properties>
         </java-type>
 
@@ -4335,6 +4390,7 @@
                 <xml-element java-attribute="subnets" name="subnets" type="inventory.aai.onap.org.v15.Subnets"/>
                 <xml-element java-attribute="ctagAssignments" name="ctag-assignments" type="inventory.aai.onap.org.v15.CtagAssignments"/>
                 <xml-element java-attribute="segmentationAssignments" name="segmentation-assignments" type="inventory.aai.onap.org.v15.SegmentationAssignments"/>
+                <xml-element java-attribute="aggregateRoutes" name="aggregate-routes" type="inventory.aai.onap.org.v15.AggregateRoutes"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList">
                     <xml-properties>
                         <xml-property name="description" value="Relates to tenant (or is it a child of tenant), complex, service, vpn-binding"/>
@@ -4350,6 +4406,7 @@
                 <xml-property name="container" value="l3-networks"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/l3-networks/l3-network/{network-id}"/>
+            <xml-property name="requiredProps" value="network-id,is-bound-to-vpn,is-provider-network,is-shared-network,is-external-network"/>
             </xml-properties>
         </java-type>
         <java-type name="NetworkPolicies">
@@ -4545,7 +4602,7 @@
                 </xml-element>
                 <xml-element java-attribute="vnfInstanceId" name="vnf-instance-id" required="false" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="vnf instance id." />
+                        <xml-property name="description" value="vnf instance id."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="vnfName" name="vnf-name" type="java.lang.String">
@@ -4683,17 +4740,17 @@
                 </xml-element>
                 <xml-element java-attribute="nshd" name="nshd" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of associated SHD in vnf." />
+                        <xml-property name="description" value="number of associated SHD in vnf."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="nvm" name="nvm" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of vms in vnf." />
+                        <xml-property name="description" value="number of vms in vnf."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="nnet" name="nnet" type="java.lang.Long">
                     <xml-properties>
-                        <xml-property name="description" value="number of network in vnf." />
+                        <xml-property name="description" value="number of network in vnf."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
@@ -4858,6 +4915,7 @@
                 <xml-property name="containsSuggestibleProps" value="true"/>
                 <xml-property name="suggestionAliases" value="VNFs"/>
                 <xml-property name="uriTemplate" value="/network/generic-vnfs/generic-vnf/{vnf-id}"/>
+            <xml-property name="requiredProps" value="vnf-id,vnf-type,in-maint,is-closed-loop-disabled"/>
             </xml-properties>
         </java-type>
 
@@ -4974,6 +5032,7 @@
                 <xml-property name="dependentOn" value="generic-vnf"/>
                 <xml-property name="container" value="vf-modules"/>
                 <xml-property name="uriTemplate" value="/vf-modules/vf-module/{vf-module-id}"/>
+            <xml-property name="requiredProps" value="vf-module-id,is-base-vf-module,automated-assignment"/>
             </xml-properties>
         </java-type>
 
@@ -5009,6 +5068,7 @@
                 <xml-property name="container" value="lag-links"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/lag-links/lag-link/{link-name}"/>
+            <xml-property name="requiredProps" value="link-name"/>
             </xml-properties>
         </java-type>
 
@@ -5107,6 +5167,7 @@
                 <xml-property name="container" value="newvces"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/newvces/newvce/{vnf-id2}"/>
+            <xml-property name="requiredProps" value="vnf-id2,vnf-name,vnf-type"/>
             </xml-properties>
         </java-type>
 
@@ -5249,17 +5310,17 @@
                 </xml-element>
 				<xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="admin Status of this PNF" />
+						<xml-property name="description" value="admin Status of this PNF"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the operational-status for this object." />
+						<xml-property name="description" value="Store the operational-status for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-customization-id for this object." />
+						<xml-property name="description" value="Store the model-customization-id for this object."/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
@@ -5281,15 +5342,15 @@
                 </xml-element>
                 <xml-element java-attribute="pnfIpv4Address" name="pnf-ipv4-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at." />
+                        <xml-property name="description" value="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="pnfIpv6Address" name="pnf-ipv6-address" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at." />
+                        <xml-property name="description" value="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at."/>
                     </xml-properties>
                 </xml-element>
-                <xml-element java-attribute="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v15.SoftwareVersions" />
+                <xml-element java-attribute="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v15.SoftwareVersions"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
                 <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v15.PInterfaces"/>
                 <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v15.LagInterfaces"/>
@@ -5303,38 +5364,40 @@
                 <xml-property name="container" value="pnfs"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
+            <xml-property name="requiredProps" value="pnf-name,in-maint"/>
             </xml-properties>
         </java-type>
         <java-type name="SoftwareVersions">
             <xml-properties>
-                <xml-property name="description" value="Collection of software versions." />
+                <xml-property name="description" value="Collection of software versions."/>
             </xml-properties>
-            <xml-root-element name="software-versions" />
+            <xml-root-element name="software-versions"/>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="softwareVersion" name="software-version" type="inventory.aai.onap.org.v15.SoftwareVersion" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="softwareVersion" name="software-version" type="inventory.aai.onap.org.v15.SoftwareVersion"/>
             </java-attributes>
         </java-type>
 
         <java-type name="SoftwareVersion">
-            <xml-root-element name="software-version" />
+            <xml-root-element name="software-version"/>
             <java-attributes>
                 <xml-element java-attribute="softwareVersionId" name="software-version-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Identifier of the software version" />
+                        <xml-property name="description" value="Identifier of the software version"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element default-value="false" java-attribute="isActiveSwVer" name="is-active-sw-ver" 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 software-version is the active one (activeSw = true)" />
+                        <xml-property name="description" value="used to indicate whether or not this software-version is the active one (activeSw = true)"/>
                     </xml-properties>
                 </xml-element>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Software Version" />
-                <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer" />
-                <xml-property name="dependentOn" value="pnf" />
-                <xml-property name="container" value="pnf" />
+                <xml-property name="description" value="Software Version"/>
+                <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer"/>
+                <xml-property name="dependentOn" value="pnf"/>
+                <xml-property name="container" value="pnf"/>
+            <xml-property name="requiredProps" value="software-version-id,is-active-sw-ver"/>
             </xml-properties>
         </java-type>
 
@@ -5424,6 +5487,7 @@
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="searchable" value="link-name,circuit-id"/>
                 <xml-property name="uriTemplate" value="/network/physical-links/physical-link/{link-name}"/>
+            <xml-property name="requiredProps" value="link-name"/>
             </xml-properties>
         </java-type>
 
@@ -5465,6 +5529,7 @@
                 <xml-property name="dependentOn" value="ipsec-configuration"/>
                 <xml-property name="container" value="vig-servers"/>
                 <xml-property name="uriTemplate" value="/vig-servers/vig-server/{vig-address-type}"/>
+            <xml-property name="requiredProps" value="vig-address-type"/>
             </xml-properties>
         </java-type>
 
@@ -5598,78 +5663,79 @@
                 <xml-property name="container" value="ipsec-configurations"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}"/>
-			</xml-properties>
+			<xml-property name="requiredProps" value="ipsec-configuration-id"/>
+            </xml-properties>
 		</java-type>
 
 
 		<java-type name="NotificationEvent">
-			<xml-root-element name="notification-event" />
+			<xml-root-element name="notification-event"/>
 			<java-attributes>
-				<xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String" />
-				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v15.NotificationEventHeader" />
-				<xml-any-element java-attribute="entity" />
+				<xml-element java-attribute="cambriaPartition" name="cambria.partition" type="java.lang.String"/>
+				<xml-element java-attribute="eventHeader" name="event-header" type="inventory.aai.onap.org.v15.NotificationEventHeader"/>
+				<xml-any-element java-attribute="entity"/>
 			</java-attributes>
 		</java-type>
 		<java-type name="NotificationEventHeader">
-			<xml-root-element name="notification-event-header" />
+			<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" />
+				<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" />
+			<xml-root-element name="aai-internal"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v15.ReservedPropNames" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v15.EdgePropNames" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="reservedPropNames" name="reserved-prop-names" type="inventory.aai.onap.org.v15.ReservedPropNames"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="edgePropNames" name="edge-prop-names" type="inventory.aai.onap.org.v15.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-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" />
+			<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" />
+				<xml-element java-attribute="lastModSourceOfTruth" name="last-mod-source-of-truth" type="java.lang.String"/>
+				<xml-element java-attribute="aaiNodeType" name="aai-node-type" type="java.lang.String"/>
+				<xml-element java-attribute="aaiCreatedTs" name="aai-created-ts" type="java.lang.Long"/>
+				<xml-element java-attribute="aaiUniqueKey" name="aai-unique-key" type="java.lang.String"/>
+				<xml-element java-attribute="aaiLastModTs" name="aai-last-mod-ts" type="java.lang.Long"/>
+				<xml-element java-attribute="sourceOfTruth" name="source-of-truth" type="java.lang.String"/>
+				<xml-element java-attribute="aaiUri" name="aai-uri" type="java.lang.String"/>
 			</java-attributes>
 		</java-type>
 		<java-type name="EdgePropNames">
 			<!-- NOTE that the names of these properties are not consistent and are in mixed case and hyphen case for now -->
 			<xml-properties>
-				<xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules" />
-				<xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV" />
-                <xml-property name="uniqueProps" value="aai-uuid" />
-                <xml-property name="indexedProps" value="aai-uuid" />
+				<xml-property name="description" value="Internal map to define the properties of an edge and interpret the map EdgeRules"/>
+				<xml-property name="edgeInfo" value="aaiUuid,edgeLabel,direction,multiplicityRule,isParent,usesResource,hasDelTarget,SVC-INFRA,SVC-INFRA-REV"/>
+                <xml-property name="uniqueProps" value="aai-uuid"/>
+                <xml-property name="indexedProps" value="aai-uuid"/>
             </xml-properties>
-			<xml-root-element name="edge-prop-names" />
+			<xml-root-element name="edge-prop-names"/>
 			<java-attributes>
-				<xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String" />
-				<xml-element java-attribute="direction" name="direction" type="java.lang.String" />
-				<xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String" />
-				<xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String" />
-				<xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String" />
-				<xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String" />
-				<xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String" />
-				<xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String" />
+				<xml-element java-attribute="edgeLabel" name="edgeLabel" type="java.lang.String"/>
+				<xml-element java-attribute="direction" name="direction" type="java.lang.String"/>
+				<xml-element java-attribute="multiplicityRule" name="multiplicityRule" type="java.lang.String"/>
+				<xml-element java-attribute="containsOtherV" name="contains-other-v" type="java.lang.String"/>
+				<xml-element java-attribute="deleteOtherV" name="delete-other-v" type="java.lang.String"/>
+				<xml-element java-attribute="svcinfra" name="SVC-INFRA" type="java.lang.String"/>
+				<xml-element java-attribute="preventDelete" name="prevent-delete" type="java.lang.String"/>
+				<xml-element java-attribute="aaiUuid" name="aai-uuid" type="java.lang.String"/>
 			</java-attributes>
         </java-type>
 
@@ -5693,6 +5759,7 @@
                 <xml-property name="container" value="models"/>
                 <xml-property name="namespace" value="service-design-and-creation"/>
                 <xml-property name="uriTemplate" value="/service-design-and-creation/models/model/{model-invariant-id}"/>
+            <xml-property name="requiredProps" value="model-invariant-id,model-type"/>
             </xml-properties>
             <java-attributes>
                 <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
@@ -5732,6 +5799,7 @@
                 <xml-property name="uniqueProps" value="model-version-id"/>
                 <xml-property name="container" value="model-vers"/>
                 <xml-property name="uriTemplate" value="/model-vers/model-ver/{model-version-id}"/>
+            <xml-property name="requiredProps" value="model-version-id,model-name,model-version"/>
             </xml-properties>
             <java-attributes>
                 <xml-element java-attribute="modelVersionId" name="model-version-id" required="true" type="java.lang.String" xml-key="true">
@@ -5786,6 +5854,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="model-elements"/>
                 <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/>
+            <xml-property name="requiredProps" value="model-element-uuid,new-data-del-flag,cardinality"/>
             </xml-properties>
             <xml-root-element name="model-element"/>
             <java-attributes>
@@ -5841,6 +5910,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="model-constraints"/>
                 <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/>
+            <xml-property name="requiredProps" value="model-constraint-uuid,constrained-element-set-uuid-to-replace"/>
             </xml-properties>
             <xml-root-element name="model-constraint"/>
             <java-attributes>
@@ -5875,6 +5945,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="constrained-element-sets"/>
                 <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/>
+            <xml-property name="requiredProps" value="constrained-element-set-uuid,constraint-type,check-type"/>
             </xml-properties>
             <xml-root-element name="constrained-element-set"/>
             <java-attributes>
@@ -5907,6 +5978,7 @@
                 <xml-property name="allowDirectWrite" value="false"/>
                 <xml-property name="container" value="element-choice-sets"/>
                 <xml-property name="uriTemplate" value="/element-choice-sets/element-choice-set/{element-choice-set-uuid}"/>
+            <xml-property name="requiredProps" value="element-choice-set-uuid,element-choice-set-name"/>
             </xml-properties>
             <xml-root-element name="element-choice-set"/>
             <java-attributes>
@@ -5924,155 +5996,159 @@
         </java-type>
 
 		<java-type name="NamedQueries">
-			<xml-root-element name="named-queries" />
+			<xml-root-element name="named-queries"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v15.NamedQuery" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v15.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" />
+				<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-property name="requiredProps" value="named-query-uuid,named-query-name,named-query-version"/>
+            </xml-properties>
+			<xml-root-element name="named-query"/>
 			<java-attributes>
-				<xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true" />
-				<xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String" >
-					<xml-element-wrapper name="required-input-params" />
-				</xml-element>
-				<xml-element java-attribute="description" name="description" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v15.NamedQueryElements" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="namedQueryUuid" name="named-query-uuid" required="true" type="java.lang.String" xml-key="true"/>
+				<xml-element java-attribute="namedQueryName" name="named-query-name" required="true" type="java.lang.String"/>
+				<xml-element java-attribute="namedQueryVersion" name="named-query-version" required="true" type="java.lang.String"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="requiredInputParams" name="required-input-param" type="java.lang.String">
+					<xml-element-wrapper name="required-input-params"/>
+				</xml-element>
+				<xml-element java-attribute="description" name="description" type="java.lang.String"/>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v15.NamedQueryElements"/>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="NamedQueryElements">
-			<xml-root-element name="named-query-elements" />
+			<xml-root-element name="named-query-elements"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v15.NamedQueryElement" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="namedQueryElement" name="named-query-element" type="inventory.aai.onap.org.v15.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" />
+				<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-property name="requiredProps" value="named-query-element-uuid"/>
+            </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-property name="autoGenerateUuid" value="true"/>
 					</xml-properties>
 				</xml-element>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String" />
-				<xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String" />
-				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v15.NamedQueryElements" />
-				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v15.RelatedLookups" />
-				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v15.PropertyConstraints" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+				<xml-element java-attribute="propertyLimitDesc" name="property-limit-desc" type="java.lang.String"/>
+				<xml-element java-attribute="doNotOutput" name="do-not-output" type="java.lang.String"/>
+				<xml-element java-attribute="namedQueryElements" name="named-query-elements" type="inventory.aai.onap.org.v15.NamedQueryElements"/>
+				<xml-element java-attribute="relatedLookups" name="related-lookups" type="inventory.aai.onap.org.v15.RelatedLookups"/>
+				<xml-element java-attribute="propertyConstraints" name="property-constraints" type="inventory.aai.onap.org.v15.PropertyConstraints"/>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="RelatedLookups">
-			<xml-root-element name="related-lookups" />
+			<xml-root-element name="related-lookups"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v15.RelatedLookup" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="relatedLookup" name="related-lookup" type="inventory.aai.onap.org.v15.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" />
+				<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-property name="requiredProps" value="related-lookup-uuid,source-node-type,source-node-property,target-node-type,target-node-property"/>
+            </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-property name="autoGenerateUuid" value="true"/>
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String" />
-				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String" />
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String" />
-				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="sourceNodeType" name="source-node-type" required="true" type="java.lang.String"/>
+				<xml-element java-attribute="sourceNodeProperty" name="source-node-property" required="true" type="java.lang.String"/>
+				<xml-element java-attribute="targetNodeType" name="target-node-type" required="true" type="java.lang.String"/>
+				<xml-element java-attribute="targetNodeProperty" name="target-node-property" required="true" type="java.lang.String"/>
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyCollectList" name="property-collect-list" type="java.lang.String"/>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"/>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="PropertyConstraints">
-			<xml-root-element name="property-constraints" />
+			<xml-root-element name="property-constraints"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v15.PropertyConstraint" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="propertyConstraint" name="property-constraint" type="inventory.aai.onap.org.v15.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" />
+				<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-property name="requiredProps" value="property-constraint-uuid,constraint-type,property-name,property-value"/>
+            </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-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" />
+				<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-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" />
+			<xml-root-element name="model-and-named-query-search"/>
 			<java-attributes>
-				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v15.QueryParameters" />
-				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v15.InstanceFilters" />
-				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v15.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" />
+				<xml-element java-attribute="queryParameters" name="query-parameters" type="inventory.aai.onap.org.v15.QueryParameters"/>
+				<xml-element java-attribute="instanceFilters" name="instance-filters" type="inventory.aai.onap.org.v15.InstanceFilters"/>
+				<xml-element java-attribute="secondaryFilts" name="secondary-filts" type="inventory.aai.onap.org.v15.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-property name="description" value="QueryParameters for performing a named-query or model query"/>
 			</xml-properties>
-			<xml-root-element name="query-parameters" />
+			<xml-root-element name="query-parameters"/>
 			<java-attributes>
-				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v15.NamedQuery" />
-				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v15.OverloadedModel" />
+				<xml-element java-attribute="namedQuery" name="named-query" type="inventory.aai.onap.org.v15.NamedQuery"/>
+				<xml-element java-attribute="model" name="model" type="inventory.aai.onap.org.v15.OverloadedModel"/>
 			</java-attributes>
 		</java-type>
 
@@ -6080,6 +6156,7 @@
             <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-property name="requiredProps" value="model-invariant-id,model-name-version-id,model-type,model-name,model-id,model-version"/>
             </xml-properties>
             <java-attributes>
                 <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="true" type="java.lang.String" xml-key="true">
@@ -6129,106 +6206,106 @@
 
 		<java-type name="InstanceFilters">
 			<xml-properties>
-				<xml-property name="description" value="InstanceFilters for performing a named-query or model query" />
+				<xml-property name="description" value="InstanceFilters for performing a named-query or model query"/>
 			</xml-properties>
-			<xml-root-element name="instance-filters" />
+			<xml-root-element name="instance-filters"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v15.InstanceFilter" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="instanceFilter" name="instance-filter" type="inventory.aai.onap.org.v15.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-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" />
+			<xml-root-element name="instance-filter"/>
 			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
+				<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-property name="description" value="SecondaryFilts for performing a named-query or model query"/>
 			</xml-properties>
-			<xml-root-element name="secondary-filts" />
+			<xml-root-element name="secondary-filts"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v15.SecondaryFilt" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="secondaryFilt" name="secondary-filt" type="inventory.aai.onap.org.v15.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-property name="description" value="SecondaryFilt for performing a named-query or model query"/>
 			</xml-properties>
-			<xml-root-element name="secondary-filt" />
+			<xml-root-element name="secondary-filt"/>
 			<java-attributes>
-				<xml-any-element container-type="java.util.ArrayList" java-attribute="any" lax="true" name="any" />
+				<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-property name="description" value="Property holder for query properties or instance properties"/>
 			</xml-properties>
-			<xml-root-element name="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" />
+				<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-property name="description" value="Response container for the results of a named-query or model query"/>
 			</xml-properties>
-			<xml-root-element name="response-list" />
+			<xml-root-element name="response-list"/>
 			<java-attributes>
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v15.InventoryResponseItems" />
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v15.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-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" />
+			<xml-root-element name="inventory-response-items"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v15.InventoryResponseItem" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="inventoryResponseItem" name="inventory-response-item" type="inventory.aai.onap.org.v15.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-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" />
+			<xml-root-element name="inventory-response-item"/>
 			<java-attributes>
-				<xml-element java-attribute="modelName" name="model-name" type="java.lang.String" />
-				<xml-any-element java-attribute="item" />
-				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v15.ExtraProperties" />
-				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v15.InventoryResponseItems" />
+				<xml-element java-attribute="modelName" name="model-name" type="java.lang.String"/>
+				<xml-any-element java-attribute="item"/>
+				<xml-element java-attribute="extraProperties" name="extra-properties" type="inventory.aai.onap.org.v15.ExtraProperties"/>
+				<xml-element java-attribute="inventoryResponseItems" name="inventory-response-items" type="inventory.aai.onap.org.v15.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-property name="description" value="Extra properties for inventory item for response list"/>
 			</xml-properties>
-			<xml-root-element name="extra-properties" />
+			<xml-root-element name="extra-properties"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v15.ExtraProperty" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="extraProperty" name="extra-property" type="inventory.aai.onap.org.v15.ExtraProperty"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="ExtraProperty">
-			<xml-root-element name="extra-property" />
+			<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" />
+				<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>
 
@@ -6271,6 +6348,7 @@
                 <xml-property name="container" value="route-table-references"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/route-table-references/route-table-reference/{route-table-reference-id}"/>
+            <xml-property name="requiredProps" value="route-table-reference-id,route-table-reference-fqdn"/>
             </xml-properties>
         </java-type>
 
@@ -6357,6 +6435,7 @@
                 <xml-property name="container" value="instance-groups"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
+            <xml-property name="requiredProps" value="id,description,instance-group-type"/>
             </xml-properties>
         </java-type>
 
@@ -6392,6 +6471,7 @@
                 <xml-property name="dependentOn" value="l3-network"/>
                 <xml-property name="container" value="segmentation-assignments"/>
                 <xml-property name="uriTemplate" value="/segmentation-assignments/segmentation-assignment/{segmentation-id}"/>
+            <xml-property name="requiredProps" value="segmentation-id"/>
             </xml-properties>
         </java-type>
 
@@ -6467,42 +6547,42 @@
                 </xml-element>
 				<xml-element java-attribute="allottedResourceName" name="allotted-resource-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the name of this allotted-resource." />
+						<xml-property name="description" value="Store the name of this allotted-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access provider of this allotted-resource." />
+						<xml-property name="description" value="Store the id of the access provider of this allotted-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access client of this allotted-resource." />
+						<xml-property name="description" value="Store the id of the access client of this allotted-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access topology of this allotted-resource." />
+						<xml-property name="description" value="Store the id of the access topology of this allotted-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access node of this allotted-resource." />
+						<xml-property name="description" value="Store the id of the access node of this allotted-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access ltp of this allotted-resource." />
+						<xml-property name="description" value="Store the id of the access ltp of this allotted-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the cvlan of this allotted-resource." />
+						<xml-property name="description" value="Store the cvlan of this allotted-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vpnName" name="vpn-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the vpn-name of this allotted-resource." />
+						<xml-property name="description" value="Store the vpn-name of this allotted-resource."/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v15.TunnelXconnects"/>
@@ -6511,13 +6591,14 @@
 
             <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,allotted-resource-name" />
+				<xml-property name="nameProps" value="description,allotted-resource-name"/>
                 <xml-property name="uniqueProps" value="id"/>
-				<xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name" />
+				<xml-property name="indexedProps" value="id,model-invariant-id,model-version-id,type,role,allotted-resource-name,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,vpn-name"/>
                 <xml-property name="dependentOn" value="service-instance"/>
                 <xml-property name="container" value="allotted-resources"/>
                 <!--  <xml-property name="namespace" value="network" /> -->
                 <xml-property name="uriTemplate" value="/allotted-resources/allotted-resource/{id}"/>
+            <xml-property name="requiredProps" value="id"/>
             </xml-properties>
         </java-type>
 
@@ -6555,6 +6636,7 @@
                 <xml-property name="container" value="tunnel-xconnects"/>
                 <!--  <xml-property name="namespace" value="network" /> -->
                 <xml-property name="uriTemplate" value="/tunnel-xconnects/tunnel-xconnect/{id}"/>
+            <xml-property name="requiredProps" value="id"/>
             </xml-properties>
         </java-type>
 
@@ -6594,6 +6676,7 @@
                 <xml-property name="dependentOn" value="generic-vnf,vce"/>
                 <xml-property name="container" value="entitlements"/>
                 <xml-property name="uriTemplate" value="/entitlements/entitlement/{group-uuid}/{resource-uuid}"/>
+            <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
             </xml-properties>
         </java-type>
 
@@ -6634,6 +6717,7 @@
                 <xml-property name="dependentOn" value="generic-vnf,vce"/>
                 <xml-property name="container" value="licenses"/>
                 <xml-property name="uriTemplate" value="/licenses/license/{group-uuid}/{resource-uuid}"/>
+            <xml-property name="requiredProps" value="group-uuid,resource-uuid"/>
             </xml-properties>
         </java-type>
 
@@ -6652,6 +6736,7 @@
                 <xml-property name="uniqueProps" value="vnf-id"/>
                 <xml-property name="inheritors" value="vce,generic-vnf"/>
                 <xml-property name="abstract" value="true"/>
+            <xml-property name="requiredProps" value="vnf-id"/>
             </xml-properties>
         </java-type>
 
@@ -6708,6 +6793,7 @@
                 <xml-property name="container" value="zones"/>
                 <xml-property name="namespace" value="network"/>
                 <xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
+            <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context"/>
             </xml-properties>
         </java-type>
         <java-type name="RouteTargets">
@@ -6745,6 +6831,7 @@
                 <xml-property name="dependentOn" value="vpn-binding"/>
                 <xml-property name="canBeLinked" value="true"/>
                 <xml-property name="uriTemplate" value="/route-targets/route-target/{global-route-target}/{route-target-role}"/>
+            <xml-property name="requiredProps" value="global-route-target,route-target-role"/>
             </xml-properties>
         </java-type>
 
@@ -6778,6 +6865,7 @@
                 <xml-property name="dependentOn" value="p-interface"/>
                 <xml-property name="container" value="sriov-pfs"/>
                 <xml-property name="uriTemplate" value="/sriov-pfs/sriov-pf/{pf-pci-id}"/>
+            <xml-property name="requiredProps" value="pf-pci-id"/>
             </xml-properties>
         </java-type>
 
@@ -6875,6 +6963,7 @@
                 <xml-property name="indexedProps" value="vip-ipv4-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
             <xml-property name="uriTemplate" value="/vip-ipv4-address-list/{vip-ipv4-address}"/>
+            <xml-property name="requiredProps" value="vip-ipv4-address"/>
             </xml-properties>
         </java-type>
 
@@ -6928,6 +7017,7 @@
                 <xml-property name="indexedProps" value="vip-ipv6-address,vlan-id-inner,neutron-network-id,neutron-subnet-id"/>
                 <xml-property name="dependentOn" value="cloud-region"/>
             <xml-property name="uriTemplate" value="/vip-ipv6-address-list/{vip-ipv6-address}"/>
+            <xml-property name="requiredProps" value="vip-ipv6-address"/>
             </xml-properties>
         </java-type>
 
@@ -6992,6 +7082,7 @@
                 <xml-property name="container" value="operational-environments"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/operational-environments/operational-environment/{operational-environment-id}"/>
+            <xml-property name="requiredProps" value="operational-environment-id,operational-environment-name,operational-environment-type,operational-environment-status,tenant-context,workload-context"/>
             </xml-properties>
         </java-type>
 
@@ -7012,6 +7103,7 @@
                 <xml-property name="nameProps" value="forwarding-path-name"/>
                 <xml-property name="uniqueProps" value="forwarding-path-id"/>
                 <xml-property name="uriTemplate" value="/network/forwarding-paths/forwarding-path/{forwarding-path-id}"/>
+            <xml-property name="requiredProps" value="forwarding-path-id,forwarding-path-name"/>
             </xml-properties>
             <java-attributes>
                 <xml-element java-attribute="forwardingPathId" name="forwarding-path-id" required="true" type="java.lang.String" xml-key="true">
@@ -7054,6 +7146,7 @@
                 <xml-property name="container" value="forwarders"/>
                 <xml-property name="dependentOn" value="forwarding-path"/>
                 <xml-property name="uriTemplate" value="/forwarders/forwarder/{sequence}"/>
+            <xml-property name="requiredProps" value="sequence"/>
             </xml-properties>
             <java-attributes>
                 <xml-element java-attribute="sequence" name="sequence" required="true" type="java.lang.Integer" xml-key="true">
@@ -7124,6 +7217,7 @@
                 <xml-property name="uniqueProps" value="forwarder-evc-id"/>
                 <xml-property name="container" value="forwarder-evcs"/>
                 <xml-property name="uriTemplate" value="/forwarder-evcs/forwarder-evc/{forwarder-evc-id}"/>
+            <xml-property name="requiredProps" value="forwarder-evc-id"/>
             </xml-properties>
         </java-type>
 
@@ -7174,6 +7268,7 @@
                 <xml-property name="uniqueProps" value="vlan-mapping-id"/>
                 <xml-property name="container" value="vlan-mappings"/>
                 <xml-property name="uriTemplate" value="/vlan-mappings/vlan-mapping/{vlan-mapping-id}"/>
+            <xml-property name="requiredProps" value="vlan-mapping-id"/>
             </xml-properties>
         </java-type>
 
@@ -7270,6 +7365,7 @@
                 <xml-property name="uniqueProps" value="evc-id"/>
                 <xml-property name="container" value="evcs"/>
                 <xml-property name="uriTemplate" value="/evcs/evc/{evc-id}"/>
+            <xml-property name="requiredProps" value="evc-id"/>
             </xml-properties>
         </java-type>
 
@@ -7349,6 +7445,7 @@
                 <xml-property name="indexedProps" value="collection-id,model-invariant-id,model-version-id"/>
                 <xml-property name="container" value="collections"/>
                 <xml-property name="uriTemplate" value="/network/collections/collection/{collection-id}"/>
+            <xml-property name="requiredProps" value="collection-id"/>
             </xml-properties>
         </java-type>
 
@@ -7390,6 +7487,7 @@
                 <xml-property name="dependentOn" value="vnfc"/>
                 <xml-property name="container" value="cps"/>
                 <xml-property name="uriTemplate" value="/cps/cp/{cp-instance-id}"/>
+            <xml-property name="requiredProps" value="cp-instance-id"/>
             </xml-properties>
         </java-type>
 
@@ -7484,25 +7582,26 @@
                 <xml-property name="container" value="network-technologies"/>
                 <xml-property name="namespace" value="cloud-infrastructure"/>
                 <xml-property name="uriTemplate" value="/cloud-infrastructure/network-technologies/network-technology/{network-technology-id}"/>
+            <xml-property name="requiredProps" value="network-technology-id,network-technology-name"/>
             </xml-properties>
         </java-type>
 
         <java-type name="SpPartner">
-            <xml-root-element name="sp-partner" />
+            <xml-root-element name="sp-partner"/>
             <java-attributes>
                 <xml-element java-attribute="spPartnerId" name="sp-partner-id" required="true" type="java.lang.String" xml-key="true">
                     <xml-properties>
-                        <xml-property name="description" value="Uniquely identifies this sp-partner by id" />
+                        <xml-property name="description" value="Uniquely identifies this sp-partner by id"/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="url" name="url" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the URL of this sp-partner." />
+                        <xml-property name="description" value="Store the URL of this sp-partner."/>
                     </xml-properties>
                 </xml-element>
                 <xml-element java-attribute="callsource" name="callsource" type="java.lang.String">
                     <xml-properties>
-                        <xml-property name="description" value="Store the callsource of this sp-partner." />
+                        <xml-property name="description" value="Store the callsource of this sp-partner."/>
                     </xml-properties>
                 </xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -7512,167 +7611,168 @@
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the operational-status for this sp-partner." />
+						<xml-property name="description" value="Store the operational-status for this sp-partner."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-customization-id for this sp-partner." />
+						<xml-property name="description" value="Store the model-customization-id for this sp-partner."/>
 					</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 sp-partner 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-property name="description" value="the ASDC model id for this sp-partner 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 sp-partner 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-property name="description" value="the ASDC model version for this sp-partner 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-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
 					</xml-properties>
 				</xml-element>
 
-                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
             </java-attributes>
             <xml-properties>
-                <xml-property name="description" value="Instance of an sp-partner" />
-                <xml-property name="indexedProps" value="sp-partner-id,url,callsource" />
-                <xml-property name="nameProps" value="sp-partner-id" />
-                <xml-property name="searchable" value="sp-partner-id" />
-                <xml-property name="uniqueProps" value="sp-partner-id" />
-                <xml-property name="container" value="sp-partners" />
-                <xml-property name="namespace" value="business" />
+                <xml-property name="description" value="Instance of an sp-partner"/>
+                <xml-property name="indexedProps" value="sp-partner-id,url,callsource"/>
+                <xml-property name="nameProps" value="sp-partner-id"/>
+                <xml-property name="searchable" value="sp-partner-id"/>
+                <xml-property name="uniqueProps" value="sp-partner-id"/>
+                <xml-property name="container" value="sp-partners"/>
+                <xml-property name="namespace" value="business"/>
                 <xml-property name="uriTemplate" value="/business/sp-partners/sp-partner/{sp-partner-id}"/>
+            <xml-property name="requiredProps" value="sp-partner-id"/>
             </xml-properties>
         </java-type>
         <java-type name="SpPartners">
-            <xml-root-element name="sp-partners" />
+            <xml-root-element name="sp-partners"/>
             <xml-properties>
-                <xml-property name="description" value="Collection of sp-partners" />
+                <xml-property name="description" value="Collection of sp-partners"/>
             </xml-properties>
             <java-attributes>
-                <xml-element container-type="java.util.ArrayList" java-attribute="spPartner" name="sp-partner" type="inventory.aai.onap.org.v15.SpPartner" />
+                <xml-element container-type="java.util.ArrayList" java-attribute="spPartner" name="sp-partner" type="inventory.aai.onap.org.v15.SpPartner"/>
             </java-attributes>
         </java-type>
 
 		<java-type name="Connectivity">
-			<xml-root-element name="connectivity" />
+			<xml-root-element name="connectivity"/>
 			<java-attributes>
 				<xml-element java-attribute="connectivityId" name="connectivity-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this connectivity by id" />
+						<xml-property name="description" value="Uniquely identifies this connectivity by id"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="bandwidthProfileName" name="bandwidth-profile-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the name of a bandwidth profile." />
+						<xml-property name="description" value="Store the name of a bandwidth profile."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the type of a bandwidth profile." />
+						<xml-property name="description" value="Store the type of a bandwidth profile."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cir" name="cir" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the CIR of this connectivity." />
+						<xml-property name="description" value="Store the CIR of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="eir" name="eir" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the EIR of this connectivity." />
+						<xml-property name="description" value="Store the EIR of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cbs" name="cbs" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the CBS of this connectivity." />
+						<xml-property name="description" value="Store the CBS of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ebs" name="ebs" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the EBS of this connectivity." />
+						<xml-property name="description" value="Store the EBS of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="colorAware" name="color-aware" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the color-awareness of this connectivity." />
+						<xml-property name="description" value="Store the color-awareness of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="couplingFlag" name="coupling-flag" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the coupling flag of this connectivity." />
+						<xml-property name="description" value="Store the coupling flag of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ethtSvcName" name="etht-svc-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="The ethernet service name for this connectivity." />
+						<xml-property name="description" value="The ethernet service name for this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access provider of this connectivity." />
+						<xml-property name="description" value="Store the id of the access provider of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access client of this connectivity." />
+						<xml-property name="description" value="Store the id of the access client of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access topology of this connectivity." />
+						<xml-property name="description" value="Store the id of the access topology of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access node of this connectivity." />
+						<xml-property name="description" value="Store the id of the access node of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the access ltp of this connectivity." />
+						<xml-property name="description" value="Store the id of the access ltp of this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="connectivitySelflink" name="connectivity-selflink" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the link to get more information for this connectivity." />
+						<xml-property name="description" value="Store the link to get more information for this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the cvlan for this connectivity." />
+						<xml-property name="description" value="Store the cvlan for this connectivity."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the operational-status for this object." />
+						<xml-property name="description" value="Store the operational-status for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-customization-id for this object." />
+						<xml-property name="description" value="Store the model-customization-id for this object."/>
 					</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-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-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-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
 					</xml-properties>
 				</xml-element>
@@ -7682,79 +7782,80 @@
 					</xml-properties>
 				</xml-element>
 
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Instance of a connectivity" />
-				<xml-property name="indexedProps" value="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status" />
-				<xml-property name="nameProps" value="etht-svc-name" />
-				<xml-property name="searchable" value="connectivity-id" />
-				<xml-property name="uniqueProps" value="connectivity-id" />
-				<xml-property name="container" value="connectivities" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Instance of a connectivity"/>
+				<xml-property name="indexedProps" value="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status"/>
+				<xml-property name="nameProps" value="etht-svc-name"/>
+				<xml-property name="searchable" value="connectivity-id"/>
+				<xml-property name="uniqueProps" value="connectivity-id"/>
+				<xml-property name="container" value="connectivities"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="connectivity-id"/>
+            </xml-properties>
 		</java-type>
 		<java-type name="Connectivities">
-			<xml-root-element name="connectivities" />
+			<xml-root-element name="connectivities"/>
 			<xml-properties>
-				<xml-property name="description" value="Collection of connectivities" />
+				<xml-property name="description" value="Collection of connectivities"/>
 			</xml-properties>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="connectivity" name="connectivity" type="inventory.aai.onap.org.v15.Connectivity" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="connectivity" name="connectivity" type="inventory.aai.onap.org.v15.Connectivity"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="LanPortConfig">
-			<xml-root-element name="lan-port-config" />
+			<xml-root-element name="lan-port-config"/>
 			<java-attributes>
 				<xml-element java-attribute="lanPortConfigId" name="lan-port-config-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this lan-port-config by id" />
+						<xml-property name="description" value="Uniquely identifies this lan-port-config by id"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="lanPortConfigName" name="lan-port-config-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the name of this lan-port-config." />
+						<xml-property name="description" value="Store the name of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="description" name="description" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the description of this lan-port-config." />
+						<xml-property name="description" value="Store the description of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="deviceId" name="device-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the device-id of this lan-port-config." />
+						<xml-property name="description" value="Store the device-id of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="portId" name="port-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the port-id of this lan-port-config." />
+						<xml-property name="description" value="Store the port-id of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ipv4Address" name="ipv4-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the ipv4-address of this lan-port-config." />
+						<xml-property name="description" value="Store the ipv4-address of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ipv6Address" name="ipv6-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the ipv6-address of this lan-port-config." />
+						<xml-property name="description" value="Store the ipv6-address of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vlanTag" name="vlan-tag" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the vlan-tag of this lan-port-config." />
+						<xml-property name="description" value="Store the vlan-tag of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="inputBandwidth" name="input-bandwidth" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the input-bandwidth of this lan-port-config." />
+						<xml-property name="description" value="Store the input-bandwidth of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="outputBandwidth" name="output-bandwidth" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the output-bandwidth of this lan-port-config." />
+						<xml-property name="description" value="Store the output-bandwidth of this lan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -7762,85 +7863,86 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="dhcpServices" name="dhcp-services" type="inventory.aai.onap.org.v15.DhcpServices" />
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="dhcpServices" name="dhcp-services" type="inventory.aai.onap.org.v15.DhcpServices"/>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Instance of a lan-port-config" />
-				<xml-property name="indexedProps" value="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag" />
-				<xml-property name="nameProps" value="lan-port-config-name" />
-				<xml-property name="searchable" value="lan-port-config-id" />
-				<xml-property name="uniqueProps" value="lan-port-config-id" />
-				<xml-property name="container" value="lan-port-configs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Instance of a lan-port-config"/>
+				<xml-property name="indexedProps" value="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag"/>
+				<xml-property name="nameProps" value="lan-port-config-name"/>
+				<xml-property name="searchable" value="lan-port-config-id"/>
+				<xml-property name="uniqueProps" value="lan-port-config-id"/>
+				<xml-property name="container" value="lan-port-configs"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="lan-port-config-id"/>
+            </xml-properties>
 		</java-type>
 		<java-type name="LanPortConfigs">
-			<xml-root-element name="lan-port-configs" />
+			<xml-root-element name="lan-port-configs"/>
 			<xml-properties>
-				<xml-property name="description" value="Collection of lan-port-configs" />
+				<xml-property name="description" value="Collection of lan-port-configs"/>
 			</xml-properties>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="lanPortConfig" name="lan-port-config" type="inventory.aai.onap.org.v15.LanPortConfig" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="lanPortConfig" name="lan-port-config" type="inventory.aai.onap.org.v15.LanPortConfig"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="DhcpService">
-			<xml-root-element name="dhcp-service" />
+			<xml-root-element name="dhcp-service"/>
 			<java-attributes>
-				<xml-element java-attribute="dhcpServiceId" name="dhcp-service-id" type="java.lang.String" required="true" xml-key="true">
+				<xml-element java-attribute="dhcpServiceId" name="dhcp-service-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this dhcp-service by id" />
+						<xml-property name="description" value="Uniquely identifies this dhcp-service by id"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="serverIpv4Address" name="server-ipv4-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the server-ip4-address of this dhcp-service." />
+						<xml-property name="description" value="Store the server-ip4-address of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="serverIpv6Address" name="server-ipv6-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the server-ipv6-address of this dhcp-service." />
+						<xml-property name="description" value="Store the server-ipv6-address of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="serviceEnable" name="service-enable" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the service-enable of this dhcp-service." />
+						<xml-property name="description" value="Store the service-enable of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="dhcpServiceType" name="dhcp-service-type" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the dhcp-service-type of this dhcp-service." />
+						<xml-property name="description" value="Store the dhcp-service-type of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="leaseTime" name="lease-time" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the lease-time of this dhcp-service." />
+						<xml-property name="description" value="Store the lease-time of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="domainName" name="domain-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the domain-name of this dhcp-service." />
+						<xml-property name="description" value="Store the domain-name of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="dns" name="dns" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the dns of this dhcp-service." />
+						<xml-property name="description" value="Store the dns of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ntpPrimary" name="ntp-primary" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the ntp-primary of this dhcp-service." />
+						<xml-property name="description" value="Store the ntp-primary of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ntpSecondary" name="ntp-secondary" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the ntp-secondary of this dhcp-service." />
+						<xml-property name="description" value="Store the ntp-secondary of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="nbns" name="nbns" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the nbns of this dhcp-service." />
+						<xml-property name="description" value="Store the nbns of this dhcp-service."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -7848,55 +7950,56 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Instance of a dhcp-service" />
-				<xml-property name="indexedProps" value="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address" />
-				<xml-property name="nameProps" value="domain-name" />
-				<xml-property name="searchable" value="dhcp-service-id" />
-				<xml-property name="uniqueProps" value="dhcp-service-id" />
-				<xml-property name="container" value="dhcp-services" />
-				<xml-property name="dependentOn" value="lan-port-config" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Instance of a dhcp-service"/>
+				<xml-property name="indexedProps" value="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address"/>
+				<xml-property name="nameProps" value="domain-name"/>
+				<xml-property name="searchable" value="dhcp-service-id"/>
+				<xml-property name="uniqueProps" value="dhcp-service-id"/>
+				<xml-property name="container" value="dhcp-services"/>
+				<xml-property name="dependentOn" value="lan-port-config"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="dhcp-service-id"/>
+            </xml-properties>
 		</java-type>
 		<java-type name="DhcpServices">
-			<xml-root-element name="dhcp-services" />
+			<xml-root-element name="dhcp-services"/>
 			<xml-properties>
-				<xml-property name="description" value="Collection of dhcp-services" />
+				<xml-property name="description" value="Collection of dhcp-services"/>
 			</xml-properties>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="dhcpService" name="dhcp-service" type="inventory.aai.onap.org.v15.DhcpService" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="dhcpService" name="dhcp-service" type="inventory.aai.onap.org.v15.DhcpService"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="NetworkResource">
-			<xml-root-element name="network-resource" />
+			<xml-root-element name="network-resource"/>
 			<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="Uniquely identifies this network-resource by id" />
+						<xml-property name="description" value="Uniquely identifies this network-resource by id"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="providerId" name="provider-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the provider of this network-resource." />
+						<xml-property name="description" value="Store the id of the provider of this network-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="clientId" name="client-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the client of this network-resource." />
+						<xml-property name="description" value="Store the id of the client of this network-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="teTopoId" name="te-topo-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the te-topo of this network-resource." />
+						<xml-property name="description" value="Store the id of the te-topo of this network-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the link to get more information for this object." />
+						<xml-property name="description" value="Store the link to get more information for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -7907,90 +8010,91 @@
 
 				<!-- Want to use pnf as sub-component, but workaround is to use COUSIN edge in relationship-list.
 				<xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v15.Pnfs" /> -->
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Instance of a network-resource" />
-				<xml-property name="indexedProps" value="network-id,provider-id,client-id,te-topo-id" />
-				<xml-property name="nameProps" value="network-id" />
-				<xml-property name="searchable" value="network-id" />
-				<xml-property name="uniqueProps" value="network-id" />
-				<xml-property name="container" value="network-resources" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Instance of a network-resource"/>
+				<xml-property name="indexedProps" value="network-id,provider-id,client-id,te-topo-id"/>
+				<xml-property name="nameProps" value="network-id"/>
+				<xml-property name="searchable" value="network-id"/>
+				<xml-property name="uniqueProps" value="network-id"/>
+				<xml-property name="container" value="network-resources"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="network-id"/>
+            </xml-properties>
 		</java-type>
 		<java-type name="NetworkResources">
-			<xml-root-element name="network-resources" />
+			<xml-root-element name="network-resources"/>
 			<xml-properties>
-				<xml-property name="description" value="Collection of network-resources" />
+				<xml-property name="description" value="Collection of network-resources"/>
 			</xml-properties>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="networkResource" name="network-resource" type="inventory.aai.onap.org.v15.NetworkResource" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="networkResource" name="network-resource" type="inventory.aai.onap.org.v15.NetworkResource"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="SiteResource">
-			<xml-root-element name="site-resource" />
+			<xml-root-element name="site-resource"/>
 			<java-attributes>
 				<xml-element java-attribute="siteResourceId" name="site-resource-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this site-resource by id" />
+						<xml-property name="description" value="Uniquely identifies this site-resource by id"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="siteResourceName" name="site-resource-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the name of this site-resource." />
+						<xml-property name="description" value="Store the name of this site-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="description" name="description" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the description of this site-resource." />
+						<xml-property name="description" value="Store the description of this site-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="type" name="type" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the type of this site-resource." />
+						<xml-property name="description" value="Store the type of this site-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="role" name="role" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the role of this site-resource." />
+						<xml-property name="description" value="Store the role of this site-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="generatedSiteId" name="generated-site-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the generated-site-id of this site-resource." />
+						<xml-property name="description" value="Store the generated-site-id of this site-resource."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the link to get more information for this object." />
+						<xml-property name="description" value="Store the link to get more information for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the operational-status for this object." />
+						<xml-property name="description" value="Store the operational-status for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-customization-id for this object." />
+						<xml-property name="description" value="Store the model-customization-id for this object."/>
 					</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-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-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-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
 					</xml-properties>
 				</xml-element>
@@ -7999,99 +8103,100 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Instance of a site-resource" />
-				<xml-property name="indexedProps" value="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status" />
-				<xml-property name="nameProps" value="site-resource-name" />
-				<xml-property name="searchable" value="site-resource-id" />
-				<xml-property name="uniqueProps" value="site-resource-id" />
-				<xml-property name="container" value="site-resources" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Instance of a site-resource"/>
+				<xml-property name="indexedProps" value="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status"/>
+				<xml-property name="nameProps" value="site-resource-name"/>
+				<xml-property name="searchable" value="site-resource-id"/>
+				<xml-property name="uniqueProps" value="site-resource-id"/>
+				<xml-property name="container" value="site-resources"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="site-resource-id"/>
+            </xml-properties>
 		</java-type>
 		<java-type name="SiteResources">
-			<xml-root-element name="site-resources" />
+			<xml-root-element name="site-resources"/>
 			<xml-properties>
-				<xml-property name="description" value="Collection of site-resources" />
+				<xml-property name="description" value="Collection of site-resources"/>
 			</xml-properties>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="siteResource" name="site-resource" type="inventory.aai.onap.org.v15.SiteResource" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="siteResource" name="site-resource" type="inventory.aai.onap.org.v15.SiteResource"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="SdwanVpns">
-			<xml-root-element name="sdwan-vpns" />
+			<xml-root-element name="sdwan-vpns"/>
 			<xml-properties>
-				<xml-property name="description" value="Collection of sdwan-vpns" />
+				<xml-property name="description" value="Collection of sdwan-vpns"/>
 			</xml-properties>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="sdwanVpn" name="sdwan-vpn" type="inventory.aai.onap.org.v15.SdwanVpn" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="sdwanVpn" name="sdwan-vpn" type="inventory.aai.onap.org.v15.SdwanVpn"/>
 			</java-attributes>
 		</java-type>
 		<java-type name="SdwanVpn">
-			<xml-root-element name="sdwan-vpn" />
+			<xml-root-element name="sdwan-vpn"/>
 			<java-attributes>
 				<xml-element java-attribute="sdwanVpnId" name="sdwan-vpn-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this sdwan-vpn by id" />
+						<xml-property name="description" value="Uniquely identifies this sdwan-vpn by id"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="sdwanVpnName" name="sdwan-vpn-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the name of this sdwan-vpn." />
+						<xml-property name="description" value="Store the name of this sdwan-vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vxlanId" name="vxlan-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the vxlan-id of this sdwan-vpn." />
+						<xml-property name="description" value="Store the vxlan-id of this sdwan-vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="topology" name="topology" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the topology of this sdwan-vpn." />
+						<xml-property name="description" value="Store the topology of this sdwan-vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="tenantId" name="tenant-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the tenant-id of this sdwan-vpn." />
+						<xml-property name="description" value="Store the tenant-id of this sdwan-vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vpnId" name="vpn-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the vpn-id of this sdwan-vpn." />
+						<xml-property name="description" value="Store the vpn-id of this sdwan-vpn."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the link to get more information for this object." />
+						<xml-property name="description" value="Store the link to get more information for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the operational-status for this object." />
+						<xml-property name="description" value="Store the operational-status for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-customization-id for this object." />
+						<xml-property name="description" value="Store the model-customization-id for this object."/>
 					</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-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-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-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
 					</xml-properties>
 				</xml-element>
@@ -8100,115 +8205,116 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Instance of an sdwan-vpn" />
-				<xml-property name="indexedProps" value="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status" />
-				<xml-property name="nameProps" value="sdwan-vpn-name" />
-				<xml-property name="searchable" value="sdwan-vpn-id" />
-				<xml-property name="uniqueProps" value="sdwan-vpn-id" />
-				<xml-property name="container" value="sdwan-vpns" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Instance of an sdwan-vpn"/>
+				<xml-property name="indexedProps" value="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status"/>
+				<xml-property name="nameProps" value="sdwan-vpn-name"/>
+				<xml-property name="searchable" value="sdwan-vpn-id"/>
+				<xml-property name="uniqueProps" value="sdwan-vpn-id"/>
+				<xml-property name="container" value="sdwan-vpns"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="sdwan-vpn-id"/>
+            </xml-properties>
 		</java-type>
 
 		<java-type name="Devices">
-			<xml-root-element name="devices" />
+			<xml-root-element name="devices"/>
 			<xml-properties>
-				<xml-property name="description" value="Collection of devices" />
+				<xml-property name="description" value="Collection of devices"/>
 			</xml-properties>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="device" name="device" type="inventory.aai.onap.org.v15.Device" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="device" name="device" type="inventory.aai.onap.org.v15.Device"/>
 			</java-attributes>
 		</java-type>
 		<java-type name="Device">
-			<xml-root-element name="device" />
+			<xml-root-element name="device"/>
 			<java-attributes>
 				<xml-element java-attribute="deviceId" name="device-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this device by id" />
+						<xml-property name="description" value="Uniquely identifies this device by id"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="esn" name="esn" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the esn of this device." />
+						<xml-property name="description" value="Store the esn of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="deviceName" name="device-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the name of this device." />
+						<xml-property name="description" value="Store the name of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="description" name="description" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the description of this device." />
+						<xml-property name="description" value="Store the description of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vendor" name="vendor" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the vendor of this device." />
+						<xml-property name="description" value="Store the vendor of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="class" name="class" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the class of this device." />
+						<xml-property name="description" value="Store the class of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="type" name="type" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the type of this device." />
+						<xml-property name="description" value="Store the type of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="version" name="version" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the version of this device." />
+						<xml-property name="description" value="Store the version of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="systemIp" name="system-ip" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the system-ip of this device." />
+						<xml-property name="description" value="Store the system-ip of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="systemIpv4" name="system-ipv4" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the system-ipv4 of this device." />
+						<xml-property name="description" value="Store the system-ipv4 of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="systemIpv6" name="system-ipv6" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the system-ipv6 of this device." />
+						<xml-property name="description" value="Store the system-ipv6 of this device."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the link to get more information for this object." />
+						<xml-property name="description" value="Store the link to get more information for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the operational-status for this object." />
+						<xml-property name="description" value="Store the operational-status for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-customization-id for this object." />
+						<xml-property name="description" value="Store the model-customization-id for this object."/>
 					</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-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-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-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
 					</xml-properties>
 				</xml-element>
@@ -8217,141 +8323,142 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Instance of a device" />
-				<xml-property name="indexedProps" value="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status" />
-				<xml-property name="nameProps" value="device-name" />
-				<xml-property name="searchable" value="device-id" />
-				<xml-property name="uniqueProps" value="device-id" />
-				<xml-property name="container" value="devices" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Instance of a device"/>
+				<xml-property name="indexedProps" value="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status"/>
+				<xml-property name="nameProps" value="device-name"/>
+				<xml-property name="searchable" value="device-id"/>
+				<xml-property name="uniqueProps" value="device-id"/>
+				<xml-property name="container" value="devices"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="device-id"/>
+            </xml-properties>
 		</java-type>
 
 		<java-type name="WanPortConfig">
-			<xml-root-element name="wan-port-config" />
+			<xml-root-element name="wan-port-config"/>
 			<java-attributes>
 				<xml-element java-attribute="wanPortConfigId" name="wan-port-config-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Uniquely identifies this wan-port-config by id" />
+						<xml-property name="description" value="Uniquely identifies this wan-port-config by id"/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="wanPortConfigName" name="wan-port-config-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the name of this wan-port-config." />
+						<xml-property name="description" value="Store the name of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="deviceId" name="device-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the device of this wan-port-config." />
+						<xml-property name="description" value="Store the id of the device of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="vlanId" name="vlan-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the id of the vlan of this wan-port-config." />
+						<xml-property name="description" value="Store the id of the vlan of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ipAddress" name="ip-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the ip-address of this wan-port-config." />
+						<xml-property name="description" value="Store the ip-address of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ipv4Address" name="ipv4-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the ipv4-address of this wan-port-config." />
+						<xml-property name="description" value="Store the ipv4-address of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="ipv6Address" name="ipv6-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the ipv6-address of this wan-port-config." />
+						<xml-property name="description" value="Store the ipv6-address of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="providerIpAddress" name="provider-ip-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the provider-ip-address of this wan-port-config." />
+						<xml-property name="description" value="Store the provider-ip-address of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="providerIpv4Address" name="provider-ipv4-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the provider-ipv4-address of this wan-port-config." />
+						<xml-property name="description" value="Store the provider-ipv4-address of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="providerIpv6Address" name="provider-ipv6-address" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the provider-ipv6-address of this wan-port-config." />
+						<xml-property name="description" value="Store the provider-ipv6-address of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="inputBandwidth" name="input-bandwidth" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the input-bandwidth of this wan-port-config." />
+						<xml-property name="description" value="Store the input-bandwidth of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="outputBandwidth" name="output-bandwidth" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the output-bandwidth of this wan-port-config." />
+						<xml-property name="description" value="Store the output-bandwidth of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="description" name="description" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the description of this wan-port-config." />
+						<xml-property name="description" value="Store the description of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="portType" name="port-type" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the port-type of this wan-port-config." />
+						<xml-property name="description" value="Store the port-type of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="portNumber" name="port-number" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the port-number of this wan-port-config." />
+						<xml-property name="description" value="Store the port-number of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="transportNetworkName" name="transport-network-name" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the transport-network-name of this wan-port-config." />
+						<xml-property name="description" value="Store the transport-network-name of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="devicePortId" name="device-port-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the device-port-id of this wan-port-config." />
+						<xml-property name="description" value="Store the device-port-id of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="wanPortId" name="wan-port-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the wan-port-id of this wan-port-config." />
+						<xml-property name="description" value="Store the wan-port-id of this wan-port-config."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the link to get more information for this object." />
+						<xml-property name="description" value="Store the link to get more information for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the operational-status for this object." />
+						<xml-property name="description" value="Store the operational-status for this object."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-customization-id for this object." />
+						<xml-property name="description" value="Store the model-customization-id for this object."/>
 					</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-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-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-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
 					</xml-properties>
 				</xml-element>
@@ -8360,45 +8467,46 @@
 						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 			</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Instance of a wan-port-config" />
-				<xml-property name="indexedProps" value="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status" />
-				<xml-property name="nameProps" value="wan-port-config-name" />
-				<xml-property name="searchable" value="wan-port-config-id" />
-				<xml-property name="uniqueProps" value="wan-port-config-id" />
-				<xml-property name="container" value="wan-port-configs" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Instance of a wan-port-config"/>
+				<xml-property name="indexedProps" value="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status"/>
+				<xml-property name="nameProps" value="wan-port-config-name"/>
+				<xml-property name="searchable" value="wan-port-config-id"/>
+				<xml-property name="uniqueProps" value="wan-port-config-id"/>
+				<xml-property name="container" value="wan-port-configs"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="wan-port-config-id"/>
+            </xml-properties>
 		</java-type>
 		<java-type name="WanPortConfigs">
-			<xml-root-element name="wan-port-configs" />
+			<xml-root-element name="wan-port-configs"/>
 			<xml-properties>
-				<xml-property name="description" value="Collection of wan-port-configs" />
+				<xml-property name="description" value="Collection of wan-port-configs"/>
 			</xml-properties>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="wanPortConfig" name="wan-port-config" type="inventory.aai.onap.org.v15.WanPortConfig" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="wanPortConfig" name="wan-port-config" type="inventory.aai.onap.org.v15.WanPortConfig"/>
 			</java-attributes>
 		</java-type>
 
 		<java-type name="ExtAaiNetworks">
-			<xml-root-element name="ext-aai-networks" />
+			<xml-root-element name="ext-aai-networks"/>
 			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="extAaiNetwork" name="ext-aai-network" type="inventory.aai.onap.org.v15.ExtAaiNetwork" />
+				<xml-element container-type="java.util.ArrayList" java-attribute="extAaiNetwork" name="ext-aai-network" type="inventory.aai.onap.org.v15.ExtAaiNetwork"/>
 			</java-attributes>
 		</java-type>
 		<java-type name="ExtAaiNetwork">
-			<xml-root-element name="ext-aai-network" />
+			<xml-root-element name="ext-aai-network"/>
 			<java-attributes>
 				<xml-element java-attribute="aaiId" name="aai-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Unique ID of the referenced AAI." />
+						<xml-property name="description" value="Unique ID of the referenced AAI."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="schemaVersion" name="schema-version" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Schema version of the referenced AAI." />
+						<xml-property name="description" value="Schema version of the referenced AAI."/>
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -8406,7 +8514,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="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v15.EsrSystemInfo" />
+				<xml-element java-attribute="esrSystemInfo" name="esr-system-info" type="inventory.aai.onap.org.v15.EsrSystemInfo"/>
 
 				<!-- Want to use these as sub-components, but workaround is to use COUSIN edges in relationship-list.
 				<xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v15.LogicalLinks" />
@@ -8420,15 +8528,16 @@
 				<xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v15.SdwanVpns" />
 				<xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v15.Devices" />
 				<xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v15.WanPortConfigs" /> -->
-				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/>
 				</java-attributes>
 			<xml-properties>
-				<xml-property name="description" value="Refer to an external AAI in another ONAP." />
-				<xml-property name="indexedProps" value="aai-id" />
-				<xml-property name="searchable" value="aai-id" />
-				<xml-property name="container" value="ext-aai-networks" />
-				<xml-property name="namespace" value="network" />
-			</xml-properties>
+				<xml-property name="description" value="Refer to an external AAI in another ONAP."/>
+				<xml-property name="indexedProps" value="aai-id"/>
+				<xml-property name="searchable" value="aai-id"/>
+				<xml-property name="container" value="ext-aai-networks"/>
+				<xml-property name="namespace" value="network"/>
+			<xml-property name="requiredProps" value="aai-id"/>
+            </xml-properties>
 		</java-type>
 
         <java-type name="Common">
@@ -8486,7 +8595,58 @@
                 <xml-property name="namespace" value="common"/>
                 <xml-property name="nameProps" value="contact-name,vendor-type"/>
                 <xml-property name="uriTemplate" value="/common/contacts/contact/{contact-name}"/>
+            <xml-property name="requiredProps" value="contact-name"/>
             </xml-properties>
-		</java-type>		
+		</java-type>	
+		
+				<java-type name="AggregateRoutes">
+            <xml-properties>
+                <xml-property name="description" value="Collection of aggregate routes."/>
+            </xml-properties>
+            <xml-root-element name="aggregate-routes"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="aggregateRoute" name="aggregate-route" type="inventory.aai.onap.org.v15.AggregateRoute"/>
+            </java-attributes>
+        </java-type>	
+        
+        <java-type name="AggregateRoute">
+            <xml-root-element name="aggregate-route"/>
+            <java-attributes>
+                <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of the aggregate-route instance"/>
+                    </xml-properties>
+                </xml-element>                
+                <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of the forwarding-path"/>
+                    </xml-properties>
+                </xml-element>                
+                <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="CIDR-mask for aggregate route subnet"/>
+                    </xml-properties>
+                </xml-element>                
+                <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/>
+                    </xml-properties>
+                </xml-element>                
+                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-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="Aggregate route configs are used on the D2 IPE’s for the Voice services.  In 1902, SDNC will create aggregate-route objects and write them to A&amp;AI. "/>
+                <xml-property name="uniqueProps" value="route-id"/>
+                <xml-property name="container" value="aggregate-routes"/> 
+                <xml-property name="dependentOn" value="l3-network"/>
+                <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{route-id}"/>
+            <xml-property name="requiredProps" value="route-id,network-start-address,cidr-mask,ip-version"/>
+            </xml-properties>
+		</java-type>
+			
 	</java-types>
 </xml-bindings>